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@
-I $(top_srcdir)/src/udev \
-I $(top_srcdir)/src/udev/net \
-I $(top_builddir)/src/udev \
- -I $(top_srcdir)/src/libsystemd \
- -I $(top_srcdir)/src/libsystemd-rtnl \
+ -I $(top_srcdir)/src/libsystemd/sd-bus \
+ -I $(top_srcdir)/src/libsystemd/sd-event \
+ -I $(top_srcdir)/src/libsystemd/sd-rtnl \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
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
libsystemd-daemon-internal.la \
libudev-internal.la \
libsystemd-shared.la \
- libsystemd-rtnl.la \
libsystemd-internal.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
endif
# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
systemgenerator_PROGRAMS += \
systemd-dbus1-generator
INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+endif
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-shared.la \
- libsystemd-rtnl.la
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
src/systemd/sd-memfd.h \
src/systemd/sd-utf8.h \
src/systemd/sd-event.h \
- src/systemd/sd-dhcp-client.h \
- src/libsystemd/sd-bus.c \
- src/libsystemd/bus-control.c \
- src/libsystemd/bus-control.h \
- src/libsystemd/bus-error.c \
- src/libsystemd/bus-error.h \
- src/libsystemd/bus-internal.c \
- src/libsystemd/bus-internal.h \
- src/libsystemd/bus-socket.c \
- src/libsystemd/bus-socket.h \
- src/libsystemd/bus-kernel.c \
- src/libsystemd/bus-kernel.h \
- src/libsystemd/bus-container.c \
- src/libsystemd/bus-container.h \
- src/libsystemd/bus-message.c \
- src/libsystemd/bus-message.h \
- src/libsystemd/bus-creds.c \
- src/libsystemd/bus-creds.h \
- src/libsystemd/bus-signature.c \
- src/libsystemd/bus-signature.h \
- src/libsystemd/bus-type.c \
- src/libsystemd/bus-type.h \
- src/libsystemd/bus-match.c \
- src/libsystemd/bus-match.h \
- src/libsystemd/bus-bloom.c \
- src/libsystemd/bus-bloom.h \
- src/libsystemd/bus-introspect.c \
- src/libsystemd/bus-introspect.h \
- src/libsystemd/bus-objects.c \
- src/libsystemd/bus-objects.h \
- src/libsystemd/bus-gvariant.c \
- src/libsystemd/bus-gvariant.h \
- src/libsystemd/bus-convenience.c \
- src/libsystemd/kdbus.h \
- src/libsystemd/sd-memfd.c \
- src/libsystemd/bus-util.c \
- src/libsystemd/bus-util.h \
- src/libsystemd/sd-utf8.c \
- src/libsystemd/sd-event.c \
- src/libsystemd/event-util.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/systemd/sd-rtnl.h \
+ src/systemd/sd-resolve.h \
+ src/libsystemd/sd-bus/sd-bus.c \
+ src/libsystemd/sd-bus/bus-control.c \
+ src/libsystemd/sd-bus/bus-control.h \
+ src/libsystemd/sd-bus/bus-error.c \
+ src/libsystemd/sd-bus/bus-error.h \
+ src/libsystemd/sd-bus/bus-internal.c \
+ src/libsystemd/sd-bus/bus-internal.h \
+ src/libsystemd/sd-bus/bus-socket.c \
+ src/libsystemd/sd-bus/bus-socket.h \
+ src/libsystemd/sd-bus/bus-kernel.c \
+ src/libsystemd/sd-bus/bus-kernel.h \
+ src/libsystemd/sd-bus/bus-container.c \
+ src/libsystemd/sd-bus/bus-container.h \
+ src/libsystemd/sd-bus/bus-message.c \
+ src/libsystemd/sd-bus/bus-message.h \
+ src/libsystemd/sd-bus/bus-creds.c \
+ src/libsystemd/sd-bus/bus-creds.h \
+ src/libsystemd/sd-bus/bus-signature.c \
+ src/libsystemd/sd-bus/bus-signature.h \
+ src/libsystemd/sd-bus/bus-type.c \
+ src/libsystemd/sd-bus/bus-type.h \
+ src/libsystemd/sd-bus/bus-match.c \
+ src/libsystemd/sd-bus/bus-match.h \
+ src/libsystemd/sd-bus/bus-bloom.c \
+ src/libsystemd/sd-bus/bus-bloom.h \
+ src/libsystemd/sd-bus/bus-introspect.c \
+ src/libsystemd/sd-bus/bus-introspect.h \
+ src/libsystemd/sd-bus/bus-objects.c \
+ src/libsystemd/sd-bus/bus-objects.h \
+ src/libsystemd/sd-bus/bus-gvariant.c \
+ src/libsystemd/sd-bus/bus-gvariant.h \
+ src/libsystemd/sd-bus/bus-convenience.c \
+ src/libsystemd/sd-bus/bus-util.c \
+ src/libsystemd/sd-bus/bus-util.h \
+ src/libsystemd/sd-bus/bus-protocol.h \
+ src/libsystemd/sd-bus/kdbus.h \
+ src/libsystemd/sd-bus/sd-memfd.c \
+ src/libsystemd/sd-utf8/sd-utf8.c \
+ src/libsystemd/sd-event/sd-event.c \
+ src/libsystemd/sd-event/event-util.h \
+ src/libsystemd/sd-rtnl/sd-rtnl.c \
+ src/libsystemd/sd-rtnl/rtnl-internal.h \
+ src/libsystemd/sd-rtnl/rtnl-message.c \
+ src/libsystemd/sd-rtnl/rtnl-util.h \
+ src/libsystemd/sd-rtnl/rtnl-util.c \
+ src/libsystemd/sd-resolve/sd-resolve.c \
+ src/libsystemd/sd-resolve/resolve-util.h
nodist_libsystemd_la_SOURCES = \
- src/libsystemd/bus-error-mapping.c
+ src/libsystemd/sd-bus/bus-error-mapping.c
libsystemd_la_LIBADD = \
libsystemd-id128-internal.la \
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 += \
src/libsystemd/libsystemd.pc
EXTRA_DIST += \
- src/libsystemd/bus-error-mapping.gperf \
- src/libsystemd/libsystemd.pc.in \
- src/libsystemd/DIFFERENCES \
- src/libsystemd/GVARIANT-SERIALIZATION
+ src/libsystemd/sd-bus/bus-error-mapping.gperf \
+ src/libsystemd/sd-bus/DIFFERENCES \
+ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
+ src/libsystemd/libsystemd.pc.in
CLEANFILES += \
- src/libsystemd/bus-error-mapping.c
+ src/libsystemd/sd-bus/bus-error-mapping.c
lib_LTLIBRARIES += \
libsystemd.la
libsystemd-internal.la
libsystemd_dump_la_SOURCES = \
- src/libsystemd/bus-dump.c \
- src/libsystemd/bus-dump.h
+ src/libsystemd/sd-bus/bus-dump.c \
+ src/libsystemd/sd-bus/bus-dump.h
libsystemd_dump_la_CFLAGS = \
$(AM_CFLAGS) \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
+ test-bus-cleanup \
test-bus-server \
test-bus-match \
test-bus-kernel \
test-bus-creds \
test-bus-gvariant \
test-event \
- test-dhcp-option \
- test-dhcp-client
+ test-rtnl \
+ test-resolve
bin_PROGRAMS += \
busctl
test_bus_marshal_SOURCES = \
- src/libsystemd/test-bus-marshal.c
+ src/libsystemd/sd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
libsystemd-internal.la \
$(CAP_CFLAGS)
test_bus_signature_SOURCES = \
- src/libsystemd/test-bus-signature.c
+ src/libsystemd/sd-bus/test-bus-signature.c
test_bus_signature_LDADD = \
libsystemd-shared.la \
libsystemd-internal.la
test_bus_chat_SOURCES = \
- src/libsystemd/test-bus-chat.c
+ src/libsystemd/sd-bus/test-bus-chat.c
test_bus_chat_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-daemon-internal.la \
libsystemd-shared.la
+test_bus_cleanup_SOURCES = \
+ src/libsystemd/sd-bus/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
+ src/libsystemd/sd-bus/test-bus-server.c
test_bus_server_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-shared.la
test_bus_objects_SOURCES = \
- src/libsystemd/test-bus-objects.c
+ src/libsystemd/sd-bus/test-bus-objects.c
test_bus_objects_CFLAGS = \
$(AM_CFLAGS) \
$(CAP_LIBS)
test_bus_error_SOURCES = \
- src/libsystemd/test-bus-error.c
+ src/libsystemd/sd-bus/test-bus-error.c
test_bus_error_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
test_bus_gvariant_SOURCES = \
- src/libsystemd/test-bus-gvariant.c
+ src/libsystemd/sd-bus/test-bus-gvariant.c
test_bus_gvariant_LDADD = \
libsystemd-internal.la \
$(CAP_CFLAGS)
test_bus_creds_SOURCES = \
- src/libsystemd/test-bus-creds.c
+ src/libsystemd/sd-bus/test-bus-creds.c
test_bus_creds_LDADD = \
libsystemd-internal.la \
libsystemd-capability.la
test_bus_match_SOURCES = \
- src/libsystemd/test-bus-match.c
+ src/libsystemd/sd-bus/test-bus-match.c
test_bus_match_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
test_bus_kernel_SOURCES = \
- src/libsystemd/test-bus-kernel.c
+ src/libsystemd/sd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
libsystemd-internal.la \
$(CAP_CFLAGS)
test_bus_kernel_bloom_SOURCES = \
- src/libsystemd/test-bus-kernel-bloom.c
+ src/libsystemd/sd-bus/test-bus-kernel-bloom.c
test_bus_kernel_bloom_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
test_bus_kernel_benchmark_SOURCES = \
- src/libsystemd/test-bus-kernel-benchmark.c
+ src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
test_bus_kernel_benchmark_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
test_bus_memfd_SOURCES = \
- src/libsystemd/test-bus-memfd.c
+ src/libsystemd/sd-bus/test-bus-memfd.c
test_bus_memfd_LDADD = \
libsystemd-internal.la \
libsystemd-shared.la
test_bus_zero_copy_SOURCES = \
- src/libsystemd/test-bus-zero-copy.c
+ src/libsystemd/sd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
libsystemd-internal.la \
$(CAP_CFLAGS)
test_bus_introspect_SOURCES = \
- src/libsystemd/test-bus-introspect.c
+ src/libsystemd/sd-bus/test-bus-introspect.c
test_bus_introspect_LDADD = \
libsystemd-shared.la \
libsystemd-internal.la
test_event_SOURCES = \
- src/libsystemd/test-event.c
+ src/libsystemd/sd-event/test-event.c
test_event_LDADD = \
libsystemd-internal.la \
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_rtnl_SOURCES = \
+ src/libsystemd/sd-rtnl/test-rtnl.c
-test_dhcp_option_LDADD = \
+test_rtnl_LDADD = \
libsystemd-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-id128-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_resolve_SOURCES = \
+ src/systemd/sd-resolve.h \
+ src/libsystemd/sd-resolve/test-resolve.c
-test_dhcp_client_LDADD = \
+test_resolve_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
libsystemd-shared.la
+test_resolve_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
busctl_SOURCES = \
- src/libsystemd/busctl.c
+ src/libsystemd/sd-bus/busctl.c
busctl_LDADD = \
libsystemd-internal.la \
$(AM_CFLAGS) \
$(CAP_CFLAGS)
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-dhcp.la
+
+libsystemd_dhcp_la_SOURCES = \
+ src/systemd/sd-dhcp-client.h \
+ src/libsystemd-dhcp/sd-dhcp-client.c \
+ src/libsystemd-dhcp/dhcp-network.c \
+ src/libsystemd-dhcp/dhcp-option.c \
+ src/libsystemd-dhcp/dhcp-internal.h \
+ src/libsystemd-dhcp/dhcp-protocol.h
+
+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-internal.la \
+ libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+ src/systemd/sd-dhcp-client.h \
+ src/libsystemd-dhcp/dhcp-protocol.h \
+ src/libsystemd-dhcp/dhcp-internal.h \
+ src/libsystemd-dhcp/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+ libsystemd-dhcp.la \
+ libsystemd-internal.la \
+ libsystemd-daemon-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
+
+tests += \
+ test-dhcp-option \
+ test-dhcp-client
+
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
SUBDIRS += \
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) \
src/network/networkd.h \
src/network/networkd.c \
src/network/networkd-link.c \
- src/network/networkd-bridge.c \
+ src/network/networkd-netdev.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
libudev-internal.la \
libsystemd-daemon-internal.la \
libsystemd-internal.la \
+ libsystemd-dhcp.la \
libsystemd-id128-internal.la \
- libsystemd-rtnl.la \
libsystemd-label.la \
libsystemd-shared.la
src/network/test-network.c \
src/network/networkd.h \
src/network/networkd-link.c \
- src/network/networkd-bridge.c \
+ src/network/networkd-netdev.c \
src/network/networkd-network.c \
src/network/networkd-address.c \
src/network/networkd-route.c \
test_network_LDADD = \
libudev-internal.la \
libsystemd-internal.la \
+ libsystemd-dhcp.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-rtnl.la \
libsystemd-label.la \
libsystemd-shared.la
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