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

diff --git a/Makefile.am b/Makefile.am
index 6e55cb749..ce5ff6392 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1479,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 \
@@ -1494,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 \
@@ -1510,7 +1502,6 @@ systemd_update_utmp_SOURCES = \
 
 systemd_update_utmp_CFLAGS = \
 	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS) \
 	$(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
@@ -1665,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 \
@@ -1962,6 +1949,9 @@ libsystemd_event_la_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
 
@@ -1974,6 +1964,7 @@ libsystemd_bus_la_SOURCES = \
 	src/systemd/sd-bus-protocol.h \
 	src/systemd/sd-bus-vtable.h \
 	src/systemd/sd-memfd.h \
+	src/systemd/sd-utf8.h \
 	src/libsystemd-bus/sd-bus.c \
 	src/libsystemd-bus/bus-control.c \
 	src/libsystemd-bus/bus-control.h \
@@ -2005,7 +1996,8 @@ 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
 
 libsystemd_bus_la_LIBADD =  \
 	libsystemd-id128-internal.la \
@@ -2022,6 +2014,9 @@ 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
 
@@ -3710,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 \
@@ -3789,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 \
@@ -3929,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 \
@@ -3966,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