summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-18 20:32:09 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-02-18 20:32:40 -0500
commit49a356c2580c7c80f9c1e7e897ff7dcf9d9bce4c (patch)
treefdc2d69068e68c9afa7a03e04d4bbdd6034660fd
parentbe4b47cb52093a1330850513a17f6aecb9362724 (diff)
build-sys: fixups for libsystemd-daemon merge
-rw-r--r--Makefile.am2
-rw-r--r--src/compat-libs/libsystemd-daemon.pc.in4
-rw-r--r--src/compat-libs/libsystemd-daemon.sym5
3 files changed, 3 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 0efa5f0df2..b36b42d933 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1994,7 +1994,7 @@ nodist_libsystemd_la_SOURCES = \
libsystemd_la_LIBADD = \
libsystemd-shared.la \
- $(RT_LIBS)
+ $(RT_LIBS) \
-lresolv
libsystemd_la_CFLAGS = \
diff --git a/src/compat-libs/libsystemd-daemon.pc.in b/src/compat-libs/libsystemd-daemon.pc.in
index 8bb3a74c87..847afc9d60 100644
--- a/src/compat-libs/libsystemd-daemon.pc.in
+++ b/src/compat-libs/libsystemd-daemon.pc.in
@@ -12,8 +12,8 @@ libdir=@libdir@
includedir=@includedir@
Name: systemd
-Description: systemd Daemon Utility Library
+Description: systemd Daemon Utility Library - deprecated
URL: @PACKAGE_URL@
Version: @PACKAGE_VERSION@
-Libs: -L${libdir} -lsystemd-daemon
+Libs: -L${libdir} -lsystemd
Cflags: -I${includedir}
diff --git a/src/compat-libs/libsystemd-daemon.sym b/src/compat-libs/libsystemd-daemon.sym
index aa9be51c6a..f440238931 100644
--- a/src/compat-libs/libsystemd-daemon.sym
+++ b/src/compat-libs/libsystemd-daemon.sym
@@ -25,8 +25,3 @@ global:
local:
*;
};
-
-LIBSYSTEMD_DAEMON_209 {
-global:
- sd_watchdog_enabled;
-} LIBSYSTEMD_DAEMON_31;