Changes in trunk/src/SConscript [1941:1819]

File:

• trunk/src/SConscript (modified) (2 diffs, 1 prop)

trunk/src/SConscript

@@ -8 +8 @@
 cpps = env.SGlob("*.cpp")
 pycpps = env.SGlob("python_*.cpp")
-for pf in pycpps:
-    cpps.remove(pf)
+for pf in pycpps: cpps.remove(pf)
 
 # location of libcasav.a
@@ -19 +18 @@
 myenv.Prepend( LIBS =  ['asap'] )
 
-shenv = myenv.Clone()
-pyrapdir = shenv.get("pyrapint", None)
-if pyrapdir:
-    shenv.PrependUnique(CPPPATH=pyrapdir)    
-    pycpps += shenv.Glob('%s/pyrap/*/*.cc' % pyrapdir)
 # Finally create the library for the module
-if not hasattr(shenv, "LoadableModule"):
-    shenv.LoadableModule = shenv.SharedLibrary
-so = shenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
-#test = shenv.Program("test", cpps)
+if not hasattr(myenv, "LoadableModule"):
+    myenv.LoadableModule = myenv.SharedLibrary
+so = myenv.LoadableModule( target = "_asap.so", source = pycpps, SHLIBSUFFIX="" )
+#test = myenv.Program("test", cpps)
 Return("so")