Changeset 41491 for trunk

Timestamp:

Feb 11, 2021, 1:14:47 PM (5 years ago)

Author:

eugene

Message:

remove excess dependencies on DESTINC/autocode.h to avoid parallel re-builds

Location:

trunk/Ohana/src

Files:

• libautocode/Makefile (modified) (1 diff)
• libdvo/Makefile (modified) (2 diffs)

trunk/Ohana/src/libautocode/Makefile

@@ -46 +46 @@
 $(DESTINC)/autocode.h : $(INC)/autocode.h
 
-$(AOBJS): $(DEF)/autocode.c $(DESTINC)/autocode.h
+# $(AOBJS): $(DEF)/autocode.c $(DESTINC)/autocode.h
+
+# 
+$(AOBJS): $(DEF)/autocode.c $(INC)/autocode.h
 
 $(INC)/autocode.h: $(AINCS) $(DEF)/autocode.h $(DEF)/common.h

trunk/Ohana/src/libdvo/Makefile

@@ -152 +152 @@
 # $(SRC)/photfits.$(ARCH).o        
 
+# libautocode/Makefile.Targets defines $(AOBJS) & $(AINCS)
 include ../libautocode/Makefile.Targets
 
@@ -168 +169 @@
 $(DESTINC)/autocode.h: $(AINC)/autocode.h
         @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-        rm -f $@
-        cp $< $@
+        /bin/rm -f $@
+        /bin/cp -f $< $@
         echo "done making autocode.h"
 
 $(AINC)/autocode.h: $(AINCS) $(ADEF)/autocode.h $(ADEF)/common.h
-        @echo "$(MAKE) $@ from $^"
+#       @echo "$(MAKE) $@ from $^"
         cd $(AUTO) && $(MAKE) $@
 
 # generic rule for AINCS
 $(AINC)/%.h : $(ADEF)/%.d $(ADEF)/autocode.h $(ADEF)/common.h
-        @echo "$(MAKE) $@ from $^"
+#       @echo "*** h-build $(MAKE) $@ from $^"
         cd $(AUTO) && $(MAKE) $@
 
 # generic rule for ASRC
-$(ASRC)/%.c : $(ADEF)/%.d $(ADEF)/autocode.c $(AINC)/%.h
-        @echo "$(MAKE) $@ from $^"
+$(ASRC)/%.c : $(ADEF)/%.d $(ADEF)/autocode.c
+#       @echo "*** c-build: $(MAKE) $@ from $^"
         cd $(AUTO) && $(MAKE) $@
 
 # generic rule for AOBJS
 $(ASRC)/%.$(ARCH).o : $(ASRC)/%.c
-        @echo "$(MAKE) $@ from $^"
+#       @echo "*** o-build: $(MAKE) $@ from $^"
         cd $(AUTO) && $(MAKE) $@