Reorganized current libIRDB into a library for the CORE functionality. Hope...

Reorganized current libIRDB into a library for the CORE functionality.  Hope is to add a second library for CFG building.

.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

libIRDB/include/libIRDB.hpp → libIRDB/include/libIRDB-core.hpp

+#ifndef libIRDB_core
+#define libIRDB_core
 
 #include <string>
 #include <set>
@@ -5,24 +7,25 @@
 #include <string.h>
 #include <iostream>
 #include <pqxx/pqxx>
-#include "beaengine/BeaEngine.h"
+#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>
+#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

libIRDB/src/Makefile

 
-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

libIRDB/src/core/Makefile

+
+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) $@

libIRDB/src/address.cpp → libIRDB/src/core/address.cpp

 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 using namespace libIRDB;

libIRDB/src/all.hpp → libIRDB/src/core/all.hpp

-#include <libIRDB.hpp> 
+#include <libIRDB-core.hpp> 
 using namespace libIRDB;

libIRDB/src/baseobj.cpp → libIRDB/src/core/baseobj.cpp

 
-#include <libIRDB.hpp>
-using namespace libIRDB;
+#include <all.hpp>
 
 
 /*

libIRDB/src/dbinterface.cpp → libIRDB/src/core/dbinterface.cpp

 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <iostream>
 #include <stdlib.h>
 

libIRDB/src/file.cpp → libIRDB/src/core/file.cpp

 
-#include <libIRDB.hpp>
+#include <all.hpp>
 #include <utils.hpp>
 #include <stdlib.h>
 using namespace libIRDB;