Changeset 980 in svn


Ignore:
Timestamp:
2012-07-17T06:14:44+02:00 (3 years ago)
Author:
Xuefer
Message:

fix make args

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.frag

    r858 r980  
    2626    -$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C)
    2727
    28 $(builddir)/processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
    29 processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
     28$(builddir)/processor.lo processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
    3029
    31 $(builddir)/disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
    32 disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
     30$(builddir)/disassembler.lo disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
    3331
    34 $(builddir)/opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
    35 opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
     32$(builddir)/opcode_spec.lo opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
    3633
    37 $(builddir)/xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h
    38 xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h
     34$(builddir)/xcache.lo xcache.lo: $(XCACHE_PROC_H) $(srcdir)/xc_shm.h $(srcdir)/stack.h $(srcdir)/xcache_globals.h $(srcdir)/xcache.c $(srcdir)/foreachcoresig.h $(srcdir)/utils.h
    3935
    4036xcachesvnclean: clean
  • trunk/run

    r977 r980  
    1515fi
    1616
    17 LANG=C /usr/bin/make $MAKEOPTS "$@" 2>&1 | hi error warn FAIL
    18 ret=${PIPESTATUS[0]}
    19 if [[ $ret -ne 0 ]]; then
    20     exit $ret
    21 fi
    22 
    2317if [[ ! -z $1 ]]; then
    2418    type=$1
     
    3024        args=(test.php)
    3125    fi
     26fi
     27
     28if [[ $type = make ]]; then
     29    MAKEARGS=("$@")
     30fi
     31
     32LANG=C /usr/bin/make $MAKEOPTS "${MAKEARGS[@]}" 2>&1 | hi error warn FAIL
     33ret=${PIPESTATUS[0]}
     34if [[ $ret -ne 0 || $type = make ]]; then
     35    exit $ret
    3236fi
    3337
     
    5559
    5660case "$type" in
    57 make)
    58     exit
    59     ;;
    6061ltr*)
    6162    export USE_ZEND_ALLOC=0
Note: See TracChangeset for help on using the changeset viewer.