From 10288a2430fbac2c4e03483428eb255f60258141 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Wed, 19 Aug 2015 06:05:30 +0000 Subject: [PATCH] added common to VPATH git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10111 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- unit/GNUmakefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/unit/GNUmakefile b/unit/GNUmakefile index 377dbffe..9f033067 100644 --- a/unit/GNUmakefile +++ b/unit/GNUmakefile @@ -1,5 +1,5 @@ CPPFLAGS = -CPPUNIT = /z/parkplace/home/charlton +##CPPUNIT = /z/parkplace/home/charlton CXX = g++ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXFLAGS = -g -O2 -Wall -fno-var-tracking-assignments @@ -7,15 +7,16 @@ CXXFLAGS = -g -O2 -Wall -fno-var-tracking-assignments CXXLINK = $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ DEFS = -DNDEBUG -DSWIG_SHARED_OBJ -DPHREEQC_CPP -DPHREEQC_CLASS -DUSE_PHRQ_ALLOC -DCPPUNIT DEPDIR = .deps -INCLUDES = -I../src -I../src/phreeqcpp -I../src/phreeqcpp/PhreeqcKeywords -I$(CPPUNIT)/include -LDFLAGS = -L$(CPPUNIT)/lib +INCLUDES = -I../src -I../src/phreeqcpp -I../src/phreeqcpp/common -I../src/phreeqcpp/PhreeqcKeywords +## -I$(CPPUNIT)/include +##LDFLAGS = -L$(CPPUNIT)/lib LIBS = -lcppunit -ldl -lm MKDIR_P = /bin/mkdir -p MV = mv -f RANLIB = ranlib RM = rm -f TARGET = unit -VPATH = .:../src:../src/phreeqcpp:../src/phreeqcpp/PhreeqcKeywords +VPATH = .:../src:../src/phreeqcpp:../src/phreeqcpp/common:../src/phreeqcpp/PhreeqcKeywords %.o: %.c test -z "$(DEPDIR)" || $(MKDIR_P) "$(DEPDIR)"