diff --git a/SConscript b/SConscript
index d2597775a5a2a610830d36aff185afd46c840f72..79a031c1e17ef4e4a439d761612551400a675ce3 100644
--- a/SConscript
+++ b/SConscript
@@ -55,8 +55,12 @@ else:
os.path.join(os.environ['SECURITY_TRANSFORMS_HOME'],"include","targ-config.h"))
+
+env['BASE_IRDB_LIBS']="IRDB-core", "pqxx", "pq", "beaEngine_s_d", "EXEIO", "pebliss", "iconv"
+Export('env')
#print 'env='
#print env.Dump()
+libPEBLISS=SConscript("pebliss/trunk/pe_lib/SConscript", variant_dir='scons_build/libPEBLISS')
libEXEIO=SConscript("libEXEIO/SConscript", variant_dir='scons_build/libEXEIO')
libbea=SConscript("beaengine/SConscript", variant_dir='scons_build/beaengine')
libMEDSannotation=SConscript("libMEDSannotation/SConscript", variant_dir='scons_build/libMEDSannotation')
diff --git a/libIRDB/test/SConscript b/libIRDB/test/SConscript
index dd0a1ab015bd72c1c5ff997cb7ceabd4da224f8d..efd2d94474bf020c68310fbd79fb5b9dbfbfa382 100644
--- a/libIRDB/test/SConscript
+++ b/libIRDB/test/SConscript
@@ -13,7 +13,7 @@ cpppath='''
'''
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d pq EXEIO")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program("fill_in_indtargs.exe", Split("read_ehframe.cpp fill_in_indtargs.cpp check_thunks.cpp"), LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/pebliss/trunk/pe_lib/SConscript b/pebliss/trunk/pe_lib/SConscript
index 3a50ddb0e18b5bef21bb2b77cd72aee43c5c8f63..32f9fa6f738008e8e3d0b95ebebda03f686f1903 100644
--- a/pebliss/trunk/pe_lib/SConscript
+++ b/pebliss/trunk/pe_lib/SConscript
@@ -45,15 +45,16 @@ files= '''
version_info_editor.cpp
version_info_viewer.cpp
'''
+
cpppath='''
.
'''
-myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
+#myenv.Append(CCFLAGS=" -Wall -W -Wextra -Wconversion ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
lib=myenv.Library(libname, Split(files))
-#install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
-#Default(install)
+install=myenv.Install("$SECURITY_TRANSFORMS_HOME/lib/", lib)
+Default(install)
diff --git a/pebliss/trunk/samples/sample.mak b/pebliss/trunk/samples/sample.mak
index 19c822874267979c88302eee35b908dba7be3ee1..688875a862800bc431e876301dc3d4461c40ffb9 100644
--- a/pebliss/trunk/samples/sample.mak
+++ b/pebliss/trunk/samples/sample.mak
@@ -2,7 +2,7 @@ PWD=$(shell pwd)
OUTDIR = ../out/
LIBPATH = ../../lib/libpebliss.a
NAME=$(shell basename $(PWD))
-CXXFLAGS = -O2 -Wall -I../../pe_lib
+CXXFLAGS = -Wall -I../../pe_lib
ifdef PE_DEBUG
CXXFLAGS += -g -O0
@@ -15,7 +15,7 @@ clean:
rm -f $(OUTDIR)$(NAME)
$(NAME): main.o
- $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME)
+ $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME) -liconv
main.o: $(LIBPATH)
diff --git a/pebliss/trunk/tests/tests.mak b/pebliss/trunk/tests/tests.mak
index dee47fea4b6c97098549949b068feef3522adf7b..430bcdcc1db27a9a81c90f1e425807ccd8591f19 100644
--- a/pebliss/trunk/tests/tests.mak
+++ b/pebliss/trunk/tests/tests.mak
@@ -15,7 +15,7 @@ clean:
rm -f $(OUTDIR)$(NAME)
$(NAME): main.o
- $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME)
+ $(CXX) -Wall $^ -lpebliss -L../../lib -o $(NAME) -liconv
main.o: $(LIBPATH)
diff --git a/tools/c2e/SConscript b/tools/c2e/SConscript
index 3dac89082993346a0bf78e600192097cdaff0493..8dde6320e9af3cf91b442d65cfc28aaa3cf143dd 100644
--- a/tools/c2e/SConscript
+++ b/tools/c2e/SConscript
@@ -25,7 +25,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="c2e.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/tools/cgc_hlx/SConscript b/tools/cgc_hlx/SConscript
index 17e2a4e4bda9fea9209cdb097d9f83a42683261d..75abdbef68f5c717bc74ccee9113362696b2bc68 100644
--- a/tools/cgc_hlx/SConscript
+++ b/tools/cgc_hlx/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="cgc_hlx.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/cgc_rigrandom/SConscript b/tools/cgc_rigrandom/SConscript
index 97311ba07e6c83eabd3c308b4fd600a352608dab..e427c73de2c6fbaaf48182db78fe592c9f72fc1f 100644
--- a/tools/cgc_rigrandom/SConscript
+++ b/tools/cgc_rigrandom/SConscript
@@ -23,7 +23,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="rigrandom.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/tools/cgclibc/SConscript b/tools/cgclibc/SConscript
index f5d0b8a91dce52583c67bc9cd0902b5d7c7b8d05..971310ea63d73aaeed4b88c6f7ca846797a9eb44 100644
--- a/tools/cgclibc/SConscript
+++ b/tools/cgclibc/SConscript
@@ -26,7 +26,7 @@ files3=Split("infer_syscall_wrappers.cpp")+cgclibc
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-syscall IRDB-util pqxx BeaEngine_s_d rewrite pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-syscall IRDB-util rewrite ")
pgm=myenv.Program("cgclibc.exe", files1, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/cinderella/SConscript b/tools/cinderella/SConscript
index 733c95a06ce68fa4383597af6d9ef22a8473de02..ab0c364a8dd619169992b715c34d5ac880be51e4 100644
--- a/tools/cinderella/SConscript
+++ b/tools/cinderella/SConscript
@@ -22,7 +22,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="cinderella_prep.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/cover/SConscript b/tools/cover/SConscript
index ca9993e8490f90cb253abff3244fc90fefff2328..42727d83ebb2b19ecb2137dfca5ecf321cc9ed35 100644
--- a/tools/cover/SConscript
+++ b/tools/cover/SConscript
@@ -19,7 +19,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="cover"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite pq")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
diff --git a/tools/fix_rets/SConscript b/tools/fix_rets/SConscript
index 16133c7f59d1735a8e4de8faaa3fdbba2d1f5d91..b191a04eac27f0cb6c130b97e7e55cbcb8c118ee 100644
--- a/tools/fix_rets/SConscript
+++ b/tools/fix_rets/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="fix_rets.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/fptr_shadow/SConscript b/tools/fptr_shadow/SConscript
index 2a675c9937c2c8e30ef19140a63b08d03f287a63..65ce37772d9c25cc2b7d79d9a1bb2e4b4eb5dd97 100644
--- a/tools/fptr_shadow/SConscript
+++ b/tools/fptr_shadow/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="fptr_shadow64.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/inferfn/SConscript b/tools/inferfn/SConscript
index 15c90309d573577f420950a6766d2b06da432b41..198aee0e50ac770efbcee89e3079511529fb52dc 100644
--- a/tools/inferfn/SConscript
+++ b/tools/inferfn/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="inferfn.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/meds2pdb/SConscript b/tools/meds2pdb/SConscript
index db59e178de944d040a819328a1ef8348a7298314..43c82a3e03dd605c8291243d8abfeb538b6ffd16 100644
--- a/tools/meds2pdb/SConscript
+++ b/tools/meds2pdb/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="meds2pdb"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx xform BeaEngine_s_d rewrite MEDSannotation pq pq ")
+LIBS=Split(" IRDB-cfg IRDB-util xform rewrite MEDSannotation $BASE_IRDB_LIBS ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
Default(myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm))
diff --git a/tools/memcover/SConscript b/tools/memcover/SConscript
index 5a84df9e956ae68a7cccfe3ee3119fef194f176c..c4e66ab6ce8be8d678c48736c6792b7b8e157ca0 100644
--- a/tools/memcover/SConscript
+++ b/tools/memcover/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="memcover.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/prince/SConscript b/tools/prince/SConscript
index 6b06dec1c3b28710415db59448f454f3965f8ec3..296ed27f2250c7b16dd2c188028b640375232b38 100644
--- a/tools/prince/SConscript
+++ b/tools/prince/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="prince_driver.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/ret_shadow_stack/SConscript b/tools/ret_shadow_stack/SConscript
index 787236adb2e531aec79a7fcfa2d4ecfee22a8c9b..d14492eed464e3344ceaa871eb8a5ccf3b9ee94b 100644
--- a/tools/ret_shadow_stack/SConscript
+++ b/tools/ret_shadow_stack/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="ret_shadow_stack.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/safefr/SConscript b/tools/safefr/SConscript
index 84ced8fc5613444a08dde59ebe11285c9db0e984..4fd635798cd50c7dc29bb95861cdbcbca10e4b78 100644
--- a/tools/safefr/SConscript
+++ b/tools/safefr/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="fill_in_safefr.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/selective_cfi/SConscript b/tools/selective_cfi/SConscript
index e117ea4034ac8828086fe4d5223daf3d4d6cc177..b4572bf841f9ac13b10c6d3d230cdc8dae6a6918 100644
--- a/tools/selective_cfi/SConscript
+++ b/tools/selective_cfi/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="selective_cfi.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/simple_cdi/SConscript b/tools/simple_cdi/SConscript
index 930e5684718c4023ea1e1624aa0e92e79c8507f0..ca7abb6253efb6aea7c88968889b6da30f0f4c38 100644
--- a/tools/simple_cdi/SConscript
+++ b/tools/simple_cdi/SConscript
@@ -20,7 +20,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="simple_cdi.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/spasm/SConscript b/tools/spasm/SConscript
index c6075c8091aa277e4cd985b3274d0319f1216599..e82a61623f6964abcdd8e90578907316b77fc46e 100644
--- a/tools/spasm/SConscript
+++ b/tools/spasm/SConscript
@@ -21,7 +21,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="spasm"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)
diff --git a/tools/transforms/SConscript b/tools/transforms/SConscript
index 5b9a533a29f8c4b16013456c46ef9060868f5d7c..f418517fa121628038c58c811407e8d201338beb 100644
--- a/tools/transforms/SConscript
+++ b/tools/transforms/SConscript
@@ -19,7 +19,7 @@ cpppath='''
$SECURITY_TRANSFORMS_HOME/beaengine/beaengineSources/Includes/
'''
-LIBS="xform IRDB-core IRDB-cfg BeaEngine_s_d pqxx MEDSannotation transform pq EXEIO pq "
+LIBS="$BASE_IRDB_LIBS xform IRDB-cfg MEDSannotation transform "
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
integer_files="transformutils.cpp integertransformdriver.cpp"
diff --git a/tools/watch_syscall/SConscript b/tools/watch_syscall/SConscript
index 28f5fafda438824c2ca2ba3a79a629ead85c3e2d..abc71d99a5071b49e88e0fab3af4195f81934f17 100644
--- a/tools/watch_syscall/SConscript
+++ b/tools/watch_syscall/SConscript
@@ -22,7 +22,7 @@ files=Glob( Dir('.').srcnode().abspath+"/*.cpp")
pgm="watch_syscall.exe"
LIBPATH="$SECURITY_TRANSFORMS_HOME/lib"
-LIBS=Split("IRDB-core IRDB-cfg IRDB-syscall IRDB-util pqxx BeaEngine_s_d transform rewrite MEDSannotation pq ")
+LIBS=Split("$BASE_IRDB_LIBS IRDB-cfg IRDB-syscall IRDB-util transform rewrite MEDSannotation ")
myenv=myenv.Clone(CPPPATH=Split(cpppath))
pgm=myenv.Program(pgm, files, LIBPATH=LIBPATH, LIBS=LIBS)
install=myenv.Install("$SECURITY_TRANSFORMS_HOME/bin/", pgm)