From 49a356c2580c7c80f9c1e7e897ff7dcf9d9bce4c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 18 Feb 2014 20:32:09 -0500 Subject: [PATCH] build-sys: fixups for libsystemd-daemon merge --- Makefile.am | 2 +- src/compat-libs/libsystemd-daemon.pc.in | 4 ++-- src/compat-libs/libsystemd-daemon.sym | 5 ----- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0efa5f0df..b36b42d93 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 8bb3a74c8..847afc9d6 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 aa9be51c6..f44023893 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; -- 2.30.2