X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ce5ff6392d479fe8828bac72e8867c1b9b5ffd6f;hp=016ce5e3b9b5e4c0f4c37628f128ad9410170e0f;hb=faaa5728d956b7f0d24f27f3341d0b9fff30af00;hpb=d9f644e2cdc81089f76314ee1a264895ca391371

diff --git a/Makefile.am b/Makefile.am
index 016ce5e3b..ce5ff6392 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,10 @@ LIBSYSTEMD_BUS_CURRENT=0
 LIBSYSTEMD_BUS_REVISION=0
 LIBSYSTEMD_BUS_AGE=0
 
+LIBSYSTEMD_EVENT_CURRENT=0
+LIBSYSTEMD_EVENT_REVISION=0
+LIBSYSTEMD_EVENT_AGE=0
+
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
@@ -1475,10 +1479,6 @@ endif
 systemd_analyze_SOURCES = \
 	src/analyze/analyze.c
 
-systemd_analyze_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_analyze_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus-internal.la \
@@ -1490,10 +1490,6 @@ systemd_analyze_LDADD = \
 systemd_initctl_SOURCES = \
 	src/initctl/initctl.c
 
-systemd_initctl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_initctl_LDADD = \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
@@ -1506,7 +1502,6 @@ systemd_update_utmp_SOURCES = \
 
 systemd_update_utmp_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
@@ -1661,10 +1656,6 @@ systemd_sleep_LDADD = \
 systemd_fsck_SOURCES = \
 	src/fsck/fsck.c
 
-systemd_fsck_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_fsck_LDADD = \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
@@ -1948,12 +1939,32 @@ EXTRA_DIST += \
 	src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+libsystemd_event_la_SOURCES = \
+	src/libsystemd-bus/sd-event.c \
+	src/systemd/sd-event.h \
+	src/libsystemd-bus/event-util.h
+
+libsystemd_event_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-version-info $(LIBSYSTEMD_EVENT_CURRENT):$(LIBSYSTEMD_EVENT_REVISION):$(LIBSYSTEMD_EVENT_AGE) \
+	-Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-event.sym
+
+EXTRA_DIST += \
+	src/libsystemd-bus/libsystemd-event.sym
+
+lib_LTLIBRARIES += \
+	libsystemd-event.la
+
+libsystemd_event_la_LIBADD =  \
+	libsystemd-id128-internal.la \
+	libsystemd-shared.la
+
 libsystemd_bus_la_SOURCES = \
 	src/systemd/sd-bus.h \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
 	src/systemd/sd-memfd.h \
-	src/systemd/sd-event.h \
+	src/systemd/sd-utf8.h \
 	src/libsystemd-bus/sd-bus.c \
 	src/libsystemd-bus/bus-control.c \
 	src/libsystemd-bus/bus-control.h \
@@ -1984,15 +1995,15 @@ 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/bus-util.c \
 	src/libsystemd-bus/bus-util.h \
-	src/libsystemd-bus/event-util.h
+	src/libsystemd-bus/sd-utf8.c
 
 libsystemd_bus_la_LIBADD =  \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la
+	libsystemd-daemon.la \
+	libsystemd-event.la
 
 libsystemd_bus_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2003,11 +2014,15 @@ libsystemd_bus_la_LDFLAGS = \
 	-version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \
 	-Wl,--version-script=$(top_srcdir)/src/libsystemd-bus/libsystemd-bus.sym
 
+EXTRA_DIST += \
+	src/libsystemd-bus/libsystemd-bus.sym
+
 lib_LTLIBRARIES += \
 	libsystemd-bus.la
 
 libsystemd_bus_internal_la_SOURCES = \
-	$(libsystemd_bus_la_SOURCES)
+	$(libsystemd_bus_la_SOURCES) \
+	$(libsystemd_event_la_SOURCES)
 
 libsystemd_bus_internal_la_CFLAGS = \
 	$(libsystemd_bus_la_CFLAGS)
@@ -2839,6 +2854,7 @@ systemd_activate_SOURCES = \
 	src/activate/activate.c
 
 systemd_activate_LDADD = \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la
 
@@ -3247,7 +3263,7 @@ systemd_socket_proxyd_SOURCES = \
 
 systemd_socket_proxyd_LDADD = \
 	libsystemd-logs.la \
-	libsystemd-bus-internal.la \
+	libsystemd-event.la \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
@@ -3689,10 +3705,6 @@ SYSTEM_UNIT_ALIASES += \
 timedatectl_SOURCES = \
 	src/timedate/timedatectl.c
 
-timedatectl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 timedatectl_LDADD = \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
@@ -3768,10 +3780,6 @@ noinst_LTLIBRARIES += \
 machinectl_SOURCES = \
 	src/machine/machinectl.c
 
-machinectl_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 machinectl_LDADD = \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
@@ -3908,10 +3916,6 @@ dist_zshcompletion_DATA += \
 systemd_inhibit_SOURCES = \
 	src/login/inhibit.c
 
-systemd_inhibit_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_inhibit_LDADD = \
 	libsystemd-bus-internal.la \
 	libsystemd-id128-internal.la \
@@ -3945,10 +3949,6 @@ test_inhibit_LDADD = \
 test_login_tables_SOURCES = \
 	src/login/test-login-tables.c
 
-test_login_tables_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 test_login_tables_LDADD = \
 	libsystemd-logind-core.la
 
@@ -3990,7 +3990,6 @@ pam_systemd_la_SOURCES = \
 pam_systemd_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(PAM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	-fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -4003,9 +4002,9 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
 	libsystemd-audit.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	libsystemd-shared.la \
-	libsystemd-daemon-internal.la \
+	libsystemd-daemon.la \
 	$(RT_LIBS) \
 	$(PAM_LIBS)