--- SConstruct.orig 2011-04-27 05:00:31.000000000 -0600 +++ SConstruct 2011-05-23 16:04:42.723216338 -0600 @@ -527,12 +527,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.""" @@ -569,7 +569,7 @@ # slib=env.LoadableModule -libCuddShared = slib(CuddPath(cudd_name), list(shared_resources)) +#libCuddShared = slib(CuddPath(cudd_name), list(shared_resources)) ###################################################################### @@ -633,17 +633,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, 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 @@ -652,7 +652,7 @@ testclasses] + [TestsPath('src', "unittests.cc")] 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"] ) @@ -663,7 +663,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"] ) @@ -731,7 +731,7 @@ - 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="", @@ -890,7 +890,7 @@ env.AlwaysBuild(srcdistri) env.Alias('distribute', srcdistri) -devellibs = [libpb,gb] + libCudd + libpbShared + libgbShared + libCuddShared +devellibs = [libpb,gb] + libpbShared + libgbShared readabledevellibs = SymlinkReadableLibname(devellibs) # Installation for development purposes @@ -902,7 +902,7 @@ env.Install(DevelInstPath('include/polybori'), glob(PBPath('include/*.h'))) env.Install(DevelInstPath('include/polybori/groebner'), glob(GBPath('src/*.h'))) - env.Install(DevelInstPath('include/cudd'), cudd_headers) + #env.Install(DevelInstPath('include/cudd'), cudd_headers) if not(external_m4ri): env.Install(DevelInstPath('include/m4ri'), glob('M4RI/*.h'))