X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=0004929cdc623ddc8c87954555648a02a79b88f0;hp=7ae6a1af434d078a7b469e5e8ba7a2de627b6147;hb=1daf8121524246932b18be8dd7d63e792dee5de2;hpb=b0130bf6083e419b4673f300ab243aa5869cff87 diff --git a/Makefile.am b/Makefile.am index 7ae6a1af4..0004929cd 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 @@ -319,7 +320,8 @@ rootlibexec_PROGRAMS = \ systemd-fsck \ systemd-ac-power \ systemd-sysctl \ - systemd-sleep + systemd-sleep \ + systemd-socket-proxyd systemgenerator_PROGRAMS = \ systemd-getty-generator \ @@ -804,9 +806,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 \ @@ -1251,36 +1250,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 +1286,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 +1477,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 +1490,7 @@ systemd_update_utmp_CFLAGS = \ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la \ + libsystemd-bus.la \ $(AUDIT_LIBS) # ------------------------------------------------------------------------------ @@ -1666,7 +1644,7 @@ systemd_fsck_CFLAGS = \ systemd_fsck_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la \ + libsystemd-bus.la \ libudev.la # ------------------------------------------------------------------------------ @@ -1799,7 +1777,7 @@ systemd_cgroups_agent_CFLAGS = \ systemd_cgroups_agent_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la + libsystemd-bus.la # ------------------------------------------------------------------------------ systemctl_SOURCES = \ @@ -1981,7 +1959,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 +2054,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 +2062,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 +2070,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 +2078,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 +2086,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 +2093,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 +2100,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 @@ -2832,9 +2792,6 @@ systemd_cat_LDADD = \ journalctl_SOURCES = \ src/journal/journalctl.c -journalctl_CFLAGS = \ - $(AM_CFLAGS) - journalctl_LDADD = \ libsystemd-shared.la \ libsystemd-journal-internal.la \ @@ -2851,7 +2808,7 @@ journalctl_SOURCES += \ src/journal/journal-qrcode.c \ src/journal/journal-qrcode.h -journalctl_CFLAGS += \ +journalctl_CFLAGS = \ $(QRENCODE_CFLAGS) journalctl_LDADD += \ @@ -2954,6 +2911,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 \ @@ -3037,7 +2995,7 @@ libsystemd_journal_la_CFLAGS += \ libsystemd_journal_la_LIBADD += \ $(XZ_LIBS) -libsystemd_journal_internal_la_CFLAGS += \ +libsystemd_journal_internal_la_CFLAGS = \ $(XZ_CFLAGS) libsystemd_journal_internal_la_LIBADD += \ @@ -3117,7 +3075,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 @@ -3206,6 +3165,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 = \ @@ -3488,15 +3460,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 @@ -3637,15 +3605,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 @@ -3711,9 +3675,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 \