summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--lib/Utils/Makefile.am19
-rw-r--r--src/Applet/DBusClientProxy.cpp (renamed from lib/Utils/DBusClientProxy.cpp)0
-rw-r--r--src/Applet/DBusClientProxy.h (renamed from lib/Utils/DBusClientProxy.h)0
-rw-r--r--src/Applet/Makefile.am25
-rw-r--r--src/CLI/Makefile.am11
-rw-r--r--src/Daemon/Makefile.am30
-rw-r--r--src/Hooks/Makefile.am23
7 files changed, 58 insertions, 50 deletions
diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am
index cef82d9d..713fe868 100644
--- a/lib/Utils/Makefile.am
+++ b/lib/Utils/Makefile.am
@@ -7,7 +7,6 @@ libABRTUtils_la_SOURCES = \
copyfd.cpp \
CrashTypesSocket.cpp \
DebugDump.h DebugDump.cpp \
- DBusClientProxy.h DBusClientProxy.cpp \
CommLayerInner.h CommLayerInner.cpp \
abrt_dbus.h abrt_dbus.cpp \
Plugin.h Plugin.cpp \
@@ -15,14 +14,6 @@ libABRTUtils_la_SOURCES = \
Action.h Database.h Reporter.h Analyzer.h \
Observer.h \
DBusCommon.h
-libABRTUtils_la_LDFLAGS = \
- -version-info 0:1:0 \
- $(DL_LIBS) \
- $(RPM_LIBS) \
- $(DBUSCPP_LIBS)
-libABRTUtils_la_LIBADD = \
- -lmagic \
- $(POLKIT_LIBS)
libABRTUtils_la_CPPFLAGS = \
-Wall -Werror \
-I$(srcdir)/../../inc \
@@ -31,11 +22,17 @@ libABRTUtils_la_CPPFLAGS = \
-DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-DCONF_DIR=\"$(CONF_DIR)\" \
-DVAR_RUN=\"$(VAR_RUN)\" \
- $(RPM_CFLAGS) \
$(GLIB_CFLAGS) \
- $(DBUSCPP_CFLAGS) \
+ $(DBUS_CFLAGS) \
$(POLKIT_CFLAGS) \
-D_GNU_SOURCE
+libABRTUtils_la_LDFLAGS = \
+ -version-info 0:1:0 \
+ $(DL_LIBS) \
+ $(DBUS_LIBS)
+libABRTUtils_la_LIBADD = \
+ -lmagic \
+ $(POLKIT_LIBS)
install-data-local:
$(mkdir_p) '$(DESTDIR)/$(DEBUG_DUMPS_DIR)'
diff --git a/lib/Utils/DBusClientProxy.cpp b/src/Applet/DBusClientProxy.cpp
index ccb48d53..ccb48d53 100644
--- a/lib/Utils/DBusClientProxy.cpp
+++ b/src/Applet/DBusClientProxy.cpp
diff --git a/lib/Utils/DBusClientProxy.h b/src/Applet/DBusClientProxy.h
index e43805bf..e43805bf 100644
--- a/lib/Utils/DBusClientProxy.h
+++ b/src/Applet/DBusClientProxy.h
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 1c810350..accca397 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -2,25 +2,34 @@ bin_PROGRAMS = abrt-applet
abrt_applet_SOURCES = \
Applet.cpp \
- CCApplet.h CCApplet.cpp
+ CCApplet.h CCApplet.cpp \
+ DBusClientProxy.h DBusClientProxy.cpp
abrt_applet_CPPFLAGS = \
-Wall -Werror \
- -I../Daemon/ \
-I$(srcdir)/../../inc \
-I$(srcdir)/../../lib/Utils \
-I/usr/include/glib-2.0 \
-I/usr/lib/glib-2.0/include \
- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
-DBIN_DIR=\"$(bindir)\" \
- $(DBUS_GLIB_CFLAGS) \
+ -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)\" \
$(GTK_CFLAGS) \
$(DBUSCPP_CFLAGS) \
- $(LIBNOTIFY_CFLAGS)
+ -D_GNU_SOURCE
+# $(LIBNOTIFY_CFLAGS)
+# $(DBUS_CFLAGS)
+# $(DBUS_GLIB_CFLAGS)
abrt_applet_LDADD = \
../../lib/Utils/libABRTUtils.la \
- -lglib-2.0 -lgthread-2.0 \
- $(DL_LIBS) $(GTK_LIBS) \
- $(DBUSCPP_LIBS) $(LIBNOTIFY_LIBS)
+ -lglib-2.0 \
+ -lgthread-2.0 \
+ $(DL_LIBS) \
+ $(GTK_LIBS) \
+ $(DBUSCPP_LIBS) \
+ $(LIBNOTIFY_LIBS)
EXTRA_DIST = abrt-applet.desktop popup.GtkBuilder
diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index 9d7667eb..9447791b 100644
--- a/src/CLI/Makefile.am
+++ b/src/CLI/Makefile.am
@@ -1,7 +1,3 @@
-#bin_PROGRAMS = abrt-cli
-#abrt_cli_SOURCES = ABRTSocket.cpp ABRTSocket.h CLI.cpp
-#abrt_cli_CPPFLAGS = -I$(srcdir)/../../inc -DVAR_RUN=\"$(VAR_RUN)\"
-
bin_PROGRAMS = abrt-cli
abrt_cli_SOURCES = \
@@ -12,9 +8,8 @@ abrt_cli_CPPFLAGS = \
-I$(srcdir)/../../lib/Utils \
-DVAR_RUN=\"$(VAR_RUN)\" \
$(ENABLE_SOCKET_OR_DBUS) \
- $(DBUS_GLIB_CFLAGS) \
- $(GTK_CFLAGS) \
- $(DBUSCPP_CFLAGS) \
- $(LIBNOTIFY_CFLAGS)
+ $(DBUS_CFLAGS) \
+ -D_GNU_SOURCE
+# $(GTK_CFLAGS)
abrt_cli_LDADD = \
../../lib/Utils/libABRTUtils.la
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
diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am
index 2831cf9e..fd8eb409 100644
--- a/src/Hooks/Makefile.am
+++ b/src/Hooks/Makefile.am
@@ -2,18 +2,20 @@ libexec_PROGRAMS = hookCCpp
bin_PROGRAMS = dumpoops
# CCpp
-hookCCpp_SOURCES = CCpp.cpp
-hookCCpp_LDADD = ../../lib/Utils/libABRTUtils.la
-hookCCpp_CPPFLAGS = -I$(srcdir)/../../inc \
- -I$(srcdir)/../../lib/Utils \
- -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
- -DVAR_RUN=\"$(VAR_RUN)\"
+hookCCpp_SOURCES = \
+ CCpp.cpp
+hookCCpp_CPPFLAGS = \
+ -I$(srcdir)/../../inc \
+ -I$(srcdir)/../../lib/Utils \
+ -DDEBUG_DUMPS_DIR=\"$(DEBUG_DUMPS_DIR)\" \
+ -DVAR_RUN=\"$(VAR_RUN)\" \
+ -D_GNU_SOURCE
+hookCCpp_LDADD = \
+ ../../lib/Utils/libABRTUtils.la
# dumpoops
dumpoops_SOURCES = \
dumpoops.cpp
-dumpoops_LDADD = \
- ../../lib/Utils/libABRTUtils.la
dumpoops_CPPFLAGS = \
-I$(srcdir)/../../inc \
-I$(srcdir)/../../lib/Utils \
@@ -22,7 +24,10 @@ dumpoops_CPPFLAGS = \
-DPLUGINS_LIB_DIR=\"$(PLUGINS_LIB_DIR)\" \
-DPLUGINS_CONF_DIR=\"$(PLUGINS_CONF_DIR)\" \
-DCONF_DIR=\"$(CONF_DIR)\" \
- -DVAR_RUN=\"$(VAR_RUN)\"
+ -DVAR_RUN=\"$(VAR_RUN)\" \
+ -D_GNU_SOURCE
+dumpoops_LDADD = \
+ ../../lib/Utils/libABRTUtils.la
python_PYTHON = sitecustomize.py abrt_exception_handler.py
EXTRA_DIST = abrt_exception_handler.py.in
generated by cgit (git 2.34.1) at 2024-05-25 22:15:30 +0000