Blob Blame History Raw
--- SConstruct.orig	2011-09-05 17:11:21.000000000 -0600
+++ SConstruct	2011-09-07 14:27:58.450940097 -0600
@@ -711,12 +711,12 @@
     for file in glob(CuddPath(fname)):
         cudd_resources.remove(file)
 
-cudd_shared = shared_object(cudd_resources)
+#cudd_shared = shared_object(cudd_resources)
 
-libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
-DefaultBuild(libCudd)
+#libCudd = env.StaticLibrary(CuddPath(cudd_name), cudd_resources)
+#DefaultBuild(libCudd)
 
-shared_resources += cudd_shared
+#shared_resources += cudd_shared
 
 def SymlinkReadableLibname(files):
     """ Generate symbolik link with more readable library name."""
@@ -750,7 +750,7 @@
 slib = env.SharedLibrary
 if env['SHLIBVERSIONING']:
     slib = VersionatedSharedLibrary
-libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
+#libCuddShared = slib(CuddPath(cudd_name), list(shared_resources))
 
 
 ######################################################################
@@ -819,17 +819,17 @@
 
 for t in tests_pb:
     env.Program(TestsPath(t), 
-        [TestsPath('src', t + ".cc"),  libpb] + libCudd, 
+        [TestsPath('src', t + ".cc"),  libpb], #+ libCudd, 
         CPPPATH=CPPPATH, LIBS = env['LIBS'] + pyconf.libs)
 
 for t in tests_gb:
     env.Program(TestsPath(t), 
-                [TestsPath('src', t + ".cc"), libpb, gb]+ libCudd,
+                [TestsPath('src', t + ".cc"), libpb, gb], #+ libCudd,
                 LIBS = env['LIBS'] + GD_LIBS,
                 CPPPATH=CPPPATH)
 for t in ['booleenv_test']:
     env.Program(TestsPath(t), 
-                [TestsPath('src', t + ".cc"), TestsPath('src', t + "_static.cc"), libpb]+ libCudd, 
+                [TestsPath('src', t + ".cc"), TestsPath('src', t + "_static.cc"), libpb], #+ libCudd, 
                 CPPPATH=CPPPATH)
 
 testclasses = Split("""BooleEnv BooleSet BooleConstant BoolePolyRing
@@ -839,7 +839,7 @@
 
 
 env.Program(TestsPath("unittests"),
-            testfiles + [libpb, gb] + libCudd, 
+            testfiles + [libpb, gb], #+ libCudd, 
             CPPPATH=CPPPATH, LIBS = env['LIBS'] + ["boost_unit_test_framework"],
             CPPDEFINES = env['CPPDEFINES'] +
             ["BOOST_TEST_DYN_LINK"] )
@@ -850,7 +850,7 @@
              testclassesorderings] + [TestsPath('src', "unittests_orderings.cc")]
 
 env.Program(TestsPath("unittests_orderings"),
-            testfilesorderings + [libpb, gb] + libCudd, 
+            testfilesorderings + [libpb, gb], #+ libCudd, 
             CPPPATH=CPPPATH, LIBS = env['LIBS'] + ["boost_unit_test_framework"],
             CPPDEFINES = env['CPPDEFINES'] +
             ["BOOST_TEST_DYN_LINK"] )
@@ -932,7 +932,7 @@
         DefaultBuild(env.Install(polybori_modules, f))
 
     
-    to_append_for_profile = [libpb, gb] + libCudd
+    to_append_for_profile = [libpb, gb] #+ libCudd
     #to_append_for_profile=File('/lib/libutil.a')
     env.Program(PyPBPath('profiled'), wrapper_files+to_append_for_profile,
             LDMODULESUFFIX=".so",SHLIBPREFIX="", 
@@ -1093,7 +1093,7 @@
 
 dylibs += libpbShared + libgbShared
 
-devellibs = [libpb,gb] + libCudd + libpbShared + libgbShared + libCuddShared
+devellibs = [libpb,gb] + libpbShared + libgbShared
 stlibs += [libpb, gb]
 
 readabledevellibs = pb_symlinks + gb_symlinks + SymlinkReadableLibname([libpb,
@@ -1116,7 +1116,7 @@
     env.Install(DevelInstPath('include/polybori/groebner'),
                 glob(GBPath('src/*.h')))
     # Install our own copy the cudd header to ensure correct (patched) version 
-    env.Install(DevelInstInclPath('cudd'), cudd_headers)
+    # env.Install(DevelInstInclPath('cudd'), cudd_headers)
     if not(external_m4ri):
         env.Install(DevelInstInclPath('m4ri'), glob('M4RI/m4ri/*.h'))