hostnamed: port over from libdbus to libsystemd-bus

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 77a7bbefa5cc7f852685d45385f792566727aab0..b337f4f09b8be515903e7604fa5971acd51dbb40 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,6 +5,7 @@
 #  Copyright 2010-2012 Lennart Poettering
 #  Copyright 2010-2012 Kay Sievers
 #  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
 #
 #  systemd is free software; you can redistribute it and/or modify it
 #  under the terms of the GNU Lesser General Public License as published by
@@ -298,7 +299,8 @@ bin_PROGRAMS = \
        systemd-detect-virt \
        systemd-delta \
        systemd-analyze \
-       systemd-run
+       systemd-run \
+       systemd-saproxy
 
 dist_bin_SCRIPTS = \
        src/kernel-install/kernel-install
@@ -647,6 +649,7 @@ libsystemd_shared_la_SOURCES = \
        src/shared/sparse-endian.h \
        src/shared/util.c \
        src/shared/util.h \
+       src/shared/udev-util.h \
        src/shared/virt.c \
        src/shared/virt.h \
        src/shared/efivars.c \
@@ -1980,7 +1983,10 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-convenience.c \
        src/libsystemd-bus/kdbus.h \
        src/libsystemd-bus/sd-memfd.c \
-       src/libsystemd-bus/sd-event.c
+       src/libsystemd-bus/sd-event.c \
+       src/libsystemd-bus/bus-util.c \
+       src/libsystemd-bus/bus-util.h \
+       src/libsystemd-bus/event-util.h
 
 libsystemd_bus_la_LIBADD =  \
        libsystemd-id128-internal.la \
@@ -2197,9 +2203,7 @@ libudev_la_LDFLAGS = \
 
 libudev_la_LIBADD = \
        libsystemd-shared.la \
-       libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
        libsystemd-id128-internal.la
 
 pkgconfiglib_DATA += \
@@ -2371,7 +2375,6 @@ libudev_core_la_LIBADD = \
        libudev-private.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
-       $(RT_LIBS) \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -2433,6 +2436,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
        libudev-core.la \
+       libsystemd-label.la \
        libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing
@@ -2759,10 +2763,7 @@ libsystemd_id128_la_LDFLAGS = \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
 
 libsystemd_id128_la_LIBADD = \
-       libsystemd-shared.la \
-       libsystemd-label.la \
-       libsystemd-daemon-internal.la \
-       $(RT_LIBS)
+       libsystemd-shared.la
 
 libsystemd_id128_internal_la_SOURCES = \
        $(libsystemd_id128_la_SOURCES)
@@ -2958,6 +2959,7 @@ test_catalog_LDADD = \
 libsystemd_journal_la_SOURCES = \
        src/journal/sd-journal.c \
        src/systemd/sd-journal.h \
+       src/systemd/_sd-common.h \
        src/journal/journal-file.c \
        src/journal/journal-file.h \
        src/journal/journal-vacuum.c \
@@ -3012,7 +3014,6 @@ libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
-       libsystemd-label.la \
        libsystemd-audit.la \
        libsystemd-daemon.la \
        libudev.la \
@@ -3122,7 +3123,8 @@ tests += \
 
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
-       src/systemd/sd-messages.h
+       src/systemd/sd-messages.h \
+       src/systemd/_sd-common.h
 
 lib_LTLIBRARIES += \
        libsystemd-journal.la
@@ -3211,6 +3213,22 @@ endif
 EXTRA_DIST += \
        units/systemd-journal-gatewayd.service.in
 
+# ------------------------------------------------------------------------------
+
+systemd_saproxy_SOURCES = \
+       src/saproxy/saproxy.c
+
+systemd_saproxy_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-logs.la \
+       libsystemd-journal-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon.la \
+       libsystemd-bus.la
+
+systemd_saproxy_CFLAGS = \
+       $(AM_CFLAGS)
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3432,6 +3450,26 @@ endif
 EXTRA_DIST += \
        units/systemd-backlight@.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_RFKILL
+rootlibexec_PROGRAMS += \
+       systemd-rfkill
+
+nodist_systemunit_DATA += \
+       units/systemd-rfkill@.service
+
+systemd_rfkill_SOURCES = \
+       src/rfkill/rfkill.c
+
+systemd_rfkill_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la \
+       libudev-private.la
+endif
+
+EXTRA_DIST += \
+       units/systemd-rfkill@.service.in
+
 # ------------------------------------------------------------------------------
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -3473,15 +3511,11 @@ if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
        src/hostname/hostnamed.c
 
-systemd_hostnamed_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_hostnamed_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
        systemd-hostnamed
@@ -3622,15 +3656,11 @@ if ENABLE_TIMEDATED
 systemd_timedated_SOURCES = \
        src/timedate/timedated.c
 
-systemd_timedated_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 systemd_timedated_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
        systemd-timedated