ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-06-17 06:38:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove double include of S_overrides.mk

Browse Source 
Refs #360
This commit is contained in:
Derek Bankieris
2016-12-07 14:07:41 -06:00
committed by dbankieris
parent 3600e3880a
commit 150ea9f094
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libexec/trick/make_makefile_src
View File

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

2
share/trick/makefiles/Makefile.common
View File

@ -52,9 +52,11 @@ export TRICK_GTE_EXT
export TRICK_HOST_CPU := $(shell export TRICK_CC=$(TRICK_CC) && $(TRICK_HOME)/bin/trick-gte TRICK_HOST_CPU) 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_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_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_CFLAGS
export TRICK_SYSTEM_CXXFLAGS export TRICK_SYSTEM_CXXFLAGS
export TRICK_SYSTEM_SFLAGS export TRICK_SYSTEM_SFLAGS
export SWIG_FLAGS
IO_SRC_DIR := io_src/ IO_SRC_DIR := io_src/
OBJ_DIR := object_${TRICK_HOST_CPU} OBJ_DIR := object_${TRICK_HOST_CPU}

2
share/trick/makefiles/Makefile.sim
View File

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