summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorZdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>2009-02-05 11:18:21 +0100
committerZdenek Prikryl <zdeny@dhcp-lab-218.englab.brq.redhat.com>2009-02-05 11:18:21 +0100
commita3ba5ff33b71a8b5dc67129158f1c03254641572 (patch)
tree1dea8220ae95de7af0ab117e2bf083c906d41871 /lib
parent73a7417887cb9a78b3c85d63f7c7d5040b3a8daf (diff)
downloadabrt-a3ba5ff33b71a8b5dc67129158f1c03254641572.tar.gz
abrt-a3ba5ff33b71a8b5dc67129158f1c03254641572.tar.xz
abrt-a3ba5ff33b71a8b5dc67129158f1c03254641572.zip
Added new library Utils
Diffstat (limited to 'lib')
-rw-r--r--lib/Makefile.am2
-rw-r--r--lib/MiddleWare/Makefile.am8
-rw-r--r--lib/Plugins/Makefile.am6
3 files changed, 8 insertions, 8 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am
index c5b18c43..50fcc63c 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 a6aa22e2..aafb8424 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 02ccafbe..612e6140 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)