ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2024-12-21 06:03:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #791 from nasa/790

Browse Source 
Remove - from most -includes in SIM_*/makefile
This commit is contained in:
dbankieris 2019-06-03 09:41:22 -05:00 committed by GitHub
commit c5e5308dd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/trick-CP
View File

@ -206,7 +206,6 @@ build/Makefile_io_src: S_source.hh | build
$(call ECHO_AND_LOG,${TRICK_HOME}/bin/trick-ICG -m ${TRICK_ICGFLAGS} ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} $<) $(call ECHO_AND_LOG,${TRICK_HOME}/bin/trick-ICG -m ${TRICK_ICGFLAGS} ${TRICK_CXXFLAGS} ${TRICK_SYSTEM_CXXFLAGS} $<)
# Create makefile for source code # Create makefile for source code
#build/Makefile_src: build/ICG_processed build/ICG_no_found build/S_define.lib_deps
build/Makefile_src: build/Makefile_src_deps build/Makefile_io_src S_source.hh build/Makefile_src: build/Makefile_src_deps build/Makefile_io_src S_source.hh
$(PRINT_MAKEFILE_SRC) $(PRINT_MAKEFILE_SRC)
$(call ECHO_AND_LOG,${TRICK_HOME}/$(LIBEXEC)/trick/make_makefile_src $? 2>&1) $(call ECHO_AND_LOG,${TRICK_HOME}/$(LIBEXEC)/trick/make_makefile_src $? 2>&1)
@ -248,12 +247,12 @@ Simulation make options:\n\
CLEAN_TARGETS = tidy clean spotless distclean apocalypse CLEAN_TARGETS = tidy clean spotless distclean apocalypse
ifeq ($(findstring ${MAKECMDGOALS},$(CLEAN_TARGETS)),) ifeq ($(findstring ${MAKECMDGOALS},$(CLEAN_TARGETS)),)
-include build/Makefile_S_define include build/Makefile_S_define
-include build/Makefile_src include build/Makefile_src
-include build/Makefile_src_deps include build/Makefile_src_deps
-include build/Makefile_io_src include build/Makefile_io_src
-include build/Makefile_swig include build/Makefile_swig
-include build/Makefile_swig_deps include build/Makefile_swig_deps
-include build/Makefile_ICG -include build/Makefile_ICG
endif endif
-include build/Makefile_overrides -include build/Makefile_overrides