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

Add ability to include user makefile rules before main makefile is re… (#802)

Browse Source 
* Add ability to include user makefile rules before main makefile is read. #801

Added 2 new files that are optionally included in the main makefile, S_pre.mk and
S_post.mk.  S_post.mk serves the same purpose as S_overrides.mk.  The intent is

1.  (19) Have both files present in the current major version.
2.  (21) Add warning deprecating S_overrides.mk
3.  (23) Actually deprecate S_overrides.mk

* Add ability to include user makefile rules before main makefile #802

Moving pre inclusion to after TRICK_HOME is defined.

* blank line
This commit is contained in:
Alex Lin 2019-06-03 09:48:59 -05:00 committed by GitHub
parent f7a7419e0d
commit cbf8258b6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bin/trick-CP
View File

@ -155,6 +155,8 @@ ifndef TRICK_HOME
export TRICK_HOME := SUB_TRICK_HOME export TRICK_HOME := SUB_TRICK_HOME
endif endif
-include S_pre.mk
ifneq ($(wildcard ${TRICK_HOME}/share/trick/makefiles/Makefile.common),) ifneq ($(wildcard ${TRICK_HOME}/share/trick/makefiles/Makefile.common),)
include ${TRICK_HOME}/share/trick/makefiles/Makefile.common include ${TRICK_HOME}/share/trick/makefiles/Makefile.common
@ -258,6 +260,7 @@ include build/Makefile_swig_deps
endif endif
-include build/Makefile_overrides -include build/Makefile_overrides
-include S_overrides.mk -include S_overrides.mk
-include S_post.mk
ifndef MAKE_RESTARTS ifndef MAKE_RESTARTS
REMOVE_MAKE_OUT := $(shell rm -f $(MAKE_OUT)) REMOVE_MAKE_OUT := $(shell rm -f $(MAKE_OUT))