Changeset 980 in svn

Timestamp:

2012-07-17T04:14:44Z (5 years ago)

Author:

Xuefer

Message:

fix make args

Location:

trunk

Files:

• Makefile.frag (modified) (1 diff)
• run (modified) (3 diffs)

trunk/Makefile.frag

@@ -26 +26 @@
     -$(XCACHE_INDENT) < $(XCACHE_PROC_OUT) > $(XCACHE_PROC_C).tmp && mv $(XCACHE_PROC_C).tmp $(XCACHE_PROC_C)
 
-$(builddir)/processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
-processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
+$(builddir)/processor.lo processor.lo: $(XCACHE_PROC_C) $(XCACHE_PROC_H) $(srcdir)/processor.c
 
-$(builddir)/disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
-disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
+$(builddir)/disassembler.lo disassembler.lo: $(XCACHE_PROC_H) $(srcdir)/processor.c
 
-$(builddir)/opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
-opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
+$(builddir)/opcode_spec.lo opcode_spec.lo: $(srcdir)/xcache.h $(srcdir)/opcode_spec.c $(srcdir)/opcode_spec_def.h $(srcdir)/const_string.h
 
-$(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
-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
+$(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
 
 xcachesvnclean: clean

trunk/run

@@ -15 +15 @@
 fi
 
-LANG=C /usr/bin/make $MAKEOPTS "$@" 2>&1 | hi error warn FAIL
-ret=${PIPESTATUS[0]}
-if [[ $ret -ne 0 ]]; then
-    exit $ret
-fi
-
 if [[ ! -z $1 ]]; then
     type=$1
@@ -30 +24 @@
         args=(test.php)
     fi
+fi
+
+if [[ $type = make ]]; then
+    MAKEARGS=("$@")
+fi
+
+LANG=C /usr/bin/make $MAKEOPTS "${MAKEARGS[@]}" 2>&1 | hi error warn FAIL
+ret=${PIPESTATUS[0]}
+if [[ $ret -ne 0 || $type = make ]]; then
+    exit $ret
 fi
 
@@ -55 +59 @@
 
 case "$type" in
-make)
-    exit
-    ;;
 ltr*)
     export USE_ZEND_ALLOC=0