From 54bafaab2c49eb0c64e6e40750f2f14e869f1edd Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Mon, 3 Oct 2016 19:20:37 -0400 Subject: [PATCH] ooh, nearly really there. just a few remnants floating in the binaries now. --- scripts/clam/cpp/rules.def | 20 ++++++++++++-------- scripts/clam/rules.def | 10 +++++----- scripts/clam/variables.def | 18 +++++++++--------- 3 files changed, 26 insertions(+), 22 deletions(-) diff --git a/scripts/clam/cpp/rules.def b/scripts/clam/cpp/rules.def index a6821bf4..eff3d6bf 100644 --- a/scripts/clam/cpp/rules.def +++ b/scripts/clam/cpp/rules.def @@ -370,12 +370,14 @@ endif ACTUAL_FIRST_TARGETS = check_requirements $(EXTRA_FIRST_TARGETS) $(VERSION_TARGET) $(FIRST_TARGETS) pre_compilation # Adds the primary targets to the list of products to create. -ifeq "$(NO_COMPILE)" "" +#ifeq "$(NO_COMPILE)" "" + ifneq "$(COMPILER)" "VISUAL_CPP" ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%) else ACTUAL_TARGETS1 = $(TARGETS:%.exe=$(EXECUTABLE_DIR)/%.exe) endif + ifneq "$(COMPILER)" "VISUAL_CPP" ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=%.so) ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).so) @@ -383,15 +385,17 @@ ifeq "$(NO_COMPILE)" "" ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.so=%.dll) ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.dll=$(DYNAMIC_LIBRARY_DIR)/%$(TRIPART_VERSION).dll) endif + ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=$(STATIC_LIBRARY_DIR)/%$(TRIPART_VERSION).library) ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=$(EXECUTABLE_DIR)/%.elf) -else #is no_compile - ACTUAL_TARGETS1 = $(TARGETS:%.exe=) - ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=) - ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=) - ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=) - ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=) -endif + +#else #is no_compile +# ACTUAL_TARGETS1 = $(TARGETS:%.exe=) +# ACTUAL_TARGETS2 = $(ACTUAL_TARGETS1:%.dll=) +# ACTUAL_TARGETS3 = $(ACTUAL_TARGETS2:%.so=) +# ACTUAL_TARGETS4 = $(ACTUAL_TARGETS3:%.lib=) +# ACTUAL_TARGETS = $(ACTUAL_TARGETS4:%.elf=) +#endif # Adds the last few targets for CLAM to do. ACTUAL_LAST_TARGETS = post_compilation $(LAST_TARGETS) diff --git a/scripts/clam/rules.def b/scripts/clam/rules.def index 8d41bf95..182db898 100644 --- a/scripts/clam/rules.def +++ b/scripts/clam/rules.def @@ -3,9 +3,9 @@ ############################################################################### # This file contains composite macros and rules for creating objects. -# This file should be included in the user's makefile after the variables +# This file should be included in the user makefile after the variables # have been initialized appropriately for the particular project being -# created. The user's own targets should be placed after the include +# created. The user targets should be placed after the include # directive that specifies this file. ############################################################################### @@ -19,7 +19,7 @@ ifneq "$(BUILD_AFTER)" "" LAST_TARGETS += $(BUILD_AFTER:%=%.make) endif -# Make the default action be an error stop if we can't find an appropriate rule. +# Make the default action be an error stop if we ca not find an appropriate rule. .DEFAULT: $(HIDER)echo $(HIDER)echo [$@] is missing files or has a makefile problem. @@ -112,8 +112,8 @@ scratch_other_cleans: # is included. we take a liberty here and also add non ".exe" versions in # case we are running on linux. add_to_cleanups_variable: - echo going to add to cleanup variable now. - $(eval CLEANUPS = $(CLEANUPS) $(ACTUAL_TARGETS) $(ACTUAL_TARGETS:%.exe=%) ) + echo "going to add to cleanup variable now with the actual targets as $(ACTUAL_TARGETS)" + $(eval CLEANUPS = $(ACTUAL_TARGETS) $(ACTUAL_TARGETS:%.exe=%) $(CLEANUPS) ) echo "new CLEANUPS variable: $(CLEANUPS)" # guard the main cleaning task with our variable diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def index a9d1f724..d5e3181d 100644 --- a/scripts/clam/variables.def +++ b/scripts/clam/variables.def @@ -5,7 +5,7 @@ # This file contains definitions and descriptions of the variables used # in the CLAM system (Coordinated Library Automagic Make). This defaults -# file should be included near the start of the user's makefile, and then the +# file should be included near the start of the user makefile, and then the # rules file should be included after the user has modified the appropriate # variables and added the appropriate rules and targets. @@ -46,8 +46,8 @@ ifeq "$(OP_SYSTEM)" "" ifneq "$(IS_DOS)" "" OP_SYSTEM := WIN32 else - # we don't have other comparisons yet, so we'll assume unix. fix this - # if it's not your default operating system. + # we do not have other comparisons yet, so we will assume unix. fix this + # if it is not your default operating system. OP_SYSTEM := UNIX endif endif @@ -112,7 +112,7 @@ export CURRENT_DIR := $(shell pwd) # "PROJECT" is the root name for the project being compiled. It is used # in generated directory names and for other purposes of uniquification. -# This is a variable that _must_ be supplied by the user's makefile. +# This is a variable that _must_ be supplied by the user makefile. # Examples: # PROJECT = basis # PROJECT = test_parser @@ -124,8 +124,8 @@ export PROJECT export TARGETS # "ACTUAL_TARGETS" is how the targets are expected to be passed to the rules -# file; this allows a plug-in module's rules to manipulate the TARGETS to make -# sure that important files don't get deleted by the automatic deletion done +# file; this allows rules from a plug-in module to manipulate the TARGETS to make +# sure that important files do not get deleted by the automatic deletion done # with "make clean." If the real module used does not create a variable called # ACTUAL_TARGETS from the TARGETS, then the default specified here is used. export ACTUAL_TARGETS = $(TARGETS) @@ -158,14 +158,14 @@ export RUN_ALL_TESTS # "MAKEFILE_NAME" works with BUILD_BEFORE and BUILD_AFTER. This allows # the name of the makefile in the subdirectory to be changed to something other -# than 'makefile'. +# than simply "makefile". export MAKEFILE_NAME = makefile ############################################################################ # "FIND" is a macro that points to the real find command, which is the unix # find command. on dosdows, the find command is utter garbage and we need -# to make sure we don't accidentally run that inferior one. +# to make sure we do not accidentally run that inferior one. export FIND = find # "PARAMETER_FILE" is the location of our version stamps (if defined) and @@ -201,7 +201,7 @@ ifeq "$(CLAM_TMP)" "" CLAM_TMP := $(GENERATED_DIR)/clam_tmp endif -#turned off for the moment, since this seems like a bad idea; we define clam tmp in terms of tmp sometimes, don't we??? +#turned off for the moment, since this seems like a bad idea; we define clam tmp in terms of tmp sometimes, do not we??? #ifeq "$(OP_SYSTEM)" "WIN32" # # set these so that compilers and such will use them. # export TMP := $(CLAM_TMP) -- 2.34.1