X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e6f411cfecb9b28336afa0a258aee7967a53c55f;hp=9fdc35a38a59b8122027396f667c9a89b2c0faa4;hb=021b89861d0b1defcbd6ba71d1aaf6271785a942;hpb=6bb648a16ae4a682ad4784412af706d2e6a3e4da diff --git a/Makefile.am b/Makefile.am index 9fdc35a38..e6f411cfe 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,9 +59,9 @@ 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_CURRENT=0 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=0 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -190,7 +190,6 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/udev/net \ -I $(top_builddir)/src/udev \ -I $(top_srcdir)/src/libsystemd \ - -I $(top_srcdir)/src/libsystemd-rtnl \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -640,60 +639,6 @@ EXTRA_DIST += \ make-directive-index.py \ xml_helper.py -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-rtnl.la - -libsystemd_rtnl_la_SOURCES = \ - src/systemd/sd-rtnl.h \ - src/libsystemd-rtnl/sd-rtnl.c \ - src/libsystemd-rtnl/rtnl-internal.h \ - src/libsystemd-rtnl/rtnl-message.c \ - src/libsystemd-rtnl/rtnl-util.h \ - src/libsystemd-rtnl/rtnl-util.c - -test_rtnl_SOURCES = \ - src/libsystemd-rtnl/test-rtnl.c - -test_rtnl_LDADD = \ - libsystemd-rtnl.la \ - libsystemd-internal.la \ - libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ - libsystemd-shared.la - -tests += \ - test-rtnl - -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-dns.la - -libsystemd_dns_la_SOURCES = \ - src/systemd/sd-dns.h \ - src/libsystemd/sd-dns.c \ - src/libsystemd/dns-util.h - -libsystemd_dns_la_LIBADD = \ - libsystemd-shared.la - -libsystemd_dns_la_CFLAGS = \ - -pthread - -test_dns_SOURCES = \ - src/libsystemd/test-dns.c \ - src/systemd/sd-dns.h - -test_dns_LDADD = \ - libsystemd-dns.la - -test_dns_LDFLAGS = \ - -lresolv \ - -pthread - -tests += \ - test-dns - # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-shared.la @@ -1056,7 +1001,6 @@ libsystemd_core_la_LIBADD = \ libsystemd-daemon-internal.la \ libudev-internal.la \ libsystemd-shared.la \ - libsystemd-rtnl.la \ libsystemd-internal.la \ $(LIBWRAP_LIBS) \ $(PAM_LIBS) \ @@ -1800,6 +1744,7 @@ systemd_gpt_auto_generator_CFLAGS = \ endif # ------------------------------------------------------------------------------ +if ENABLE_KDBUS systemgenerator_PROGRAMS += \ systemd-dbus1-generator @@ -1819,6 +1764,7 @@ dbus1-generator-uninstall-hook: INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook +endif # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ @@ -1921,8 +1867,7 @@ systemd_nspawn_LDADD = \ libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-shared.la \ - libsystemd-rtnl.la + libsystemd-shared.la # ------------------------------------------------------------------------------ systemd_run_SOURCES = \ @@ -2037,6 +1982,9 @@ libsystemd_la_SOURCES = \ src/systemd/sd-memfd.h \ src/systemd/sd-utf8.h \ src/systemd/sd-event.h \ + src/systemd/sd-dhcp-client.h \ + src/systemd/sd-rtnl.h \ + src/systemd/sd-resolve.h \ src/libsystemd/sd-bus.c \ src/libsystemd/bus-control.c \ src/libsystemd/bus-control.h \ @@ -2076,7 +2024,19 @@ libsystemd_la_SOURCES = \ src/libsystemd/sd-utf8.c \ src/libsystemd/sd-event.c \ src/libsystemd/event-util.h \ - src/libsystemd/bus-protocol.h + src/libsystemd/bus-protocol.h \ + src/libsystemd/sd-dhcp-client.c \ + src/libsystemd/dhcp-network.c \ + src/libsystemd/dhcp-option.c \ + src/libsystemd/dhcp-internal.h \ + src/libsystemd/dhcp-protocol.h \ + src/libsystemd/sd-rtnl.c \ + src/libsystemd/rtnl-internal.h \ + src/libsystemd/rtnl-message.c \ + src/libsystemd/rtnl-util.h \ + src/libsystemd/rtnl-util.c \ + src/libsystemd/sd-resolve.c \ + src/libsystemd/resolve-util.h nodist_libsystemd_la_SOURCES = \ src/libsystemd/bus-error-mapping.c @@ -2088,11 +2048,12 @@ libsystemd_la_LIBADD = \ libsystemd_la_CFLAGS = \ $(AM_CFLAGS) \ - -pthread + -pthread \ + -lresolv libsystemd_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \ + -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \ -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym pkgconfiglib_DATA += \ @@ -2137,6 +2098,7 @@ tests += \ test-bus-marshal \ test-bus-signature \ test-bus-chat \ + test-bus-cleanup \ test-bus-server \ test-bus-match \ test-bus-kernel \ @@ -2149,7 +2111,11 @@ tests += \ test-bus-error \ test-bus-creds \ test-bus-gvariant \ - test-event + test-event \ + test-dhcp-option \ + test-dhcp-client \ + test-rtnl \ + test-resolve bin_PROGRAMS += \ busctl @@ -2194,6 +2160,15 @@ test_bus_chat_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-shared.la +test_bus_cleanup_SOURCES = \ + src/libsystemd/test-bus-cleanup.c + +test_bus_cleanup_LDADD = \ + libsystemd-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la + test_bus_server_SOURCES = \ src/libsystemd/test-bus-server.c @@ -2344,6 +2319,48 @@ test_event_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-shared.la +test_dhcp_option_SOURCES = \ + src/libsystemd/dhcp-protocol.h \ + src/libsystemd/dhcp-internal.h \ + src/libsystemd/test-dhcp-option.c + +test_dhcp_option_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_dhcp_client_SOURCES = \ + src/systemd/sd-dhcp-client.h \ + src/libsystemd/dhcp-protocol.h \ + src/libsystemd/dhcp-internal.h \ + src/libsystemd/test-dhcp-client.c + +test_dhcp_client_LDADD = \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-shared.la + +test_rtnl_SOURCES = \ + src/libsystemd/test-rtnl.c + +test_rtnl_LDADD = \ + libsystemd-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-shared.la + +test_resolve_SOURCES = \ + src/systemd/sd-resolve.h \ + src/libsystemd/test-resolve.c + +test_resolve_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_resolve_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + busctl_SOURCES = \ src/libsystemd/busctl.c @@ -2584,7 +2601,7 @@ libudev_core_la_LIBADD = \ libudev-internal.la \ libsystemd-label.la \ libsystemd-daemon-internal.la \ - libsystemd-rtnl.la \ + libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ @@ -3963,48 +3980,6 @@ lib_LTLIBRARIES += \ libnss_myhostname.la endif -# ------------------------------------------------------------------------------ -libsystemd_dhcp_la_SOURCES = \ - src/systemd/sd-dhcp-client.h \ - src/libsystemd-dhcp/dhcp-protocol.h \ - src/libsystemd-dhcp/dhcp-internal.h \ - src/libsystemd-dhcp/dhcp-network.c \ - src/libsystemd-dhcp/dhcp-option.c \ - src/libsystemd-dhcp/dhcp-client.c - -noinst_LTLIBRARIES += \ - libsystemd-dhcp.la - -libsystemd_dhcp_la_LIBADD = \ - libsystemd-internal.la \ - libsystemd-shared.la - -test_dhcp_option_SOURCES = \ - src/libsystemd-dhcp/dhcp-protocol.h \ - src/libsystemd-dhcp/dhcp-internal.h \ - src/libsystemd-dhcp/test-dhcp-option.c - -test_dhcp_option_LDADD = \ - libsystemd-dhcp.la \ - libsystemd-shared.la - -test_dhcp_client_SOURCES = \ - src/libsystemd-dhcp/dhcp-protocol.h \ - src/systemd/sd-dhcp-client.h \ - src/libsystemd-dhcp/dhcp-internal.h \ - src/libsystemd-dhcp/test-dhcp-client.c - -test_dhcp_client_LDADD = \ - libsystemd-internal.la \ - libsystemd-daemon-internal.la \ - libsystemd-id128-internal.la \ - libsystemd-dhcp.la \ - libsystemd-shared.la - -tests += \ - test-dhcp-option \ - test-dhcp-client - # ------------------------------------------------------------------------------ if ENABLE_MACHINED systemd_machined_SOURCES = \ @@ -4105,8 +4080,6 @@ systemd_networkd_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-internal.la \ libsystemd-id128-internal.la \ - libsystemd-rtnl.la \ - libsystemd-dhcp.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4132,8 +4105,6 @@ test_network_LDADD = \ libsystemd-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ - libsystemd-rtnl.la \ - libsystemd-dhcp.la \ libsystemd-label.la \ libsystemd-shared.la @@ -4957,7 +4928,7 @@ valgrind-tests: $(TESTS) if file $$f | grep -q shell; then \ echo -e "$${x}Skipping non-binary $$f"; else \ echo -e "$${x}Running $$f"; \ - libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \ + libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \ x="\n\n"; \ done