X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=6810cc1bf3fdc021d3c9ab6c2c5018a68917d474;hb=c5383e7942e5d7323406feec2f35ff25a7771919;hp=6e55cb749875844b20189342d460db3018e1c5f3;hpb=fdd6816f7d35011352354956b269de67912feeea;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 6e55cb749..6810cc1bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,10 +63,6 @@ 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@
@@ -1479,10 +1475,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 \
@@ -1494,10 +1486,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 \
@@ -1510,7 +1498,6 @@ systemd_update_utmp_SOURCES = \
 
 systemd_update_utmp_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
@@ -1665,10 +1652,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 \
@@ -1952,28 +1935,13 @@ 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
-
-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-utf8.h \
+	src/systemd/sd-event.h \
 	src/libsystemd-bus/sd-bus.c \
 	src/libsystemd-bus/bus-control.c \
 	src/libsystemd-bus/bus-control.h \
@@ -2005,13 +1973,15 @@ libsystemd_bus_la_SOURCES = \
 	src/libsystemd-bus/kdbus.h \
 	src/libsystemd-bus/sd-memfd.c \
 	src/libsystemd-bus/bus-util.c \
-	src/libsystemd-bus/bus-util.h
+	src/libsystemd-bus/bus-util.h \
+	src/libsystemd-bus/sd-utf8.c \
+	src/libsystemd-bus/sd-event.c \
+	src/libsystemd-bus/event-util.h
 
 libsystemd_bus_la_LIBADD =  \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
-	libsystemd-daemon.la \
-	libsystemd-event.la
+	libsystemd-daemon.la
 
 libsystemd_bus_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -2022,12 +1992,18 @@ 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
 
+pkgconfiglib_DATA += \
+	src/libsystemd-bus/libsystemd-bus.pc
+
+EXTRA_DIST += \
+	src/libsystemd-bus/libsystemd-bus.pc.in \
+	src/libsystemd-bus/libsystemd-bus.sym
+
 lib_LTLIBRARIES += \
 	libsystemd-bus.la
 
 libsystemd_bus_internal_la_SOURCES = \
-	$(libsystemd_bus_la_SOURCES) \
-	$(libsystemd_event_la_SOURCES)
+	$(libsystemd_bus_la_SOURCES)
 
 libsystemd_bus_internal_la_CFLAGS = \
 	$(libsystemd_bus_la_CFLAGS)
@@ -3268,7 +3244,7 @@ systemd_socket_proxyd_SOURCES = \
 
 systemd_socket_proxyd_LDADD = \
 	libsystemd-logs.la \
-	libsystemd-event.la \
+	libsystemd-bus.la \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
 	libsystemd-shared.la \
@@ -3710,10 +3686,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 \
@@ -3789,10 +3761,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 \
@@ -3929,10 +3897,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 \
@@ -3966,10 +3930,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