Update Makefile #1056

This commit is contained in:
Penn, John M 047828115 2020-09-28 01:19:41 -05:00
parent abfe30c19d
commit 9df4f801ea

View File

@ -15,12 +15,11 @@ all: test
test: SAIntegrator_unittest test: SAIntegrator_unittest
./SAIntegrator_unittest --gtest_output=xml:${TRICK_HOME}/trick_test/SAIntegrator_unittest.xml ./SAIntegrator_unittest --gtest_output=xml:${TRICK_HOME}/trick_test/SAIntegrator_unittest.xml
SAIntegrator_unittest.o : SAIntegrator_unittest.cc SAIntegrator_unittest.o : SAIntegrator_unittest.cc
$(CPP) $(CFLAGS) $(INCLUDE_DIRS) -c $< $(CPP) $(CFLAGS) $(INCLUDE_DIRS) -c $<
SAIntegrator_unittest : ${LIBDIR}/${LIBNAME} SAIntegrator_unittest.o SAIntegrator_unittest : ${LIBDIR}/${LIBNAME} SAIntegrator_unittest.o
$(CPP) $(CFLAGS) -o $@ $^ -lgtest -lgtest_main -lpthread $(CPP) $(CFLAGS) -o $@ $^ -L${LIBDIR} -lSAInteg -lgtest -lgtest_main -lpthread
${LIBDIR}/${LIBNAME} : ${LIBDIR}/${LIBNAME} :
$(MAKE) -C .. $(MAKE) -C ..