build-sys: fixups for libsystemd-daemon merge

2014-02-18 20:32:09 -05:00 · 2014-02-18 20:32:09 -05:00 · 49a356c258
parent be4b47cb52
commit 49a356c258
3 changed files with 3 additions and 8 deletions
--- 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 = \
--- 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}
--- 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;