1 files changed, 0 insertions, 59 deletions
diff --git a/src/engine/SCons/Environment.py b/src/engine/SCons/Environment.py
index f85f723..b93a3dd 100644
--- a/src/engine/SCons/Environment.py
+++ b/src/engine/SCons/Environment.py
@@ -73,21 +73,6 @@ class Environment:
     Environment.
     """
 
-    # See the documentation for the __autogenerate() method
-    # for an explanation of this variable...
-    AUTO_GEN_VARS = ( ( '_LIBFLAGS',
-                        'LIBS',
-                        'LIBLINKPREFIX',
-                        'LIBLINKSUFFIX' ),
-                      ( '_LIBDIRFLAGS',
-                        'LIBPATH',
-                        'LIBDIRPREFIX',
-                        'LIBDIRSUFFIX' ),
-                      ( '_INCFLAGS',
-                        'CPPPATH',
-                        'INCPREFIX',
-                        'INCSUFFIX' ) )
-
     def __init__(self, **kw):
 	import SCons.Defaults
 	self._dict = copy.deepcopy(SCons.Defaults.ConstructionEnvironment)
@@ -96,7 +81,6 @@ class Environment:
         if kw.has_key('SCANNERS') and type(kw['SCANNERS']) != type([]):
                 kw['SCANNERS'] = [kw['SCANNERS']]
 	self._dict.update(copy.deepcopy(kw))
-        self.__autogenerate()
 
 	class BuilderWrapper:
 	    """Wrapper class that allows an environment to
@@ -126,48 +110,6 @@ class Environment:
         for s in self._dict['SCANNERS']:
             setattr(self, s.name, s)
 
-    def __autogenerate(self):
-        """Autogenerate the "interpolated" environment variables.
-        We read a static structure that tells us how.  AUTO_GEN_VARS
-        is a tuple of tuples.  Each inner tuple has four elements,
-        each strings referring to an environment variable, and describing
-        how to autogenerate a particular variable.  The elements are:
-
-        0 - The variable to generate
-        1 - The "source" variable, usually a list
-        2 - The "prefix" variable
-        3 - The "suffix" variable
-
-        The autogenerated variable is a list, consisting of every
-        element of the source list, or a single element if the source
-        is a string, with the prefix and suffix
-        concatenated."""
-
-        for strVarAuto, strSrc, strPref, strSuff, in self.AUTO_GEN_VARS:
-            if self._dict.has_key(strSrc):
-                src_var = self._dict[strSrc]
-                if type(src_var) is types.ListType or \
-                   isinstance(src_var, UserList):
-                    src_var = map(str, src_var)
-                else:
-                    src_var = [ str(src_var), ]
-            else:
-                src_var = []
-
-            try:
-                prefix = str(self._dict[strPref])
-            except KeyError:
-                prefix=''
-
-            try:
-                suffix = str(self._dict[strSuff])
-            except KeyError:
-                suffix =''
-
-            self._dict[strVarAuto] = map(lambda x, suff=suffix, pref=prefix: \
-                                         pref + os.path.normpath(str(x)) + suff,
-                                         src_var)
-
     def __cmp__(self, other):
 	return cmp(self._dict, other._dict)
 
@@ -194,7 +136,6 @@ class Environment:
 	construction variables and/or values.
 	"""
 	self._dict.update(copy.deepcopy(kw))
-        self.__autogenerate()
 
     def	Depends(self, target, dependency):
 	"""Explicity specify that 'target's depend on 'dependency'."""