Merge pull request #834 from nasa/358

Infer TRICK_HOME in Makefiles
2024-12-21 14:07:51 +00:00 · 2019-06-21 13:21:25 -05:00 · 2019-06-21 13:21:25 -05:00 · 00302208b5
commit 00302208b5
parent 11eae2c43d d135353c90
46 changed files with 48 additions and 122 deletions
--- a/trick_source/sim_services/CheckPointAgent/Makefile
+++ b/trick_source/sim_services/CheckPointAgent/Makefile
@ -1,5 +1,4 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

--- a/trick_source/sim_services/CheckPointRestart/Makefile
+++ b/trick_source/sim_services/CheckPointRestart/Makefile
@ -1,9 +1,7 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

 ifneq ($(DMTCP),)
 TRICK_CXXFLAGS += -D_DMTCP -I$(DMTCP)/dmtcpaware
 endif
-
--- a/trick_source/sim_services/Clock/Makefile
+++ b/trick_source/sim_services/Clock/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/Clock/test/Makefile
+++ b/trick_source/sim_services/Clock/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../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
--- a/trick_source/sim_services/Collect/Makefile
+++ b/trick_source/sim_services/Collect/Makefile
@ -1,9 +1,7 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

 ifneq ($(DMTCP),)
 TRICK_CXXFLAGS += -D_DMTCP -I$(DMTCP)/dmtcpaware
 endif
-
--- a/trick_source/sim_services/CommandLineArguments/Makefile
+++ b/trick_source/sim_services/CommandLineArguments/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/DMTCP/Makefile
+++ b/trick_source/sim_services/DMTCP/Makefile
@ -1,9 +1,7 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

 ifneq ($(DMTCP),)
 TRICK_CXXFLAGS += -D_DMTCP -I$(DMTCP)/dmtcpaware
 endif
-
--- a/trick_source/sim_services/DataRecord/Makefile
+++ b/trick_source/sim_services/DataRecord/Makefile
@ -1,9 +1,9 @@
-TRICK_CXXFLAGS += -std=c++11
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

+TRICK_CXXFLAGS += -std=c++11
+
 ifneq ($(HDF5),)
 ifneq ($(HDF5),/usr)
 $(OBJ_DIR)/DRHDF5.o: TRICK_CXXFLAGS += -I$(HDF5)/include
@ -15,4 +15,3 @@ endif
 ifneq ($(DMTCP),)
 TRICK_CXXFLAGS += -D_DMTCP -I$(DMTCP)/dmtcpaware
 endif
-
--- a/trick_source/sim_services/DebugPause/Makefile
+++ b/trick_source/sim_services/DebugPause/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/EchoJobs/Makefile
+++ b/trick_source/sim_services/EchoJobs/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/Environment/Makefile
+++ b/trick_source/sim_services/Environment/Makefile
@ -1,6 +1,4 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib

 -include Makefile_deps
-
--- a/trick_source/sim_services/EventManager/Makefile
+++ b/trick_source/sim_services/EventManager/Makefile
@ -1,5 +1,4 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib

 TRICK_CFLAGS += $(PYTHON_INCLUDES)
@ -10,4 +9,3 @@ ifeq ($(PYTHON_VERSION),2.4)
 endif

 -include Makefile_deps
-
--- a/trick_source/sim_services/Executive/Makefile
+++ b/trick_source/sim_services/Executive/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/Executive/test/Makefile
+++ b/trick_source/sim_services/Executive/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../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
@ -35,4 +35,3 @@ Executive_test.o : Executive_test.cpp

 Executive_test : Executive_test.o
 	$(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
-
--- a/trick_source/sim_services/ExternalApplications/Makefile
+++ b/trick_source/sim_services/ExternalApplications/Makefile
@ -1,8 +1,7 @@
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

 ifneq ($(DMTCP),)
 TRICK_CXXFLAGS += -D_DMTCP -I$(DMTCP)/dmtcpaware
 endif
-
--- a/trick_source/sim_services/FrameLog/Makefile
+++ b/trick_source/sim_services/FrameLog/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/InputProcessor/Makefile
+++ b/trick_source/sim_services/InputProcessor/Makefile
@ -1,5 +1,4 @@
-TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common

 # override the trick lib file for this directory.
 TRICK_LIB := $(TRICK_LIB_DIR)/libtrick_pyip.a
@ -9,4 +8,3 @@ TRICK_CFLAGS += $(PYTHON_INCLUDES)
 TRICK_CXXFLAGS += $(PYTHON_INCLUDES)

 -include Makefile_deps
-
--- a/trick_source/sim_services/Integrator/Makefile
+++ b/trick_source/sim_services/Integrator/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/Integrator/test/Makefile
+++ b/trick_source/sim_services/Integrator/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../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
@ -51,4 +51,3 @@ Integrator_unittest.o : Integrator_unittest.cc

 Integrator_unittest : Integrator_unittest.o
 	$(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
-
--- a/trick_source/sim_services/Integrator/trick_algorithms/Makefile
+++ b/trick_source/sim_services/Integrator/trick_algorithms/Makefile
@ -1,4 +1,3 @@
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/JITInputFile/Makefile
+++ b/trick_source/sim_services/JITInputFile/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/JSONVariableServer/Makefile
+++ b/trick_source/sim_services/JSONVariableServer/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/MasterSlave/Makefile
+++ b/trick_source/sim_services/MasterSlave/Makefile
@ -1,5 +1,4 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

--- a/trick_source/sim_services/MemoryManager/Makefile
+++ b/trick_source/sim_services/MemoryManager/Makefile
@ -1,7 +1,7 @@
 # set CONFIG_MK to allow compilation without running configure
 CONFIG_MK = 1

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 # set the TRICK_LIB variable to create a separate library for the Memory Manager.
 TRICK_LIB := $(TRICK_LIB_DIR)/libtrick_mm.a
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
--- a/trick_source/sim_services/MemoryManager/test/Makefile
+++ b/trick_source/sim_services/MemoryManager/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../share/trick/makefiles/Makefile.common

 #COVERAGE_FLAGS += -fprofile-arcs -ftest-coverage -O0
 #TRICK_SYSTEM_LDFLAGS  += ${COVERAGE_FLAGS}
@ -216,4 +216,3 @@ MM_write_checkpoint_hexfloat : MM_write_checkpoint_hexfloat.o io_MM_write_checkp

 Bitfield_tests : Bitfield_tests.o
 	$(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ -L${TRICK_HOME}/lib_${TRICK_HOST_CPU} $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
-
--- a/trick_source/sim_services/Message/Makefile
+++ b/trick_source/sim_services/Message/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/MonteCarlo/Makefile
+++ b/trick_source/sim_services/MonteCarlo/Makefile
@ -1,5 +1,4 @@
-TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib

 -include Makefile_deps
@ -12,4 +11,3 @@ ifneq ($(GSL_HOME),/usr)
 TRICK_CXXFLAGS += -I${GSL_HOME}/include
 endif
 endif
-
--- a/trick_source/sim_services/MonteCarlo/test/Makefile
+++ b/trick_source/sim_services/MonteCarlo/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../share/trick/makefiles/Makefile.common

 # Flags passed to the preprocessor.
 TRICK_CXXFLAGS += -I$(GTEST_HOME)/include -I$(TRICK_HOME)/include -g -Wall -Wextra -DGTEST_HAS_TR1_TUPLE=0 -std=c++11
--- a/trick_source/sim_services/RealtimeInjector/Makefile
+++ b/trick_source/sim_services/RealtimeInjector/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/RealtimeSync/Makefile
+++ b/trick_source/sim_services/RealtimeSync/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/ScheduledJobQueue/Makefile
+++ b/trick_source/sim_services/ScheduledJobQueue/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/ScheduledJobQueue/test/Makefile
+++ b/trick_source/sim_services/ScheduledJobQueue/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../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
@ -34,4 +34,3 @@ ScheduledJobQueue_test.o : ScheduledJobQueue_test.cpp

 ScheduledJobQueue_test : ScheduledJobQueue_test.o
 	$(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
-
--- a/trick_source/sim_services/Scheduler/Makefile
+++ b/trick_source/sim_services/Scheduler/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/Sie/Makefile
+++ b/trick_source/sim_services/Sie/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/SimObject/Makefile
+++ b/trick_source/sim_services/SimObject/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/SimTime/Makefile
+++ b/trick_source/sim_services/SimTime/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/ThreadBase/Makefile
+++ b/trick_source/sim_services/ThreadBase/Makefile
@ -1,4 +1,3 @@
-TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
--- a/trick_source/sim_services/Timer/Makefile
+++ b/trick_source/sim_services/Timer/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/Timer/test/Makefile
+++ b/trick_source/sim_services/Timer/test/Makefile
@ -5,7 +5,7 @@
 #   make TARGET - makes the given target.
 #   make clean  - removes all files generated by make.

-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../../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
@ -34,4 +34,3 @@ ITimer_test.o : ITimer_test.cpp

 ITimer_test : ITimer_test.o
 	$(TRICK_CXX) $(TRICK_SYSTEM_LDFLAGS) -o $@ $^ $(OTHER_OBJECTS) $(TRICK_LIBS) $(TRICK_LIBS) $(TRICK_EXEC_LINK_LIBS)
-
--- a/trick_source/sim_services/UdUnits/Makefile
+++ b/trick_source/sim_services/UdUnits/Makefile
@ -1,5 +1,3 @@
-TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/UnitTest/Makefile
+++ b/trick_source/sim_services/UnitTest/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/UnitsMap/Makefile
+++ b/trick_source/sim_services/UnitsMap/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/VariableServer/Makefile
+++ b/trick_source/sim_services/VariableServer/Makefile
@ -1,5 +1,4 @@
-TRICK_HOME := $(abspath $(dir $(lastword $(MAKEFILE_LIST)))../../..)
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
 TRICK_CXXFLAGS += -std=c++11
--- a/trick_source/sim_services/Zeroconf/Makefile
+++ b/trick_source/sim_services/Zeroconf/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/include/Makefile
+++ b/trick_source/sim_services/include/Makefile
@ -1,5 +1,3 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps
-
--- a/trick_source/sim_services/mains/Makefile
+++ b/trick_source/sim_services/mains/Makefile
@ -1,5 +1,4 @@
-
-include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
+include $(dir $(lastword $(MAKEFILE_LIST)))../../../share/trick/makefiles/Makefile.common
 include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 -include Makefile_deps

@ -29,4 +28,3 @@ include ${TRICK_HOME}/share/trick/makefiles/Makefile.tricklib
 #
 #
 #-include Makefile_deps
-