Changeset 22 for trunk


Ignore:
Timestamp:
2006-05-25T08:49:48+02:00 (8 years ago)
Author:
moo
Message:

do not depends on mkstructinfo.awk if test is not enabled

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.frag

    r11 r22  
    55XCACHE_INCLUDES_SRC=$(srcdir)/includes.c 
    66XCACHE_INCLUDES_I=$(builddir)/includes.i 
    7 XCACHE_STRUCT_OUT=$(builddir)/structinfo.m4 
     7XCACHE_STRUCTINFO_OUT=$(builddir)/structinfo.m4 
    88 
    99$(XCACHE_INCLUDES_I): $(XCACHE_INCLUDES_SRC) $(srcdir)/xcache.h 
    1010    $(CC) -I. -I$(srcdir) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) -E $(XCACHE_INCLUDES_SRC) -o $(XCACHE_INCLUDES_I) 
    1111 
    12 $(XCACHE_STRUCT_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk 
    13     $(AWK) -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCT_OUT) 
     12$(XCACHE_STRUCTINFO_OUT): $(XCACHE_INCLUDES_I) $(srcdir)/mkstructinfo.awk 
     13    $(AWK) -W posix -f $(srcdir)/mkstructinfo.awk < $(XCACHE_INCLUDES_I) > $(XCACHE_STRUCTINFO_OUT) 
    1414 
    15 $(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCT_OUT) $(XCACHE_PROC_SOURCES) 
     15$(XCACHE_PROC_OUT): $(XCACHE_PROC_SRC) $(XCACHE_STRUCTINFO) $(XCACHE_PROC_SOURCES) 
    1616    $(M4) -D srcdir="$(srcdir)" -D builddir="$(builddir)" $(XCACHE_ENABLE_TEST) -E $(XCACHE_PROC_SRC) > $(XCACHE_PROC_OUT).tmp 
    1717    mv -f $(XCACHE_PROC_OUT).tmp $(XCACHE_PROC_OUT) 
  • trunk/config.m4

    r11 r22  
    4242    XCACHE_ENABLE_TEST=-DXCACHE_ENABLE_TEST 
    4343    AC_DEFINE([HAVE_XCACHE_TEST], 1, [Define to enable XCache self test]) 
     44    XCACHE_STRUCTINFO='$(XCACHE_STRUCTINFO_OUT)' 
    4445  else 
    4546    XCACHE_ENABLE_TEST= 
     47    XCACHE_STRUCTINFO= 
    4648  fi 
    4749  PHP_SUBST([XCACHE_ENABLE_TEST]) 
     50  PHP_SUBST([XCACHE_STRUCTINFO]) 
    4851 
    4952  AC_PATH_PROGS([AWK], [gawk awk]) 
     53  PHP_SUBST([AWK]) 
    5054  AC_PATH_PROGS([M4], [m4]) 
     55  PHP_SUBST([M4]) 
    5156  AC_PATH_PROGS([GREP], [grep]) 
     57  PHP_SUBST([GREP]) 
    5258  AC_PATH_PROGS([SED], [sed]) 
     59  PHP_SUBST([SED]) 
    5360 
    5461  AC_PATH_PROGS([INDENT], [indent cat]) 
  • trunk/config.w32

    r15 r22  
    101101        ADD_FLAG("XCACHE_ENABLE_TEST", "-DXCACHE_ENABLE_TEST"); 
    102102        AC_DEFINE("HAVE_XCACHE_TEST", 1, "Define to enable XCache self test"); 
     103        ADD_FLAG("XCACHE_STRUCTINFO", "$(XCACHE_STRUCTINFO_OUT)"); 
    103104    } 
    104105    else { 
    105106        ADD_FLAG("XCACHE_ENABLE_TEST", ""); 
     107        ADD_FLAG("XCACHE_STRUCTINFO", ""); 
    106108    } 
    107109 
Note: See TracChangeset for help on using the changeset viewer.