From fce2bcfe335fe56d5f415f0da8509ffa17e60a64 Mon Sep 17 00:00:00 2001
From: jdh8d <jdh8d@git.zephyr-software.com>
Date: Thu, 25 Aug 2011 18:52:55 +0000
Subject: [PATCH] Reorganized current libIRDB into a library for the CORE
functionality. Hope is to add a second library for CFG building.
---
.gitattributes | 47 +++++++++++-----------
libIRDB/include/{ => core}/address.hpp | 0
libIRDB/include/{ => core}/baseobj.hpp | 0
libIRDB/include/{ => core}/basetypes.hpp | 0
libIRDB/include/{ => core}/dbinterface.hpp | 0
libIRDB/include/{ => core}/doip.hpp | 0
libIRDB/include/{ => core}/file.hpp | 0
libIRDB/include/{ => core}/function.hpp | 0
libIRDB/include/{ => core}/instruction.hpp | 0
libIRDB/include/{ => core}/pqxxdb.hpp | 0
libIRDB/include/{ => core}/variantid.hpp | 0
libIRDB/include/{ => core}/variantir.hpp | 0
libIRDB/include/libIRDB-core.hpp | 31 ++++++++++++++
libIRDB/include/libIRDB.hpp | 28 -------------
libIRDB/src/Makefile | 16 ++------
libIRDB/src/all.hpp | 2 -
libIRDB/src/core/Makefile | 16 ++++++++
libIRDB/src/{ => core}/address.cpp | 2 +-
libIRDB/src/core/all.hpp | 2 +
libIRDB/src/{ => core}/baseobj.cpp | 3 +-
libIRDB/src/{ => core}/dbinterface.cpp | 2 +-
libIRDB/src/{ => core}/file.cpp | 2 +-
libIRDB/src/{ => core}/function.cpp | 2 +-
libIRDB/src/{ => core}/generate_spri.cpp | 2 +-
libIRDB/src/{ => core}/instruction.cpp | 3 +-
libIRDB/src/{ => core}/pqxxdb.cpp | 2 +-
libIRDB/src/{ => core}/variantid.cpp | 3 +-
libIRDB/src/{ => core}/variantir.cpp | 2 +-
libIRDB/test/Makefile | 6 +--
libIRDB/test/clone.cpp | 2 +-
libIRDB/test/create_variant.cpp | 2 +-
libIRDB/test/create_variantir.cpp | 2 +-
libIRDB/test/drop_variant.cpp | 2 +-
libIRDB/test/fill_in_cfg.cpp | 2 +-
libIRDB/test/fill_in_indtargs.cpp | 2 +-
libIRDB/test/fix_calls.cpp | 2 +-
libIRDB/test/generate_spri.cpp | 2 +-
libIRDB/test/ilr.cpp | 2 +-
libIRDB/test/list_programs.cpp | 2 +-
libIRDB/test/print_variant.cpp | 2 +-
libIRDB/test/read_variantir.cpp | 2 +-
tools/transforms/Makefile | 2 +-
tools/transforms/integerbugtransform.cpp | 2 +-
tools/transforms/p1transform.h | 2 +-
44 files changed, 105 insertions(+), 96 deletions(-)
rename libIRDB/include/{ => core}/address.hpp (100%)
rename libIRDB/include/{ => core}/baseobj.hpp (100%)
rename libIRDB/include/{ => core}/basetypes.hpp (100%)
rename libIRDB/include/{ => core}/dbinterface.hpp (100%)
rename libIRDB/include/{ => core}/doip.hpp (100%)
rename libIRDB/include/{ => core}/file.hpp (100%)
rename libIRDB/include/{ => core}/function.hpp (100%)
rename libIRDB/include/{ => core}/instruction.hpp (100%)
rename libIRDB/include/{ => core}/pqxxdb.hpp (100%)
rename libIRDB/include/{ => core}/variantid.hpp (100%)
rename libIRDB/include/{ => core}/variantir.hpp (100%)
create mode 100644 libIRDB/include/libIRDB-core.hpp
delete mode 100644 libIRDB/include/libIRDB.hpp
delete mode 100644 libIRDB/src/all.hpp
create mode 100644 libIRDB/src/core/Makefile
rename libIRDB/src/{ => core}/address.cpp (96%)
create mode 100644 libIRDB/src/core/all.hpp
rename libIRDB/src/{ => core}/baseobj.cpp (89%)
rename libIRDB/src/{ => core}/dbinterface.cpp (95%)
rename libIRDB/src/{ => core}/file.cpp (92%)
rename libIRDB/src/{ => core}/function.cpp (98%)
rename libIRDB/src/{ => core}/generate_spri.cpp (99%)
rename libIRDB/src/{ => core}/instruction.cpp (99%)
rename libIRDB/src/{ => core}/pqxxdb.cpp (96%)
rename libIRDB/src/{ => core}/variantid.cpp (99%)
rename libIRDB/src/{ => core}/variantir.cpp (99%)
diff --git a/.gitattributes b/.gitattributes
index 8155c9142..5ab01e4da 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -147,31 +147,32 @@ examples/dumbledore_cmd.c -text
examples/overflow1.c -text
examples/test1.c -text
libIRDB/Makefile -text
-libIRDB/include/address.hpp -text
-libIRDB/include/baseobj.hpp -text
-libIRDB/include/basetypes.hpp -text
-libIRDB/include/dbinterface.hpp -text
-libIRDB/include/doip.hpp -text
-libIRDB/include/file.hpp -text
-libIRDB/include/function.hpp -text
-libIRDB/include/instruction.hpp -text
-libIRDB/include/libIRDB.hpp -text
-libIRDB/include/pqxxdb.hpp -text
+libIRDB/include/core/address.hpp -text
+libIRDB/include/core/baseobj.hpp -text
+libIRDB/include/core/basetypes.hpp -text
+libIRDB/include/core/dbinterface.hpp -text
+libIRDB/include/core/doip.hpp -text
+libIRDB/include/core/file.hpp -text
+libIRDB/include/core/function.hpp -text
+libIRDB/include/core/instruction.hpp -text
+libIRDB/include/core/pqxxdb.hpp -text
+libIRDB/include/core/variantid.hpp -text
+libIRDB/include/core/variantir.hpp -text
+libIRDB/include/libIRDB-core.hpp -text
libIRDB/include/utils.hpp -text
-libIRDB/include/variantid.hpp -text
-libIRDB/include/variantir.hpp -text
libIRDB/src/Makefile -text
-libIRDB/src/address.cpp -text
-libIRDB/src/all.hpp -text
-libIRDB/src/baseobj.cpp -text
-libIRDB/src/dbinterface.cpp -text
-libIRDB/src/file.cpp -text
-libIRDB/src/function.cpp -text
-libIRDB/src/generate_spri.cpp -text
-libIRDB/src/instruction.cpp -text
-libIRDB/src/pqxxdb.cpp -text
-libIRDB/src/variantid.cpp -text
-libIRDB/src/variantir.cpp -text
+libIRDB/src/core/Makefile -text
+libIRDB/src/core/address.cpp -text
+libIRDB/src/core/all.hpp -text
+libIRDB/src/core/baseobj.cpp -text
+libIRDB/src/core/dbinterface.cpp -text
+libIRDB/src/core/file.cpp -text
+libIRDB/src/core/function.cpp -text
+libIRDB/src/core/generate_spri.cpp -text
+libIRDB/src/core/instruction.cpp -text
+libIRDB/src/core/pqxxdb.cpp -text
+libIRDB/src/core/variantid.cpp -text
+libIRDB/src/core/variantir.cpp -text
libIRDB/test/Makefile -text
libIRDB/test/clone.cpp -text
libIRDB/test/create_variant.cpp -text
diff --git a/libIRDB/include/address.hpp b/libIRDB/include/core/address.hpp
similarity index 100%
rename from libIRDB/include/address.hpp
rename to libIRDB/include/core/address.hpp
diff --git a/libIRDB/include/baseobj.hpp b/libIRDB/include/core/baseobj.hpp
similarity index 100%
rename from libIRDB/include/baseobj.hpp
rename to libIRDB/include/core/baseobj.hpp
diff --git a/libIRDB/include/basetypes.hpp b/libIRDB/include/core/basetypes.hpp
similarity index 100%
rename from libIRDB/include/basetypes.hpp
rename to libIRDB/include/core/basetypes.hpp
diff --git a/libIRDB/include/dbinterface.hpp b/libIRDB/include/core/dbinterface.hpp
similarity index 100%
rename from libIRDB/include/dbinterface.hpp
rename to libIRDB/include/core/dbinterface.hpp
diff --git a/libIRDB/include/doip.hpp b/libIRDB/include/core/doip.hpp
similarity index 100%
rename from libIRDB/include/doip.hpp
rename to libIRDB/include/core/doip.hpp
diff --git a/libIRDB/include/file.hpp b/libIRDB/include/core/file.hpp
similarity index 100%
rename from libIRDB/include/file.hpp
rename to libIRDB/include/core/file.hpp
diff --git a/libIRDB/include/function.hpp b/libIRDB/include/core/function.hpp
similarity index 100%
rename from libIRDB/include/function.hpp
rename to libIRDB/include/core/function.hpp
diff --git a/libIRDB/include/instruction.hpp b/libIRDB/include/core/instruction.hpp
similarity index 100%
rename from libIRDB/include/instruction.hpp
rename to libIRDB/include/core/instruction.hpp
diff --git a/libIRDB/include/pqxxdb.hpp b/libIRDB/include/core/pqxxdb.hpp
similarity index 100%
rename from libIRDB/include/pqxxdb.hpp
rename to libIRDB/include/core/pqxxdb.hpp
diff --git a/libIRDB/include/variantid.hpp b/libIRDB/include/core/variantid.hpp
similarity index 100%
rename from libIRDB/include/variantid.hpp
rename to libIRDB/include/core/variantid.hpp
diff --git a/libIRDB/include/variantir.hpp b/libIRDB/include/core/variantir.hpp
similarity index 100%
rename from libIRDB/include/variantir.hpp
rename to libIRDB/include/core/variantir.hpp
diff --git a/libIRDB/include/libIRDB-core.hpp b/libIRDB/include/libIRDB-core.hpp
new file mode 100644
index 000000000..765d84fe3
--- /dev/null
+++ b/libIRDB/include/libIRDB-core.hpp
@@ -0,0 +1,31 @@
+#ifndef libIRDB_core
+#define libIRDB_core
+
+#include <string>
+#include <set>
+#include <assert.h>
+#include <string.h>
+#include <iostream>
+#include <pqxx/pqxx>
+#include <beaengine/BeaEngine.h>
+
+namespace libIRDB
+{
+
+class VariantID_t; // forward decl for many classes
+
+#include <core/basetypes.hpp>
+#include <core/dbinterface.hpp>
+#include <core/doip.hpp>
+#include <core/baseobj.hpp>
+#include <core/address.hpp>
+#include <core/instruction.hpp>
+#include <core/file.hpp>
+#include <core/function.hpp>
+#include <core/variantid.hpp>
+#include <core/variantir.hpp>
+#include <core/pqxxdb.hpp>
+
+};
+
+#endif
diff --git a/libIRDB/include/libIRDB.hpp b/libIRDB/include/libIRDB.hpp
deleted file mode 100644
index d85f0b60c..000000000
--- a/libIRDB/include/libIRDB.hpp
+++ /dev/null
@@ -1,28 +0,0 @@
-
-#include <string>
-#include <set>
-#include <assert.h>
-#include <string.h>
-#include <iostream>
-#include <pqxx/pqxx>
-#include "beaengine/BeaEngine.h"
-
-namespace libIRDB
-{
-
-class VariantID_t; // forward decl for many classes
-
-#include <basetypes.hpp>
-#include <dbinterface.hpp>
-#include <doip.hpp>
-#include <baseobj.hpp>
-#include <address.hpp>
-#include <instruction.hpp>
-#include <file.hpp>
-#include <function.hpp>
-#include <variantid.hpp>
-#include <variantir.hpp>
-#include <pqxxdb.hpp>
-
-};
-
diff --git a/libIRDB/src/Makefile b/libIRDB/src/Makefile
index bd6f0ee31..e330ffad2 100644
--- a/libIRDB/src/Makefile
+++ b/libIRDB/src/Makefile
@@ -1,16 +1,6 @@
-LIB=../lib/libIRDB.a
-
-
-OBJS=baseobj.o variantid.o pqxxdb.o dbinterface.o function.o variantir.o file.o instruction.o address.o generate_spri.o
-
-all: $(OBJS)
-
-$(OBJS): ../include/*.hpp *.hpp
+all:
+ cd core; make
clean:
- rm -f $(OBJS)
-
-.cpp.o:
- g++ -g -c -I../include -I../../beaengine/include $<
- ar rc $(LIB) $@
+ cd core; make clean
diff --git a/libIRDB/src/all.hpp b/libIRDB/src/all.hpp
deleted file mode 100644
index 75ed139b4..000000000
--- a/libIRDB/src/all.hpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <libIRDB.hpp>
-using namespace libIRDB;
diff --git a/libIRDB/src/core/Makefile b/libIRDB/src/core/Makefile
new file mode 100644
index 000000000..850e596b2
--- /dev/null
+++ b/libIRDB/src/core/Makefile
@@ -0,0 +1,16 @@
+
+LIB=../../lib/libIRDB-core.a
+
+
+OBJS=baseobj.o variantid.o pqxxdb.o dbinterface.o function.o variantir.o file.o instruction.o address.o generate_spri.o
+
+all: $(OBJS)
+
+$(OBJS): ../../include/core/*.hpp *.hpp ../../include/*.hpp
+
+clean:
+ rm -f $(OBJS)
+
+.cpp.o:
+ g++ -g -c -I. -I../../include -I../../../beaengine/include $<
+ ar rc $(LIB) $@
diff --git a/libIRDB/src/address.cpp b/libIRDB/src/core/address.cpp
similarity index 96%
rename from libIRDB/src/address.cpp
rename to libIRDB/src/core/address.cpp
index 18bb13eda..796b8194d 100644
--- a/libIRDB/src/address.cpp
+++ b/libIRDB/src/core/address.cpp
@@ -1,5 +1,5 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp>
#include <stdlib.h>
using namespace libIRDB;
diff --git a/libIRDB/src/core/all.hpp b/libIRDB/src/core/all.hpp
new file mode 100644
index 000000000..214b973a6
--- /dev/null
+++ b/libIRDB/src/core/all.hpp
@@ -0,0 +1,2 @@
+#include <libIRDB-core.hpp>
+using namespace libIRDB;
diff --git a/libIRDB/src/baseobj.cpp b/libIRDB/src/core/baseobj.cpp
similarity index 89%
rename from libIRDB/src/baseobj.cpp
rename to libIRDB/src/core/baseobj.cpp
index 2f81dcd0d..e39eb13af 100644
--- a/libIRDB/src/baseobj.cpp
+++ b/libIRDB/src/core/baseobj.cpp
@@ -1,6 +1,5 @@
-#include <libIRDB.hpp>
-using namespace libIRDB;
+#include <all.hpp>
/*
diff --git a/libIRDB/src/dbinterface.cpp b/libIRDB/src/core/dbinterface.cpp
similarity index 95%
rename from libIRDB/src/dbinterface.cpp
rename to libIRDB/src/core/dbinterface.cpp
index fdfce9ad8..3334d5e36 100644
--- a/libIRDB/src/dbinterface.cpp
+++ b/libIRDB/src/core/dbinterface.cpp
@@ -1,5 +1,5 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/src/file.cpp b/libIRDB/src/core/file.cpp
similarity index 92%
rename from libIRDB/src/file.cpp
rename to libIRDB/src/core/file.cpp
index 4b1da9d6b..f54e1f397 100644
--- a/libIRDB/src/file.cpp
+++ b/libIRDB/src/core/file.cpp
@@ -1,5 +1,5 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp>
#include <stdlib.h>
using namespace libIRDB;
diff --git a/libIRDB/src/function.cpp b/libIRDB/src/core/function.cpp
similarity index 98%
rename from libIRDB/src/function.cpp
rename to libIRDB/src/core/function.cpp
index bc27e40f0..828538f95 100644
--- a/libIRDB/src/function.cpp
+++ b/libIRDB/src/core/function.cpp
@@ -1,4 +1,4 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp>
#include <stdlib.h>
using namespace libIRDB;
diff --git a/libIRDB/src/generate_spri.cpp b/libIRDB/src/core/generate_spri.cpp
similarity index 99%
rename from libIRDB/src/generate_spri.cpp
rename to libIRDB/src/core/generate_spri.cpp
index db72834ef..a032066c9 100644
--- a/libIRDB/src/generate_spri.cpp
+++ b/libIRDB/src/core/generate_spri.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp> // to_string function from libIRDB
#include <iostream>
#include <fstream>
diff --git a/libIRDB/src/instruction.cpp b/libIRDB/src/core/instruction.cpp
similarity index 99%
rename from libIRDB/src/instruction.cpp
rename to libIRDB/src/core/instruction.cpp
index 2a94646cb..568d762df 100644
--- a/libIRDB/src/instruction.cpp
+++ b/libIRDB/src/core/instruction.cpp
@@ -1,8 +1,9 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp>
#include <stdlib.h>
#include <fstream>
+
using namespace libIRDB;
using namespace std;
diff --git a/libIRDB/src/pqxxdb.cpp b/libIRDB/src/core/pqxxdb.cpp
similarity index 96%
rename from libIRDB/src/pqxxdb.cpp
rename to libIRDB/src/core/pqxxdb.cpp
index 64ed9448e..54473a605 100644
--- a/libIRDB/src/pqxxdb.cpp
+++ b/libIRDB/src/core/pqxxdb.cpp
@@ -1,5 +1,5 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <pqxx/pqxx>
#include <string>
diff --git a/libIRDB/src/variantid.cpp b/libIRDB/src/core/variantid.cpp
similarity index 99%
rename from libIRDB/src/variantid.cpp
rename to libIRDB/src/core/variantid.cpp
index 6019ffa10..2016511e5 100644
--- a/libIRDB/src/variantid.cpp
+++ b/libIRDB/src/core/variantid.cpp
@@ -1,9 +1,8 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp>
#include <stdlib.h>
-using namespace libIRDB;
using namespace std;
diff --git a/libIRDB/src/variantir.cpp b/libIRDB/src/core/variantir.cpp
similarity index 99%
rename from libIRDB/src/variantir.cpp
rename to libIRDB/src/core/variantir.cpp
index 1eb8050cb..1ce0f0726 100644
--- a/libIRDB/src/variantir.cpp
+++ b/libIRDB/src/core/variantir.cpp
@@ -1,5 +1,5 @@
-#include <libIRDB.hpp>
+#include <all.hpp>
#include <utils.hpp>
#include <stdlib.h>
#include <map>
diff --git a/libIRDB/test/Makefile b/libIRDB/test/Makefile
index edee86312..d9d53a86e 100644
--- a/libIRDB/test/Makefile
+++ b/libIRDB/test/Makefile
@@ -5,10 +5,10 @@ PROGS=print_variant.exe list_programs.exe create_variant.exe create_variantir.ex
all: $(PROGS)
-$(PROGS): ../lib/libIRDB.a
+$(PROGS): ../lib/libIRDB-core.a
-.cpp.exe: $< ../lib/libIRDB.a
- g++ -g $< -I../include/ -I../../beaengine/include -L ../lib/ -lIRDB -lpqxx -L ../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -o $@
+.cpp.exe: $< ../lib/libIRDB-core.a
+ g++ -g $< -I../include/ -I../../beaengine/include -L ../lib/ -lIRDB-core -lpqxx -L ../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -o $@
clean:
rm -f $(PROGS)
diff --git a/libIRDB/test/clone.cpp b/libIRDB/test/clone.cpp
index 4bcc31b63..9cfafd0a7 100644
--- a/libIRDB/test/clone.cpp
+++ b/libIRDB/test/clone.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/create_variant.cpp b/libIRDB/test/create_variant.cpp
index addd0792a..155f3162d 100644
--- a/libIRDB/test/create_variant.cpp
+++ b/libIRDB/test/create_variant.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/create_variantir.cpp b/libIRDB/test/create_variantir.cpp
index 2d2a3f980..aca1b71b9 100644
--- a/libIRDB/test/create_variantir.cpp
+++ b/libIRDB/test/create_variantir.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/drop_variant.cpp b/libIRDB/test/drop_variant.cpp
index b8e6712cd..682a6ec53 100644
--- a/libIRDB/test/drop_variant.cpp
+++ b/libIRDB/test/drop_variant.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/fill_in_cfg.cpp b/libIRDB/test/fill_in_cfg.cpp
index 534723572..af3d576d2 100644
--- a/libIRDB/test/fill_in_cfg.cpp
+++ b/libIRDB/test/fill_in_cfg.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
#include <string.h>
diff --git a/libIRDB/test/fill_in_indtargs.cpp b/libIRDB/test/fill_in_indtargs.cpp
index 2254eb050..0c4e5f1af 100644
--- a/libIRDB/test/fill_in_indtargs.cpp
+++ b/libIRDB/test/fill_in_indtargs.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
#include <string.h>
diff --git a/libIRDB/test/fix_calls.cpp b/libIRDB/test/fix_calls.cpp
index 522ff1dbc..2228da530 100644
--- a/libIRDB/test/fix_calls.cpp
+++ b/libIRDB/test/fix_calls.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
#include "beaengine/BeaEngine.h"
diff --git a/libIRDB/test/generate_spri.cpp b/libIRDB/test/generate_spri.cpp
index 29a14068b..3d4b57769 100644
--- a/libIRDB/test/generate_spri.cpp
+++ b/libIRDB/test/generate_spri.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <utils.hpp> // to_string function from libIRDB
#include <iostream>
#include <fstream>
diff --git a/libIRDB/test/ilr.cpp b/libIRDB/test/ilr.cpp
index 7b7c9d538..5a9bf3bcf 100644
--- a/libIRDB/test/ilr.cpp
+++ b/libIRDB/test/ilr.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/list_programs.cpp b/libIRDB/test/list_programs.cpp
index 934c4709b..01738628a 100644
--- a/libIRDB/test/list_programs.cpp
+++ b/libIRDB/test/list_programs.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/print_variant.cpp b/libIRDB/test/print_variant.cpp
index f97666c02..49118f5fd 100644
--- a/libIRDB/test/print_variant.cpp
+++ b/libIRDB/test/print_variant.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/libIRDB/test/read_variantir.cpp b/libIRDB/test/read_variantir.cpp
index 896062481..a57c0a4cf 100644
--- a/libIRDB/test/read_variantir.cpp
+++ b/libIRDB/test/read_variantir.cpp
@@ -1,6 +1,6 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
diff --git a/tools/transforms/Makefile b/tools/transforms/Makefile
index f65683bff..fc64a9033 100644
--- a/tools/transforms/Makefile
+++ b/tools/transforms/Makefile
@@ -19,7 +19,7 @@ PROGS=p1transform.exe integerbugtransform.exe nulltransform.exe
CC=g++
CFLAGS= -g
INCLUDE=-I. -I../../include -I../../xform -I../../beaengine/include -I../../libIRDB/include/
-LIBS=-L../../lib -L../../xform -lxform -lELFIO -L../../libIRDB/lib/ -lIRDB -L../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -lpqxx
+LIBS=-L../../lib -L../../xform -lxform -lELFIO -L../../libIRDB/lib/ -lIRDB-core -L../../beaengine/lib/Linux.gnu.Debug -lBeaEngine_s_d -lpqxx
OBJS=transformutils.o
.SUFFIXES: .o .c .exe .cpp
diff --git a/tools/transforms/integerbugtransform.cpp b/tools/transforms/integerbugtransform.cpp
index 4be6de021..907f6b15f 100644
--- a/tools/transforms/integerbugtransform.cpp
+++ b/tools/transforms/integerbugtransform.cpp
@@ -1,4 +1,4 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
#include <string.h>
diff --git a/tools/transforms/p1transform.h b/tools/transforms/p1transform.h
index 7e4b87d40..bab8e3383 100755
--- a/tools/transforms/p1transform.h
+++ b/tools/transforms/p1transform.h
@@ -1,4 +1,4 @@
-#include <libIRDB.hpp>
+#include <libIRDB-core.hpp>
#include <iostream>
#include <stdlib.h>
#include <regex.h>
--
GitLab