Merge branch 'release-2.140.136'

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

diff --git a/scripts/clam/variables.def b/scripts/clam/variables.def
index 809f79e592ff001b606acf47d5edd875fe88b481..0ef7ffc4456d9c017ab0d09c3c21c280ea35f368 100644 (file)
--- a/scripts/clam/variables.def
+++ b/scripts/clam/variables.def
@@ -11,53 +11,53 @@
 
 ###############################################################################
 
-# OP_SYSTEM is a flag that specifies the operating system under which
-# the makefile system is executing.
-export OP_SYSTEM
-#OP_SYSTEM := UNIX = unix | OS2 = ibm os/2 | SYSV = v unix | DOS = pc dos
-#    | WIN32 = ms-win32 / NT.
-
-# OS_SUBCLASS is a finer differentiation of the OP_SYSTEM.  currently only
-# the darwin subclass for unix is considered.
-export OS_SUBCLASS
-#OS_SUBCLASS := darwin | 
-
-# set the default operating system when none is specified.
-ifeq "$(OP_SYSTEM)" ""
-#is there a nice way to join the greps?
-  IS_UNIX := $(shell uname | grep -i linux)
-  ifeq "$(IS_UNIX)" ""
-    IS_UNIX := $(shell uname | grep -i unix)
-    ifeq "$(IS_UNIX)" "" 
-      IS_UNIX := $(shell uname | grep -i darwin)
-      ifneq "$(IS_UNIX)" ""
-        # pick the subclass now that we know this is darwin.
-        OS_SUBCLASS := darwin
-      endif
-    endif
-  endif
-  IS_DOS := $(shell uname | grep -i cygwin)
-  ifeq "$(IS_DOS)" ""
-    IS_DOS := $(shell uname | grep -i ming)
-  endif
-  ifneq "$(IS_UNIX)" ""
-    OP_SYSTEM := UNIX
-  else
-    ifneq "$(IS_DOS)" ""
-      OP_SYSTEM := WIN32
-    else
-      # 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
-endif
-
-# now set a special ending for EXE files, which differs between the OSes.
-export EXE_END
-ifeq "$(OP_SYSTEM)" "WIN32"
-  EXE_END := .exe
-endif
+## # OPERATING_SYSTEM is a flag that specifies the operating system under which
+## # the makefile system is executing.
+## export OPERATING_SYSTEM
+## #OPERATING_SYSTEM := UNIX = unix | OS2 = ibm os/2 | SYSV = v unix | DOS = pc dos
+## #    | WIN32 = ms-win32 / NT.
+
+## # CLAM_OS_SUBCLASS is a finer differentiation of the OPERATING_SYSTEM.  currently only
+## # the darwin subclass for unix is considered.
+## export CLAM_OS_SUBCLASS
+## #CLAM_OS_SUBCLASS := darwin | 
+
+## # set the default operating system when none is specified.
+## ifeq "$(OPERATING_SYSTEM)" ""
+## #is there a nice way to join the greps?
+##  CLAM_ON_UNIX := $(shell uname | grep -i linux)
+##  ifeq "$(CLAM_ON_UNIX)" ""
+##    CLAM_ON_UNIX := $(shell uname | grep -i unix)
+##    ifeq "$(CLAM_ON_UNIX)" "" 
+##      CLAM_ON_UNIX := $(shell uname | grep -i darwin)
+##      ifneq "$(CLAM_ON_UNIX)" ""
+##        # pick the subclass now that we know this is darwin.
+##        CLAM_OS_SUBCLASS := darwin
+##      endif
+##    endif
+##  endif
+##  CLAM_ON_DOS := $(shell uname | grep -i cygwin)
+##  ifeq "$(CLAM_ON_DOS)" ""
+##    CLAM_ON_DOS := $(shell uname | grep -i ming)
+##  endif
+##  ifneq "$(CLAM_ON_UNIX)" ""
+##    OPERATING_SYSTEM := UNIX
+##  else
+##    ifneq "$(CLAM_ON_DOS)" ""
+##      OPERATING_SYSTEM := WIN32
+##    else
+##      # we do not have other comparisons yet, so we will assume unix.  fix this
+##      # if it is not your default operating system.
+##      OPERATING_SYSTEM := UNIX
+##    endif
+##  endif
+##endif
+
+## # now set a special ending for EXE files, which differs between the OSes.
+## export EXE_ENDING
+## ifeq "$(OPERATING_SYSTEM)" "WIN32"
+##   EXE_ENDING := .exe
+## endif
 
 ###############################################################################
 
@@ -124,10 +124,11 @@ export PROJECT
 export TARGETS
 
 # "ACTUAL_TARGETS" is how the targets are expected to be passed to the rules
-# 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.
+# 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)
 
 # "FIRST_TARGETS" and "LAST_TARGETS" are targets that need to be processed
@@ -201,13 +202,6 @@ ifeq "$(CLAM_TMP)" ""
   CLAM_TMP := $(FEISTY_MEOW_GENERATED_STORE)/clam_tmp
 endif
 
-#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)
-#  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
 # make.