Changeset 31606 for branches/czw_branch/20110406/Ohana/src/libdvo/Makefile

Timestamp:

Jun 6, 2011, 1:56:22 PM (15 years ago)

Author:

watersc1

Message:

merge from trunk before working on new stacking code

Location:

branches/czw_branch/20110406

Files:

• . (modified) (1 prop)
• Ohana/src/libdvo/Makefile (modified) (2 diffs)

branches/czw_branch/20110406/Ohana/src/libdvo/Makefile

@@ -101 +101 @@
 
 $(AINC)/autocode.h: $(AINCS) $(ADEF)/autocode.h $(ADEF)/common.h
-        @echo "make $@ from $^"
-        cd $(AUTO) && make $@
+        @echo "$(MAKE) $@ from $^"
+        cd $(AUTO) && $(MAKE) $@
 
 # generic rule for AINCS
 $(AINC)/%.h : $(ADEF)/%.d $(ADEF)/autocode.h $(ADEF)/common.h
-        @echo "make $@ from $^"
-        cd $(AUTO) && make $@
+        @echo "$(MAKE) $@ from $^"
+        cd $(AUTO) && $(MAKE) $@
 
 # generic rule for ASRC
 $(ASRC)/%.c : $(ADEF)/%.d $(ADEF)/autocode.c $(AINC)/%.h
-        @echo "make $@ from $^"
-        cd $(AUTO) && make $@
+        @echo "$(MAKE) $@ from $^"
+        cd $(AUTO) && $(MAKE) $@
 
 # generic rule for AOBJS
 $(ASRC)/%.$(ARCH).o : $(ASRC)/%.c
-        @echo "make $@ from $^"
-        cd $(AUTO) && make $@
+        @echo "$(MAKE) $@ from $^"
+        cd $(AUTO) && $(MAKE) $@
 
 tabletest: install
@@ -124 +124 @@
 clean: cleandef
 cleandef:
-        cd $(AUTO) && make clean
+        cd $(AUTO) && $(MAKE) clean
 
 .PRECIOUS: $(ASRC)/%.c