From 4f1d1ad7c3105fc8ef8408465258c27c943b86cd Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Thu, 17 Sep 2009 11:43:35 +0200 Subject: Move lib/Utils/DBusClientProxy.* to src/Applet/; do not link rpm to libABRTUtils As a result, we can drop these libs from libABRTUtils: libbz2.so.1 => /lib64/libbz2.so.1 (0x00007ff8934ef000) libdb-4.7.so => /lib64/libdb-4.7.so (0x00007ff8921ae000) libdbus-c++-1.so.0 => /usr/lib64/libdbus-c++-1.so.0 (0x00007ff895276000) libelf.so.1 => /usr/lib64/libelf.so.1 (0x00007ff8930c5000) liblua-5.1.so => /usr/lib64/liblua-5.1.so (0x00007ff892c7a000) liblzma.so.0 => /usr/lib64/liblzma.so.0 (0x00007ff892ea5000) libnspr4.so => /lib64/libnspr4.so (0x00007ff890ec2000) libnss3.so => /lib64/libnss3.so (0x00007ff892948000) libnssutil3.so => /lib64/libnssutil3.so (0x00007ff891505000) libplc4.so => /lib64/libplc4.so (0x00007ff891300000) libplds4.so => /lib64/libplds4.so (0x00007ff8910fd000) libpopt.so.0 => /lib64/libpopt.so.0 (0x00007ff89273f000) librpmio.so.0 => /usr/lib64/librpmio.so.0 (0x00007ff8954a8000) librpm.so.0 => /usr/lib64/librpm.so.0 (0x00007ff8956d9000) Signed-off-by: Denys Vlasenko --- src/Daemon/Makefile.am | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'src/Daemon') diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index a4698af..49898c1 100644 --- a/src/Daemon/Makefile.am +++ b/src/Daemon/Makefile.am @@ -1,32 +1,34 @@ sbin_PROGRAMS = abrtd -# FIXME: we still link against dbus-c++ (not just dbus) -# because lib/Utils links it in - abrtd_SOURCES = \ - ABRTPlugin.cpp ABRTPlugin.h \ - PluginManager.cpp PluginManager.h \ - RPM.cpp RPM.h \ - MiddleWare.cpp MiddleWare.h \ - CrashWatcher.cpp CrashWatcher.h \ + ABRTPlugin.h ABRTPlugin.cpp \ + PluginManager.h PluginManager.cpp \ + RPM.h RPM.cpp \ + MiddleWare.h MiddleWare.cpp \ + CrashWatcher.h CrashWatcher.cpp \ CommLayerServer.h CommLayerServer.cpp \ CommLayerServerSocket.h CommLayerServerSocket.cpp \ CommLayerServerDBus.h CommLayerServerDBus.cpp \ - Daemon.cpp Daemon.h \ + Daemon.h Daemon.cpp \ Settings.h Settings.cpp abrtd_CPPFLAGS = \ -I$(srcdir)/../../inc \ -I$(srcdir)/../../lib/Utils \ + -DBIN_DIR=\"$(bindir)\" \ + -DVAR_RUN=\"$(VAR_RUN)\" \ + -DCONF_DIR=\"$(CONF_DIR)\" \ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \ -DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \ -DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \ - -DCONF_DIR=\"$(CONF_DIR)\" \ - -DVAR_RUN=\"$(VAR_RUN)\" \ - $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ - $(ENABLE_SOCKET_OR_DBUS) + $(GLIB_CFLAGS) \ + $(DBUS_CFLAGS) \ + $(ENABLE_SOCKET_OR_DBUS) \ + -D_GNU_SOURCE abrtd_LDADD = \ ../../lib/Utils/libABRTUtils.la \ - $(DL_LIBS) $(DBUS_LIBS) $(RPM_LIBS) + $(DL_LIBS) \ + $(DBUS_LIBS) \ + $(RPM_LIBS) dbusabrtconfdir = ${sysconfdir}/dbus-1/system.d/ dist_dbusabrtconf_DATA = dbus-abrt.conf -- cgit