X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=ce5ff6392d479fe8828bac72e8867c1b9b5ffd6f;hp=80577e77c33e203fe6e652aa9f115aefef6a9903;hb=faaa5728d956b7f0d24f27f3341d0b9fff30af00;hpb=cc3773810855956bad92337cee8fa193584ab62e diff --git a/Makefile.am b/Makefile.am index 80577e77c..ce5ff6392 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,6 +59,14 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=3 LIBSYSTEMD_JOURNAL_AGE=11 +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@ @@ -760,11 +768,7 @@ noinst_LTLIBRARIES += \ libsystemd_dbus_la_SOURCES = \ src/shared/dbus-common.c \ - src/shared/dbus-common.h \ - src/shared/dbus-loop.c \ - src/shared/dbus-loop.h \ - src/shared/polkit.c \ - src/shared/polkit.h + src/shared/dbus-common.h libsystemd_dbus_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1475,26 +1479,22 @@ endif systemd_analyze_SOURCES = \ src/analyze/analyze.c -systemd_analyze_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_analyze_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_initctl_SOURCES = \ src/initctl/initctl.c -systemd_initctl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_initctl_LDADD = \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_update_utmp_SOURCES = \ @@ -1502,12 +1502,13 @@ systemd_update_utmp_SOURCES = \ systemd_update_utmp_CFLAGS = \ $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ $(AUDIT_CFLAGS) systemd_update_utmp_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus.la \ $(AUDIT_LIBS) # ------------------------------------------------------------------------------ @@ -1655,13 +1656,11 @@ 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 \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-bus.la \ libudev.la # ------------------------------------------------------------------------------ @@ -1789,8 +1788,10 @@ systemd_cgroups_agent_SOURCES = \ src/cgroups-agent/cgroups-agent.c systemd_cgroups_agent_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ systemctl_SOURCES = \ @@ -1857,10 +1858,10 @@ systemd_nspawn_SOURCES = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ - libsystemd-shared.la \ - libsystemd-daemon.la \ + libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ - libsystemd-bus.la + libsystemd-shared.la \ + libsystemd-daemon.la # ------------------------------------------------------------------------------ systemd_run_SOURCES = \ @@ -1869,10 +1870,10 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ libsystemd-capability.la \ + libsystemd-bus-internal.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-id128-internal.la \ - libsystemd-bus.la + libsystemd-id128-internal.la # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ @@ -1938,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 \ @@ -1974,23 +1995,41 @@ 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) \ -pthread -noinst_LTLIBRARIES += \ +libsystemd_bus_la_LDFLAGS = \ + $(AM_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_event_la_SOURCES) + +libsystemd_bus_internal_la_CFLAGS = \ + $(libsystemd_bus_la_CFLAGS) + +noinst_LTLIBRARIES += \ + libsystemd-bus-internal.la + tests += \ test-bus-marshal \ test-bus-signature \ @@ -2013,8 +2052,10 @@ test_bus_marshal_SOURCES = \ src/libsystemd-bus/test-bus-marshal.c test_bus_marshal_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ libsystemd-shared.la \ - libsystemd-bus.la \ + libsystemd-daemon.la \ $(GLIB_LIBS) \ $(DBUS_LIBS) @@ -2028,7 +2069,7 @@ test_bus_signature_SOURCES = \ test_bus_signature_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la test_bus_chat_SOURCES = \ src/libsystemd-bus/test-bus-chat.c @@ -2038,9 +2079,10 @@ test_bus_chat_CFLAGS = \ -pthread test_bus_chat_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_server_SOURCES = \ src/libsystemd-bus/test-bus-server.c @@ -2050,9 +2092,10 @@ test_bus_server_CFLAGS = \ -pthread test_bus_server_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_objects_SOURCES = \ src/libsystemd-bus/test-bus-objects.c @@ -2062,77 +2105,87 @@ test_bus_objects_CFLAGS = \ -pthread test_bus_objects_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_match_SOURCES = \ src/libsystemd-bus/test-bus-match.c test_bus_match_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_kernel_SOURCES = \ src/libsystemd-bus/test-bus-kernel.c test_bus_kernel_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_kernel_bloom_SOURCES = \ src/libsystemd-bus/test-bus-kernel-bloom.c test_bus_kernel_bloom_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_kernel_benchmark_SOURCES = \ src/libsystemd-bus/test-bus-kernel-benchmark.c test_bus_kernel_benchmark_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_memfd_SOURCES = \ src/libsystemd-bus/test-bus-memfd.c test_bus_memfd_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la test_bus_zero_copy_SOURCES = \ src/libsystemd-bus/test-bus-zero-copy.c test_bus_zero_copy_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la test_bus_introspect_SOURCES = \ src/libsystemd-bus/test-bus-introspect.c test_bus_introspect_LDADD = \ libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la test_event_SOURCES = \ src/libsystemd-bus/test-event.c test_event_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la busctl_SOURCES = \ src/libsystemd-bus/busctl.c busctl_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2801,6 +2854,7 @@ systemd_activate_SOURCES = \ src/activate/activate.c systemd_activate_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la @@ -3208,12 +3262,12 @@ systemd_socket_proxyd_SOURCES = \ src/socket-proxy/socket-proxyd.c systemd_socket_proxyd_LDADD = \ - libsystemd-shared.la \ libsystemd-logs.la \ + libsystemd-event.la \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-shared.la \ + libsystemd-daemon.la # ------------------------------------------------------------------------------ if ENABLE_COREDUMP @@ -3499,9 +3553,10 @@ systemd_hostnamed_SOURCES = \ systemd_hostnamed_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la rootlibexec_PROGRAMS += \ systemd-hostnamed @@ -3524,13 +3579,11 @@ SYSTEM_UNIT_ALIASES += \ hostnamectl_SOURCES = \ src/hostname/hostnamectl.c -hostnamectl_CFLAGS = \ - $(AM_CFLAGS) - hostnamectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la bin_PROGRAMS += \ hostnamectl @@ -3556,9 +3609,10 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ - libsystemd-shared.la \ - libsystemd-daemon.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la nodist_systemunit_DATA += \ units/systemd-localed.service @@ -3591,9 +3645,10 @@ localectl_SOURCES = \ src/locale/localectl.c localectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la \ - libsystemd-id128-internal.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la bin_PROGRAMS += \ localectl @@ -3619,8 +3674,10 @@ systemd_timedated_SOURCES = \ systemd_timedated_LDADD = \ libsystemd-label.la \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ - libsystemd-daemon.la \ libsystemd-bus.la rootlibexec_PROGRAMS += \ @@ -3648,13 +3705,11 @@ SYSTEM_UNIT_ALIASES += \ timedatectl_SOURCES = \ src/timedate/timedatectl.c -timedatectl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - timedatectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la bin_PROGRAMS += \ timedatectl @@ -3715,7 +3770,7 @@ libsystemd_machine_core_la_LIBADD = \ libsystemd-audit.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-bus.la \ + libsystemd-bus-internal.la \ libsystemd-id128-internal.la \ libudev.la @@ -3725,13 +3780,11 @@ noinst_LTLIBRARIES += \ machinectl_SOURCES = \ src/machine/machinectl.c -machinectl_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - machinectl_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la rootbin_PROGRAMS += \ machinectl @@ -3777,9 +3830,6 @@ systemd_logind_SOURCES = \ nodist_systemd_logind_SOURCES = \ src/login/logind-gperf.c -systemd_logind_CFLAGS = \ - $(libsystemd_logind_core_la_CFLAGS) - systemd_logind_LDADD = \ libsystemd-logind-core.la \ $(libsystemd_logind_core_la_LIBADD) @@ -3810,16 +3860,13 @@ libsystemd_logind_core_la_SOURCES = \ src/login/login-shared.c \ src/login/login-shared.h -libsystemd_logind_core_la_CFLAGS = \ - $(AM_CFLAGS) - libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-audit.la \ libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-id128-internal.la \ - libsystemd-bus.la \ + libsystemd-bus-internal.la \ libudev.la if HAVE_ACL @@ -3869,13 +3916,11 @@ dist_zshcompletion_DATA += \ systemd_inhibit_SOURCES = \ src/login/inhibit.c -systemd_inhibit_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_inhibit_LDADD = \ - libsystemd-shared.la \ - libsystemd-bus.la + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la rootbin_PROGRAMS += \ systemd-inhibit @@ -3899,19 +3944,11 @@ test_inhibit_SOURCES = \ test_inhibit_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la - -test_inhibit_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) + libsystemd-bus.la 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 @@ -3953,7 +3990,6 @@ pam_systemd_la_SOURCES = \ pam_systemd_la_CFLAGS = \ $(AM_CFLAGS) \ $(PAM_CFLAGS) \ - $(DBUS_CFLAGS) \ -fvisibility=hidden pam_systemd_la_LDFLAGS = \ @@ -3966,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)