X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=379e87856ad5076a7660d3e85702a66aec30531a;hp=7b6df1b608b4ba83e8827a27d188db7fd8230a8c;hb=464b3d64419808b7334563e907d172337cc9d718;hpb=1ca208fb4f93e5869704af1812cbff7130a2fc03

diff --git a/Makefile.am b/Makefile.am
index 7b6df1b60..379e87856 100644
--- 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
@@ -62,7 +63,6 @@ LIBSYSTEMD_JOURNAL_AGE=11
 dbuspolicydir=@dbuspolicydir@
 dbussessionservicedir=@dbussessionservicedir@
 dbussystemservicedir=@dbussystemservicedir@
-dbusinterfacedir=@dbusinterfacedir@
 pamlibdir=@pamlibdir@
 pamconfdir=@pamconfdir@
 pkgconfigdatadir=$(datadir)/pkgconfig
@@ -126,7 +126,6 @@ nodist_udevrules_DATA =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
-dbusinterface_DATA =
 dist_dbussystemservice_DATA =
 check_PROGRAMS =
 check_DATA =
@@ -319,7 +318,8 @@ rootlibexec_PROGRAMS = \
 	systemd-fsck \
 	systemd-ac-power \
 	systemd-sysctl \
-	systemd-sleep
+	systemd-sleep \
+	systemd-socket-proxyd
 
 systemgenerator_PROGRAMS = \
 	systemd-getty-generator \
@@ -497,8 +497,7 @@ EXTRA_DIST += \
 	units/initrd-cleanup.service.in \
 	units/initrd-udevadm-cleanup-db.service.in \
 	units/initrd-switch-root.service.in \
-	units/systemd-nspawn@.service.in \
-	introspect.awk
+	units/systemd-nspawn@.service.in
 
 CLEANFILES += \
 	units/console-shell.service.m4 \
@@ -804,9 +803,6 @@ libsystemd_logs_la_SOURCES = \
 	src/shared/logs-show.c \
 	src/shared/logs-show.h
 
-libsystemd_logs_la_CFLAGS = \
-	$(AM_CFLAGS)
-
 libsystemd_logs_la_LIBADD = \
 	libsystemd-journal-internal.la \
 	libsystemd-id128-internal.la \
@@ -1079,29 +1075,9 @@ dist_dbuspolicy_DATA += \
 dist_dbussystemservice_DATA += \
 	src/core/org.freedesktop.systemd1.service
 
-dbusinterface_DATA += \
-	org.freedesktop.systemd1.Manager.xml \
-	org.freedesktop.systemd1.Job.xml \
-	org.freedesktop.systemd1.Unit.xml \
-	org.freedesktop.systemd1.Service.xml \
-	org.freedesktop.systemd1.Socket.xml \
-	org.freedesktop.systemd1.Timer.xml \
-	org.freedesktop.systemd1.Target.xml \
-	org.freedesktop.systemd1.Device.xml \
-	org.freedesktop.systemd1.Mount.xml \
-	org.freedesktop.systemd1.Automount.xml \
-	org.freedesktop.systemd1.Snapshot.xml \
-	org.freedesktop.systemd1.Swap.xml \
-	org.freedesktop.systemd1.Path.xml
-
 polkitpolicy_in_in_files += \
 	src/core/org.freedesktop.systemd1.policy.in.in
 
-org.freedesktop.systemd1.%.xml: systemd
-	$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.$* $< $@.tmp && \
-		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 pkgconfigdata_DATA = \
 	src/core/systemd.pc
 
@@ -1251,36 +1227,24 @@ test_unit_file_LDADD = \
 test_utf8_SOURCES = \
 	src/test/test-utf8.c
 
-test_utf8_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_utf8_LDADD = \
 	libsystemd-shared.la
 
 test_util_SOURCES = \
 	src/test/test-util.c
 
-test_util_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_util_LDADD = \
 	libsystemd-core.la
 
 test_hashmap_SOURCES = \
 	src/test/test-hashmap.c
 
-test_hashmap_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_hashmap_LDADD = \
 	libsystemd-core.la
 
 test_list_SOURCES = \
 	src/test/test-list.c
 
-test_list_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_list_LDADD = \
 	libsystemd-core.la
 
@@ -1299,27 +1263,18 @@ test_tables_LDADD = \
 test_prioq_SOURCES = \
 	src/test/test-prioq.c
 
-test_prioq_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_prioq_LDADD = \
 	libsystemd-core.la
 
 test_fileio_SOURCES = \
 	src/test/test-fileio.c
 
-test_fileio_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_fileio_LDADD = \
 	libsystemd-core.la
 
 test_time_SOURCES = \
 	src/test/test-time.c
 
-test_time_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_time_LDADD = \
 	libsystemd-core.la
 
@@ -1499,7 +1454,7 @@ systemd_initctl_CFLAGS = \
 systemd_initctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemd_update_utmp_SOURCES = \
@@ -1512,7 +1467,7 @@ systemd_update_utmp_CFLAGS = \
 
 systemd_update_utmp_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	$(AUDIT_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1666,7 +1621,7 @@ systemd_fsck_CFLAGS = \
 
 systemd_fsck_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la \
+	libsystemd-bus.la \
 	libudev.la
 
 # ------------------------------------------------------------------------------
@@ -1793,13 +1748,9 @@ systemd_remount_fs_LDADD = \
 systemd_cgroups_agent_SOURCES = \
 	src/cgroups-agent/cgroups-agent.c
 
-systemd_cgroups_agent_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_cgroups_agent_LDADD = \
 	libsystemd-shared.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 # ------------------------------------------------------------------------------
 systemctl_SOURCES = \
@@ -1981,7 +1932,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 \
@@ -2073,9 +2027,6 @@ test_bus_objects_LDADD = \
 test_bus_match_SOURCES = \
 	src/libsystemd-bus/test-bus-match.c
 
-test_bus_match_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_match_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -2084,9 +2035,6 @@ test_bus_match_LDADD = \
 test_bus_kernel_SOURCES = \
 	src/libsystemd-bus/test-bus-kernel.c
 
-test_bus_kernel_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_kernel_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -2095,9 +2043,6 @@ test_bus_kernel_LDADD = \
 test_bus_kernel_bloom_SOURCES = \
 	src/libsystemd-bus/test-bus-kernel-bloom.c
 
-test_bus_kernel_bloom_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_kernel_bloom_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -2106,9 +2051,6 @@ test_bus_kernel_bloom_LDADD = \
 test_bus_kernel_benchmark_SOURCES = \
 	src/libsystemd-bus/test-bus-kernel-benchmark.c
 
-test_bus_kernel_benchmark_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_kernel_benchmark_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la \
@@ -2117,9 +2059,6 @@ test_bus_kernel_benchmark_LDADD = \
 test_bus_memfd_SOURCES = \
 	src/libsystemd-bus/test-bus-memfd.c
 
-test_bus_memfd_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_memfd_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la
@@ -2127,9 +2066,6 @@ test_bus_memfd_LDADD = \
 test_bus_zero_copy_SOURCES = \
 	src/libsystemd-bus/test-bus-zero-copy.c
 
-test_bus_zero_copy_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_zero_copy_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la
@@ -2137,9 +2073,6 @@ test_bus_zero_copy_LDADD = \
 test_bus_introspect_SOURCES = \
 	src/libsystemd-bus/test-bus-introspect.c
 
-test_bus_introspect_CFLAGS = \
-	$(AM_CFLAGS)
-
 test_bus_introspect_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-bus.la
@@ -2198,9 +2131,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 += \
@@ -2372,7 +2303,6 @@ libudev_core_la_LIBADD = \
 	libudev-private.la \
 	libsystemd-label.la \
 	libsystemd-daemon-internal.la \
-	$(RT_LIBS) \
 	libsystemd-shared.la \
 	$(BLKID_LIBS) \
 	$(KMOD_LIBS)
@@ -2434,6 +2364,7 @@ udevadm_SOURCES = \
 
 udevadm_LDADD = \
 	libudev-core.la \
+	libsystemd-label.la \
 	libsystemd-shared.la
 
 # Update hwdb on installation. Do not bother if installing
@@ -2671,13 +2602,14 @@ src/gudev/GUdev-1.0.gir: libgudev-1.0.la
 src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
 
 src_gudev_GUdev_1_0_gir_CFLAGS = \
+	$(AM_CFLAGS) \
 	$(INCLUDES) \
 	-D_GUDEV_COMPILATION \
 	-D_GUDEV_WORK_AROUND_DEV_T_BUG \
 	-I$(top_srcdir)/src \
 	-I$(top_builddir)/src \
-	-I$(top_srcdir)/src/gdev \
-	-I$(top_builddir)/src/gdev
+	-I$(top_srcdir)/src/gudev \
+	-I$(top_builddir)/src/gudev
 
 src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
 
@@ -2760,10 +2692,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)
@@ -2834,12 +2763,13 @@ systemd_cat_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la
 
-journalctl_SOURCES = \
-	src/journal/journalctl.c
-
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
 	$(AM_CFLAGS)
 
+journalctl_SOURCES = \
+	src/journal/journalctl.c
+
 journalctl_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-journal-internal.la \
@@ -2959,6 +2889,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 \
@@ -3009,11 +2940,11 @@ libsystemd_journal_internal_la_SOURCES = \
 	src/journal/journald-rate-limit.h \
 	src/journal/journal-internal.h
 
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 libsystemd_journal_internal_la_CFLAGS = \
 	$(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD = \
-	libsystemd-label.la \
 	libsystemd-audit.la \
 	libsystemd-daemon.la \
 	libudev.la \
@@ -3123,7 +3054,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
@@ -3194,8 +3126,8 @@ systemd_journal_gatewayd_LDADD = \
 	$(MICROHTTPD_LIBS)
 
 systemd_journal_gatewayd_CFLAGS = \
-	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(AM_CFLAGS) \
+	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \
 	$(MICROHTTPD_CFLAGS)
 
 dist_systemunit_DATA += \
@@ -3212,6 +3144,19 @@ endif
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
 
+# ------------------------------------------------------------------------------
+
+systemd_socket_proxyd_SOURCES = \
+	src/socket-proxy/socket-proxyd.c
+
+systemd_socket_proxyd_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-logs.la \
+	libsystemd-journal-internal.la \
+	libsystemd-id128-internal.la \
+	libsystemd-daemon.la \
+	libsystemd-bus.la
+
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
@@ -3433,6 +3378,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 += \
@@ -3474,15 +3439,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
@@ -3499,14 +3460,6 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_files += \
 	src/hostname/org.freedesktop.hostname1.policy
 
-dbusinterface_DATA += \
-	org.freedesktop.hostname1.xml
-
-org.freedesktop.hostname1.xml: systemd-hostnamed
-	$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.hostname1 $< $@.tmp && \
-		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 SYSTEM_UNIT_ALIASES += \
 	systemd-hostnamed.service dbus-org.freedesktop.hostname1.service
 
@@ -3569,14 +3522,6 @@ dist_dbussystemservice_DATA += \
 polkitpolicy_files += \
 	src/locale/org.freedesktop.locale1.policy
 
-dbusinterface_DATA += \
-	org.freedesktop.locale1.xml
-
-org.freedesktop.locale1.xml: systemd-localed
-	$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.locale1 $< $@.tmp && \
-		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
 SYSTEM_UNIT_ALIASES += \
 	systemd-localed.service dbus-org.freedesktop.locale1.service
 
@@ -3623,15 +3568,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
@@ -3648,14 +3589,6 @@ nodist_systemunit_DATA += \
 polkitpolicy_files += \
 	src/timedate/org.freedesktop.timedate1.policy
 
-org.freedesktop.timedate1.xml: systemd-timedated
-	$(AM_V_GEN)$(LIBTOOL) --mode=execute $(OBJCOPY) -O binary -j introspect.timedate1 $< $@.tmp && \
-		$(STRINGS) $@.tmp | $(AWK) -f $(srcdir)/introspect.awk | \
-		$(DBUS_PREPROCESS) -o $@ - && rm $@.tmp
-
-dbusinterface_DATA += \
-	org.freedesktop.timedate1.xml
-
 INSTALL_DIRS += \
 	$(prefix)/lib/systemd/ntp-units.d \
 	$(sysconfdir)/systemd/ntp-units.d
@@ -3697,9 +3630,6 @@ libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/ifconf.h \
 	src/nss-myhostname/netlink.c
 
-libnss_myhostname_la_CFLAGS = \
-	$(AM_CFLAGS)
-
 libnss_myhostname_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-module \
@@ -3845,7 +3775,7 @@ libsystemd_logind_core_la_SOURCES = \
 
 libsystemd_logind_core_la_CFLAGS = \
 	$(AM_CFLAGS) \
-        $(DBUS_CFLAGS)
+	$(DBUS_CFLAGS)
 
 libsystemd_logind_core_la_LIBADD = \
 	libsystemd-label.la \
@@ -4423,11 +4353,6 @@ EXTRA_DIST += \
 	man/custom-man.xsl
 
 # ------------------------------------------------------------------------------
-DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
-
-CLEANFILES += \
-	$(dbusinterface_DATA)
-
 if HAVE_SYSV_COMPAT
 sysvinit_DATA = \
 	docs/sysvinit/README
@@ -4470,7 +4395,6 @@ SYSINIT_TARGET_WANTS += \
 	systemd-update-utmp.service
 LOCAL_FS_TARGET_WANTS += \
 	systemd-remount-fs.service \
-	systemd-fsck-root.service \
 	tmp.mount
 MULTI_USER_TARGET_WANTS += \
 	getty.target \
@@ -4562,7 +4486,6 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
 	--with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
 	--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
-	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
 	--with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \