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@
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 = \
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/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/libsystemd/sd-rtnl.c \
src/libsystemd/rtnl-internal.h \
src/libsystemd/rtnl-message.c \
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 += \
test-bus-creds \
test-bus-gvariant \
test-event \
- test-dhcp-option \
- test-dhcp-client \
test-rtnl \
test-resolve
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
$(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-daemon-internal.la \
libsystemd-internal.la \
+ libsystemd-dhcp.la \
libsystemd-id128-internal.la \
libsystemd-label.la \
libsystemd-shared.la
test_network_LDADD = \
libudev-internal.la \
libsystemd-internal.la \
+ libsystemd-dhcp.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-label.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