Merge pull request #793 from nasa/792

Remove redundant prerequisite for "all" target
This commit is contained in:
dbankieris 2019-06-03 09:41:42 -05:00 committed by GitHub
commit b9487c92f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions

View File

@ -149,6 +149,8 @@ __END__
# Disable built-in implicit rules to increase build speed. # Disable built-in implicit rules to increase build speed.
.SUFFIXES: .SUFFIXES:
.PHONY: all
ifndef TRICK_HOME ifndef TRICK_HOME
export TRICK_HOME := SUB_TRICK_HOME export TRICK_HOME := SUB_TRICK_HOME
endif endif
@ -166,7 +168,6 @@ endif
all: all:
$(info Trick Build Process Complete) $(info Trick Build Process Complete)
test: TRICK_SYSTEM_CFLAGS += -DTRICK_UNIT_TEST test: TRICK_SYSTEM_CFLAGS += -DTRICK_UNIT_TEST
test: TRICK_SYSTEM_CXXFLAGS += -DTRICK_UNIT_TEST test: TRICK_SYSTEM_CXXFLAGS += -DTRICK_UNIT_TEST
test: all test: all

View File

@ -319,7 +319,7 @@ foreach ( @all_read_only_libs ) {
print MAKEFILE " print MAKEFILE "
all: \$(S_MAIN) S_sie.resource all: S_sie.resource
\$(S_MAIN): S_source.hh \$(TRICK_STATIC_LIB) \$(S_OBJECTS) \$(MODEL_OBJECTS) \$(S_MAIN): S_source.hh \$(TRICK_STATIC_LIB) \$(S_OBJECTS) \$(MODEL_OBJECTS)
\t\$(PRINT_EXE_LINK) \t\$(PRINT_EXE_LINK)