lots of mods getting windows to build under cygwin without visual studio.

[feisty_meow.git] / scripts / clam / variables.def

diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def
index 594b57f34c3212f2b55443264dcd9c064f60b672..1b60dc4d19db9eeb4ac84361ae7cc198301aa843 100644 (file)
--- a/scripts/clam/variables.def
+++ b/scripts/clam/variables.def
@@ -61,13 +61,13 @@ endif
 
 ###############################################################################
 
-# "FEISTY_MEOW_DIR" is the root of the "build" for our compilation oriented
+# "FEISTY_MEOW_APEX" is the root of the "build" for our compilation oriented
 # features.  All source code and build helper files are usually found there.
 # The build targets to be built are usually stored there also, although the
 # targets can be located elsewhere if desired.  see TARGETS_DIR below.
-export FEISTY_MEOW_DIR
-ifeq "$(FEISTY_MEOW_DIR)" ""
-#  FEISTY_MEOW_DIR = 
+export FEISTY_MEOW_APEX
+ifeq "$(FEISTY_MEOW_APEX)" ""
+#  FEISTY_MEOW_APEX = 
 #uhhh, use the current location?
 #currently we rely on this being set from shell bootstrapping.  is that bad?
 endif
@@ -76,14 +76,15 @@ endif
 # be able to find a few things there reliably.
 export FEISTY_MEOW_SCRIPTS
 ifeq "$(FEISTY_MEOW_SCRIPTS)" ""
-  export FEISTY_MEOW_SCRIPTS := $(FEISTY_MEOW_DIR)/scripts
+  export FEISTY_MEOW_SCRIPTS := $(FEISTY_MEOW_APEX)/scripts
 endif
 
-# "PRODUCTION_DIR" is where the built products will be stored, plus any
-# temporary files that are generated during the build.
+# "PRODUCTION_DIR" is where components required for building the code or
+# installers can be found.
+#hmmm: is this redundant?
 export PRODUCTION_DIR
 ifeq "$(PRODUCTION_DIR)" ""
-  PRODUCTION_DIR=$(FEISTY_MEOW_DIR)/production
+  PRODUCTION_DIR=$(FEISTY_MEOW_APEX)/production
 endif
 
 # "CLAM_DIR" points at where the CLAM source files are located.  this is needed
@@ -101,12 +102,9 @@ export TARGETS_DIR
 ifeq "$(TARGETS_DIR)" ""
   # the default is to generate files into subdirectories that are at the
   # top-level of the repository.
-  TARGETS_DIR = $(FEISTY_MEOW_DIR)
+  TARGETS_DIR = $(FEISTY_MEOW_APEX)
 endif
 
-# "CLAM_BIN" points at the location for helper binaries and shell scripts.
-export CLAM_BIN = $(PRODUCTION_DIR)/clam_bin
-
 # "CURRENT_DIR" is the directory where this make was started.
 export CURRENT_DIR := $(shell pwd)
 
@@ -155,6 +153,8 @@ ACTUAL_LAST_TARGETS = $(LAST_TARGETS)
 
 # "RUN_TARGETS" is a list of programs that should be executed as part of a make.
 export RUN_TARGETS
+# "RUN_ALL_TESTS" turns on execution of the RUN_TARGETS.
+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
@@ -199,14 +199,15 @@ export CLEAN
 # sets the temporary directory.
 export CLAM_TMP
 ifeq "$(CLAM_TMP)" ""
-  CLAM_TMP := $(WASTE_DIR)
+  CLAM_TMP := $(GENERATED_DIR)/clam_tmp
 endif
 
-ifeq "$(OP_SYSTEM)" "WIN32"
-  # set these so that compilers and such will use them.
-  export TMP := $(CLAM_TMP)
-  export TEMP := $(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???
+#ifeq "$(OP_SYSTEM)" "WIN32"
+#  # set these so that compilers and such will use them.
+#  export TMP := $(CLAM_TMP)
+#  export TEMP := $(CLAM_TMP)
+#endif
 
 # "FAILURE_FILE" is a file that is used as a flag to track failures.  if the
 # file exists, then it is assumed that a failure happened during the current