Revert 150ea9f

We've agreed that the long-term solution is to refactor the makefiles so
we don't use recursive make. Until then, continue double including
S_overrides.mk so that the $(S_MAIN) target is available in
S_overrides.mk. Resolve #360 by having Trickified libraries use
target-specific variables (ironically, on $(S_MAIN)) to avoid
duplication of the -whole-archive option.

libexec/trick/make_makefile_src

@@ -338,7 +338,8 @@ foreach $k ( sort keys %files_by_dir ) {
 
 print MAKEFILE "
 -include build/Makefile_io_src
-include build/Makefile_swig" ;
+include build/Makefile_swig
+-include S_overrides.mk" ;
 close MAKEFILE ;
 
 # write out all of files we processed as dependencies to Makefile_src

share/trick/makefiles/Makefile.common

@@ -52,7 +52,6 @@ export TRICK_GTE_EXT
 export TRICK_HOST_CPU := $(shell export TRICK_CC=$(TRICK_CC) && $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU)
 export TRICK_EXEC_LINK_LIBS = ${PTHREAD_LIBS} $(PYTHON_LIB) $(UDUNITS_LDFLAGS) $(PLATFORM_LIBS) -lm -ldl
 export TRICK_LIBS = ${RPATH} -L${TRICK_LIB_DIR} -ltrick -ltrick_pyip -ltrick_comm -ltrick_math -ltrick_units -ltrick_mm
-export TRICK_USER_LINK_LIBS
 export TRICK_SYSTEM_CFLAGS
 export TRICK_SYSTEM_CXXFLAGS
 export TRICK_SYSTEM_SFLAGS

share/trick/makefiles/Makefile.sim

@@ -11,6 +11,8 @@ endif
 
 .NOTPARALLEL:
 
+export TRICK_ICG_EXCLUDE
+
 # Use /bin/bash as the shell so we can use PIPESTATUS
 SHELL = /bin/bash