Changeset 15621

Timestamp:

Nov 15, 2007, 9:29:47 AM (18 years ago)

Author:

eugene

Message:

refine deps for autocode elements

Location:

trunk/Ohana/src

Files:

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

trunk/Ohana/src/libautocode/Makefile

@@ -46 +46 @@
 $(DESTINC)/autocode.h : $(INC)/autocode.h
 
-$(AOBJS): $(INC)/autocode.h
+$(AOBJS): $(DEF)/autocode.c $(DESTINC)/autocode.h
 
-$(INC)/autocode.h: $(AINCS) $(DEF)/common.h
+$(INC)/autocode.h: $(AINCS) $(DEF)/autocode.h $(DEF)/common.h
         cat $(DEF)/common.h >  $(INC)/autocode.h
         cat $(AINCS)        >> $(INC)/autocode.h
@@ -54 +54 @@
         @echo done with autocode.h
 
+$(INC)/%.h: $(DEF)/%.d $(DEF)/autocode.h $(DEF)/common.h
+        @if [ ! -d $(INC) ]; then mkdir -p $(INC); fi
+        ./generate $< $(DEF)/autocode.h $@
+
+$(SRC)/%.c: $(DEF)/%.d $(DEF)/autocode.c $(INC)/%.h
+        @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+        ./generate $< $(DEF)/autocode.c $@
+
 $(TEX)/%.tex: $(DEF)/%.d $(DEF)/autocode.tex
         @if [ ! -d $(TEX) ]; then mkdir -p $(TEX); fi
         ./generate $< $(DEF)/autocode.tex $@
-
-$(INC)/%.h: $(DEF)/%.d $(DEF)/autocode.h
-        @if [ ! -d $(INC) ]; then mkdir -p $(INC); fi
-        ./generate $< $(DEF)/autocode.h $@
-
-$(SRC)/%.c: $(DEF)/%.d $(DEF)/autocode.c
-        @if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-        ./generate $< $(DEF)/autocode.c $@
 
 clean:  cleandef

trunk/Ohana/src/libdvo/Makefile

@@ -70 +70 @@
 
 $(OBJS): $(INCS)
-$(AOBJS): $(ADEF)/autocode.c $(ADEF)/autocode.h $(AINC)/autocode.h
-
-$(AINC)/autocode.h: $(AINCS)
-
-$(DESTINC)/autocode.h: $(AINC)/autocode.h
-        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
-        rm -f $@
-        cp $< $@
-
-bar: $(DESTINC)/autocode.h
-
-foo:
-        @echo $(DESTINC)/autocode.h
-        @echo $(AINC)/autocode.h
-        @echo $(AINCS)
 
 $(LIB)/libdvo.$(ARCH).a:  $(AOBJS) $(OBJS)
@@ -92 +77 @@
 $(DESTLIB)/libdvo.$(DLLTYPE): $(LIB)/libdvo.$(ARCH).$(DLLTYPE)
 
-$(ASRC)/%.c : $(ADEF)/%.d
+# dependency rules for the autocode files
+
+$(AOBJS): $(ADEF)/autocode.c $(DESTINC)/autocode.h
+
+$(DESTINC)/autocode.h: $(AINC)/autocode.h
+        @if [ ! -d $(DESTINC) ]; then mkdir -p $(DESTINC); fi
+        rm -f $@
+        cp $< $@
+
+$(AINC)/autocode.h: $(AINCS) $(ADEF)/autocode.h $(ADEF)/common.h
         echo "make $@ from $^"
         cd $(AUTO) && make $@
 
-$(ASRC)/%.$(ARCH).o : $(ASRC)/%.c
+# generic rule for AINCS
+$(AINC)/%.h : $(ADEF)/%.d $(ADEF)/autocode.h $(ADEF)/common.h
         echo "make $@ from $^"
         cd $(AUTO) && make $@
 
-$(AINC)/%.h : $(ADEF)/%.d
+# generic rule for ASRC
+$(ASRC)/%.c : $(ADEF)/%.d $(ADEF)/autocode.c $(AINC)/%.h
         echo "make $@ from $^"
         cd $(AUTO) && make $@
 
-$(AINC)/autocode.h: $(AINCS) $(ADEF)/common.h
+# generic rule for AOBJS
+$(ASRC)/%.$(ARCH).o : $(ASRC)/%.c
         echo "make $@ from $^"
         cd $(AUTO) && make $@