From ebdb0b4094535cd8aec0aa950c6cf3481c9720a1 Mon Sep 17 00:00:00 2001
From: Harry Moffat <hkmoffa@sandia.gov>
Date: Tue, 1 Jan 2008 19:14:33 +0000
Subject: [PATCH] Added more dependencies.

---
 Cantera/src/equil/Makefile.in  |  7 +++++--
 Cantera/src/oneD/Makefile.in   |  6 ++++--
 Cantera/src/thermo/Makefile.in | 12 +++++++++++-
 ext/math/Makefile.in           |  5 ++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/Cantera/src/equil/Makefile.in b/Cantera/src/equil/Makefile.in
index c499e23f4..1723a95c0 100644
--- a/Cantera/src/equil/Makefile.in
+++ b/Cantera/src/equil/Makefile.in
@@ -71,12 +71,13 @@ endif
 
 DEPENDS = $(EQUIL_OBJ:.o=.d) $(VCSNONIDEAL_OBJ:.o=.d)
 
-all: $(LIB) $(VLIB)
+all: $(LIB) $(VLIB) .depends
 	@(@INSTALL@ -d $(INCDIR))
 	@(for lh in $(EQUIL_H) $(VCSNONIDEAL_H); do \
 	  $(INSTALL_TSC) "$${lh}" $(INCDIR) ; \
 	done)
-%.d:
+
+%.d: Makefile %.o
 	@CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d
 
 .cpp.o:
@@ -119,6 +120,8 @@ depends:
 .depends: $(DEPENDS)
 	cat $(DEPENDS) > .depends
 
+$(EQUIL_OBJ) $(VCSNONIDEAL_OBJ): Makefile
+
 TAGS: 
 	etags *.h *.cpp
 
diff --git a/Cantera/src/oneD/Makefile.in b/Cantera/src/oneD/Makefile.in
index 21b78e7ad..93cf945a3 100644
--- a/Cantera/src/oneD/Makefile.in
+++ b/Cantera/src/oneD/Makefile.in
@@ -31,13 +31,13 @@ ONED_LIB = @buildlib@/liboneD.a
 
 DEPENDS = $(OBJS:.o=.d)
 
-%.d:
+%.d: Makefile %.o
 	@CXX_DEPENDS@ @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d
 
 .cpp.o:
 	@CXX@ -c $< @DEFS@ $(CXX_FLAGS) $(CXX_INCLUDES)
 
-all: $(ONED_LIB)
+all: $(ONED_LIB) .depends
 	@(@INSTALL@ -d $(INCDIR))
 	@(for lh in $(ONED_H) ; do \
           $(INSTALL_TSC) "$${lh}" $(INCDIR) ; \
@@ -68,6 +68,8 @@ depends:
 .depends: $(DEPENDS)
 	cat *.d > .depends
 
+$(OBJS): Makefile
+
 TAGS: 
 	etags *.h *.cpp
 
diff --git a/Cantera/src/thermo/Makefile.in b/Cantera/src/thermo/Makefile.in
index 028bb932c..8f4b09f3b 100644
--- a/Cantera/src/thermo/Makefile.in
+++ b/Cantera/src/thermo/Makefile.in
@@ -86,7 +86,7 @@ all: $(LIB) .depends
 	@(for lh in $(CATHERMO_H) ; do \
 	  $(INSTALL_TSC) "$${lh}" $(INCDIR) ; \
 	done)
-%.d: Makefile $*.o
+%.d: Makefile %.o
 	@CXX_DEPENDS@ $(CXX_FLAGS) $(CXX_INCLUDES) $*.cpp > $*.d
 
 .cpp.o:
@@ -115,12 +115,22 @@ clean:
            $(RM) -rf SunWS_cache ; \
          fi )
 
+#
+# Dependency rules
+#
 depends:
 	@MAKE@ .depends
 
 .depends: $(DEPENDS)
 	cat $(DEPENDS) > .depends
 
+$(CATHERMO_OBJ): Makefile
+
+#
+# Make sure that if the Makefile changes, all object files
+# must get recompiled
+$(CATHERMO_OBJ): Makefile
+
 TAGS: 
 	etags *.h *.cpp
 
diff --git a/ext/math/Makefile.in b/ext/math/Makefile.in
index 942de35d0..41efc80ad 100755
--- a/ext/math/Makefile.in
+++ b/ext/math/Makefile.in
@@ -58,6 +58,8 @@ endif
 %.o : %.f
 	@F77@ -c $< $(F_FLAGS)
 
+$(OBJS): Makefile
+
 clean:
 	$(RM) $(OBJS) $(LIB)
 
@@ -65,6 +67,3 @@ depends:
 	echo '...'
 
  
-
-
-