diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/MiddleWare/Makefile.am | 8 | ||||
| -rw-r--r-- | lib/Plugins/Makefile.am | 6 |
3 files changed, 8 insertions, 8 deletions
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) |