ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-18 20:57:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove dupilcate stand-alone libraries

Browse Source 
The test programs now need more than just -ltrick.

refs #71
This commit is contained in:
Alex Lin 2015-06-24 16:54:15 -05:00
parent 03979a2079
commit 44736be398
8 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
trick_sims/SIM_leaks/makefile
View File

@ -1,5 +0,0 @@
include ${TRICK_HOME}/makefiles/Makefile.common
include ${TRICK_HOME}/makefiles/Makefile.sim
-include S_overrides.mk

10
trick_sims/SIM_test_io/makefile
View File

@ -1,10 +0,0 @@
# CP found at /users/alin/trick_dev/trunk/bin
ifndef TRICK_HOME
export TRICK_HOME := /users/alin/trick_dev/trunk
endif
include ${TRICK_HOME}/makefiles/Makefile.common
include ${TRICK_HOME}/makefiles/Makefile.sim
-include S_overrides.mk

6
trick_source/sim_services/Clock/test/Makefile
View File

@ -9,13 +9,13 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
TRICK_LIBS = ${TRICK_LIB_DIR}/libtrick.a
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_units
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you
# created to the list.
TESTS = TPROCTEClock_test BC635Clock_test
TESTS = TPROCTEClock_test BC635Clock_test
OTHER_OBJECTS = ../../include/object_${TRICK_HOST_CPU}/io_JobData.o \
../../include/object_${TRICK_HOST_CPU}/io_SimObject.o

2
trick_source/sim_services/Executive/test/Makefile
View File

@ -10,7 +10,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
TRICK_LIBS = ${TRICK_LIB_DIR}/libtrick.a
TRICK_LIBS = -L ${TRICK_LIB_DIR} -ltrick -ltrick_units
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you

2
trick_source/sim_services/Integrator/test/Makefile
View File

@ -10,7 +10,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -I${TRICK_HOME}/trick_source -I${TRICK_HOME}/include/trick/compat -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0 -DUSE_ER7_UTILS_INTEGRATORS=1
TRICK_LIBS = ${TRICK_LIB_DIR}/libtrick.a
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_units
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you

2
trick_source/sim_services/MonteCarlo/test/Makefile
View File

@ -16,7 +16,7 @@ TRICK_CXXFLAGS += -I${GSL_HOME}/include
endif
endif
TRICK_LIBS = ${TRICK_LIB_DIR}/libtrick_pyip.a ${TRICK_LIB_DIR}/libtrick.a
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_units -ltrick_math
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you

2
trick_source/sim_services/ScheduledJobQueue/test/Makefile
View File

@ -10,7 +10,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
TRICK_LIBS = ${TRICK_LIB_DIR}/libtrick.a
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_units
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you

2
trick_source/sim_services/Timer/test/Makefile
View File

@ -10,7 +10,7 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
# Flags passed to the preprocessor.
TRICK_CPPFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0
TRICK_LIBS = ${TRICK_LIB_DIR}/libtrick.a
TRICK_LIBS = -L${TRICK_LIB_DIR} -ltrick -ltrick_units
TRICK_EXEC_LINK_LIBS += ${GTEST_HOME}/lib/libgtest.a ${GTEST_HOME}/lib/libgtest_main.a
# All tests produced by this Makefile. Remember to add new tests you