summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKarel Klic <kklic@redhat.com>2009-11-26 10:35:03 +0100
committerKarel Klic <kklic@redhat.com>2009-11-26 10:35:03 +0100
commit956b67b4934078fc32bce238c2e01699be93beaf (patch)
treed0cf79f9889707b648e78664d9c351543f78922b /src
parent3189f5f1dec5b19e24af444230859358eb45d742 (diff)
parent257b6d0bfdaef3f143dc8249677a56586031e604 (diff)
downloadabrt-956b67b4934078fc32bce238c2e01699be93beaf.tar.gz
abrt-956b67b4934078fc32bce238c2e01699be93beaf.tar.xz
abrt-956b67b4934078fc32bce238c2e01699be93beaf.zip
Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt
Diffstat (limited to 'src')
-rw-r--r--src/Applet/Makefile.am1
-rw-r--r--src/CLI/Makefile.am3
-rw-r--r--src/Daemon/Makefile.am1
-rw-r--r--src/Hooks/Makefile.am4
4 files changed, 7 insertions, 2 deletions
diff --git a/src/Applet/Makefile.am b/src/Applet/Makefile.am
index 6fca43ab..900ec019 100644
--- a/src/Applet/Makefile.am
+++ b/src/Applet/Makefile.am
@@ -23,6 +23,7 @@ abrt_applet_CPPFLAGS = \
# $(DBUS_GLIB_CFLAGS)
abrt_applet_LDADD = \
../../lib/Utils/libABRTUtils.la \
+ ../../lib/Utils/libABRTdUtils.la \
-lglib-2.0 \
-lgthread-2.0 \
$(DBUS_LIBS) \
diff --git a/src/CLI/Makefile.am b/src/CLI/Makefile.am
index e84d426a..d12b69b1 100644
--- a/src/CLI/Makefile.am
+++ b/src/CLI/Makefile.am
@@ -17,7 +17,8 @@ abrt_cli_CPPFLAGS = \
# $(GTK_CFLAGS)
abrt_cli_LDADD = \
- ../../lib/Utils/libABRTUtils.la
+ ../../lib/Utils/libABRTUtils.la \
+ ../../lib/Utils/libABRTdUtils.la
man_MANS = abrt-cli.1
EXTRA_DIST = $(man_MANS)
diff --git a/src/Daemon/Makefile.am b/src/Daemon/Makefile.am
index a5bb64f6..fc4f5e20 100644
--- a/src/Daemon/Makefile.am
+++ b/src/Daemon/Makefile.am
@@ -29,6 +29,7 @@ abrtd_CPPFLAGS = \
-D_GNU_SOURCE
abrtd_LDADD = \
../../lib/Utils/libABRTUtils.la \
+ ../../lib/Utils/libABRTdUtils.la \
$(DL_LIBS) \
$(DBUS_LIBS) \
$(RPM_LIBS) \
diff --git a/src/Hooks/Makefile.am b/src/Hooks/Makefile.am
index e581c25b..026d4cf7 100644
--- a/src/Hooks/Makefile.am
+++ b/src/Hooks/Makefile.am
@@ -26,8 +26,10 @@ dumpoops_CPPFLAGS = \
-DCONF_DIR=\"$(CONF_DIR)\" \
-DVAR_RUN=\"$(VAR_RUN)\" \
-D_GNU_SOURCE
+# build will succeed, but at runtime plugins do need ABRT*d*Utils
dumpoops_LDADD = \
- ../../lib/Utils/libABRTUtils.la
+ ../../lib/Utils/libABRTUtils.la \
+ ../../lib/Utils/libABRTdUtils.la
# abrt-pyhook-helper
abrt_pyhook_helper_SOURCES = \