build-sys: fixups for libsystemd-daemon merge

diff --git a/Makefile.am b/Makefile.am
index 0efa5f0df2c7a31beb245cd8f403f655167a608b..b36b42d933520290c3ec2befcd856b2735c83ee6 100644 (file)
--- 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 8bb3a74c87bb3bf5fb7ed0be45ba111f5968f281..847afc9d606518c6fff0507753394fdd43d3a2d9 100644 (file)
--- 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 aa9be51c6ab3ea077930b1f2b018d653815c53b8..f4402389319d6b4be16315f4ac9fdb174c488743 100644 (file)
--- 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;