Added new library Utils

7 files changed, 16 insertions, 16 deletions

diff --git a/configure.ac b/configure.ac
index 7c68604..b882963 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,7 +43,7 @@ AC_CONFIG_FILES([
 	Makefile
 	lib/Makefile
 	lib/DBus/Makefile
-	lib/DebugDump/Makefile
+	lib/Utils/Makefile
 	lib/MiddleWare/Makefile
 	lib/Plugins/Makefile
 	src/Makefile
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c5b18c4..50fcc63 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1 +1 @@
-SUBDIRS = DebugDump MiddleWare Plugins DBus
\ No newline at end of file
+SUBDIRS = Utils MiddleWare Plugins DBus
\ No newline at end of file
diff --git a/lib/MiddleWare/Makefile.am b/lib/MiddleWare/Makefile.am
index a6aa22e..aafb842 100644
--- a/lib/MiddleWare/Makefile.am
+++ b/lib/MiddleWare/Makefile.am
@@ -3,14 +3,14 @@ libMiddleWare_la_SOURCES = MiddleWare.cpp MiddleWare.h PluginManager.cpp \
                            PluginManager.h CrashCatcherPlugin.cpp \
                            CrashCatcherPlugin.h DynamicLibrary.cpp \
                            DynamicLibrary.h
-libMiddleWare_la_LIBADD = $(DL_LIBS)
+libMiddleWare_la_LIBADD = $(DL_LIBS) ../Utils/libUtils.la
 libMiddleWare_la_LDFLAGS = -version-info 0:1:0
-
+libMiddleWare_la_CPPFLAGS = -I$(srcdir)/../Utils
 
 check_PROGRAMS = test
 test_SOURCES = test.cpp
-test_LDADD = ../DebugDump/libDebugDump.la libMiddleWare.la $(DL_LIBS)
-test_CPPFLAGS = -I$(srcdir)/../DebugDump \
+test_LDADD = ../Utils/libUtils.la libMiddleWare.la $(DL_LIBS)
+test_CPPFLAGS = -I$(srcdir)/../Utils \
                 -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
                 -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
                 -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\"
\ No newline at end of file
diff --git a/lib/Plugins/Makefile.am b/lib/Plugins/Makefile.am
index 02ccafb..612e614 100644
--- a/lib/Plugins/Makefile.am
+++ b/lib/Plugins/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS = -I$(srcdir)/../MiddleWare
+AM_CPPFLAGS = -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils
 pluginslibdir=$(PLUGINS_LIB_DIR)
 pluginslib_LTLIBRARIES = libCCpp.la libMailx.la libSQLite3.la
 
@@ -8,7 +8,7 @@ pluginsconf_DATA = CCpp.conf Mailx.conf SQLite3.conf
 # CCpp
 libCCpp_la_SOURCES = CCpp.cpp CCpp.h
 libCCpp_la_LDFLAGS = -version-info 0:1:0
-libCCpp_la_CPPFLAGS = -I$(srcdir)/../MiddleWare -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\"
+libCCpp_la_CPPFLAGS = -I$(srcdir)/../MiddleWare  -I$(srcdir)/../Utils -DCCPP_HOOK_PATH=\"${libexecdir}/hookCCpp\"
 
 # Mailx
 libMailx_la_SOURCES = Mailx.cpp Mailx.h
@@ -18,5 +18,5 @@ libMailx_la_LDFLAGS = -version-info 0:1:0
 libSQLite3_la_SOURCES = SQLite3.cpp SQLite3.h
 libSQLite3_la_LDFLAGS = -version-info 0:1:0
 libSQLite3_la_LIBADD = $(SQLITE3_LIBS)
-libSQLite3_la_CPPFLAGS = -I$(srcdir)/../MiddleWare $(SQLITE3_CFLAGS)
+libSQLite3_la_CPPFLAGS = -I$(srcdir)/../MiddleWare -I$(srcdir)/../Utils $(SQLITE3_CFLAGS)
 
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index f98b5bc..8500b01 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = applet
 applet_SOURCES = Applet.cpp  CCApplet.cpp  CCApplet.h
-applet_CPPFLAGS = -I../../lib/MiddleWare \
-			-I../../lib/DBus \
-                        -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(DBUS_GLIB_CFLAGS) $(GTKMM_CFLAGS)
-applet_LDADD = ../../lib/MiddleWare/libMiddleWare.la ../../lib/DBus/libDBus.la $(DL_LIBS) $(GTKMM_LIBS)
+applet_CPPFLAGS = -I../../lib/DBus \
+                  -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+                  $(DBUS_GLIB_CFLAGS) $(GTKMM_CFLAGS)
+applet_LDADD = ../../lib/DBus/libDBus.la $(DL_LIBS) $(GTKMM_LIBS)
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index 395eb12..b2c5176 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = CrashCatcher
 CrashCatcher_SOURCES = CrashWatcher.cpp CrashWatcher.h Daemon.cpp
-CrashCatcher_CPPFLAGS = -I../../lib/MiddleWare \
+CrashCatcher_CPPFLAGS = -I../../lib/MiddleWare -I../../lib/Utils\
 			-I../../lib/DBus \
                         -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" $(DBUS_GLIB_CFLAGS)
 CrashCatcher_LDADD = ../../lib/MiddleWare/libMiddleWare.la ../../lib/DBus/libDBus.la $(DL_LIBS)
diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am
index 92efb6e..acf23f3 100644
--- a/src/Hooks/Makefile.am
+++ b/src/Hooks/Makefile.am
@@ -1,5 +1,5 @@
 libexec_PROGRAMS = hookCCpp
 hookCCpp_SOURCES = CCpp.cpp
-hookCCpp_LDADD = ../../lib/DebugDump/libDebugDump.la
-hookCCpp_CPPFLAGS = -I$(srcdir)/../../lib/DebugDump \
+hookCCpp_LDADD = ../../lib/Utils/libUtils.la
+hookCCpp_CPPFLAGS = -I$(srcdir)/../../lib/Utils \
                     -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\"
\ No newline at end of file