diff options
| author | Nikola Pajkovsky <npajkovs@redhat.com> | 2009-09-17 12:20:43 +0200 |
|---|---|---|
| committer | Nikola Pajkovsky <npajkovs@redhat.com> | 2009-09-17 12:20:43 +0200 |
| commit | 5908573b07ea3b833006868a89f97c0fdb2e58f8 (patch) | |
| tree | bf0f23378b3d6fa4f64c4b74aeac37fb9edddd5f /src/Daemon | |
| parent | 5a86973be999b43581e814412f0d52885abac5d4 (diff) | |
| parent | 4f1d1ad7c3105fc8ef8408465258c27c943b86cd (diff) | |
| download | abrt-5908573b07ea3b833006868a89f97c0fdb2e58f8.tar.gz abrt-5908573b07ea3b833006868a89f97c0fdb2e58f8.tar.xz abrt-5908573b07ea3b833006868a89f97c0fdb2e58f8.zip | |
Merge branch 'master' into experimental
Conflicts:
po/pa.po
Diffstat (limited to 'src/Daemon')
| -rw-r--r-- | src/Daemon/Makefile.am | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am index a4698afc..49898c10 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 |