From b1f41ab6de75d1d9c58443de43e771cb37726005 Mon Sep 17 00:00:00 2001 From: Harry Moffat Date: Tue, 1 Jan 2008 19:08:08 +0000 Subject: [PATCH] added more dependency checks --- ext/tpx/.cvsignore | 2 +- ext/tpx/Makefile.in | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ext/tpx/.cvsignore b/ext/tpx/.cvsignore index b39c0d1a8..67a3528c2 100644 --- a/ext/tpx/.cvsignore +++ b/ext/tpx/.cvsignore @@ -1,3 +1,3 @@ Makefile .depends - +*.d diff --git a/ext/tpx/Makefile.in b/ext/tpx/Makefile.in index 829b55ff7..9f6be1d5b 100755 --- a/ext/tpx/Makefile.in +++ b/ext/tpx/Makefile.in @@ -7,7 +7,6 @@ do_ranlib = @DO_RANLIB@ PIC_FLAG=@PIC@ CXX_FLAGS = @CXXFLAGS@ $(CXX_OPT) $(PIC_FLAG) -#COBJS = tpx_files.o COBJS = Methane.o Nitrogen.o Oxygen.o Water.o Hydrogen.o RedlichKwong.o \ CarbonDioxide.o Heptane.o lk.o Sub.o utils.o HFC134a.o @@ -19,9 +18,9 @@ TPLIB = @buildlib@/libtpx.a DEPENDS = $(COBJS:.o=.d) -all: $(TPLIB) +all: $(TPLIB) .depends -%.d: +%.d: Makefile %.o @CXX_DEPENDS@ $(CXX_INCLUDES) $*.cpp > $*.d .cpp.o: @@ -39,9 +38,13 @@ endif clean: $(RM) $(COBJS) $(FOBJS) *~ *.d .depends -depends: $(DEPENDS) +depends: + @MAKE@ .depends + +.depends: $(DEPENDS) cat *.d > .depends - $(RM) $(DEPENDS) + +$(COBJS): Makefile ifeq ($(wildcard .depends), .depends) include .depends