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-bus \
- -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)
SOCKETS_TARGET_WANTS =
BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
+USER_SOCKETS_TARGET_WANTS =
+USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
GENERAL_ALIASES =
install-target-wants-hook:
- what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && $(add-wants)
- what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && $(add-wants)
- what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && $(add-wants)
- what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && $(add-wants)
- what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && $(add-wants)
- what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && $(add-wants)
- what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
- what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
- what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
- what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
- what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && $(add-wants)
- what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
- what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
+ what="$(RUNLEVEL1_TARGET_WANTS)" && wants=runlevel1.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL2_TARGET_WANTS)" && wants=runlevel2.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL3_TARGET_WANTS)" && wants=runlevel3.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL4_TARGET_WANTS)" && wants=runlevel4.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(RUNLEVEL5_TARGET_WANTS)" && wants=runlevel5.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SHUTDOWN_TARGET_WANTS)" && wants=shutdown.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants)
+ what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants)
+ what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
- dir=$(DESTDIR)$(systemunitdir)/$$wants.wants && \
+ dir=$(DESTDIR)$$dir/$$wants.wants && \
$(MKDIR_P) -m 0755 $$dir && \
cd $$dir && \
rm -f $$what && \
units/systemd-nspawn@.service
dist_userunit_DATA = \
+ units/user/basic.target \
units/user/default.target \
units/user/exit.target
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
- units/user@.service.m4.in \
+ units/user@.service.in \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
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-bus-internal.la \
- libsystemd-daemon-internal.la \
- libsystemd-id128-internal.la \
- libsystemd-shared.la
-
-tests += \
- test-rtnl
-
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-shared.la
src/shared/syscall-list.c \
src/shared/syscall-list.h \
src/shared/audit.c \
- src/shared/audit.h
+ src/shared/audit.h \
+ src/shared/xml.c \
+ src/shared/xml.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
libsystemd-daemon-internal.la \
libudev-internal.la \
libsystemd-shared.la \
- libsystemd-rtnl.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
$(LIBWRAP_LIBS) \
$(PAM_LIBS) \
$(AUDIT_LIBS) \
test-hashmap \
test-list \
test-tables \
- test-device-nodes
+ test-device-nodes \
+ test-xml
EXTRA_DIST += \
test/sched_idle_bad.service \
test_hashmap_LDADD = \
libsystemd-core.la
+test_xml_SOURCES = \
+ src/test/test-xml.c
+
+test_xml_LDADD = \
+ libsystemd-shared.la
+
test_list_SOURCES = \
src/test/test-list.c
src/analyze/analyze.c
systemd_analyze_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
src/initctl/initctl.c
systemd_initctl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
src/fsck/fsck.c
systemd_fsck_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libudev-internal.la \
endif
# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
systemgenerator_PROGRAMS += \
systemd-dbus1-generator
systemd_dbus1_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-bus-internal.la
+ libsystemd-internal.la
+
+dbus1-generator-install-hook:
+ $(AM_V_LN)$(LN_S) -f $(systemgeneratordir)/systemd-dbus1-generator $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+dbus1-generator-uninstall-hook:
+ rm -f $(DESTDIR)$(usergeneratordir)/systemd-dbus1-generator
+
+INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
+UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+endif
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
src/cgroups-agent/cgroups-agent.c
systemd_cgroups_agent_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
systemctl_LDADD = \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-logs.la
if ENABLE_LOGIND
systemd_nspawn_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-shared.la \
- libsystemd-rtnl.la
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
systemd_run_LDADD = \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la
src/bus-proxyd/bus-proxyd.c
systemd_bus_proxyd_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la
bus-proxyd-install-hook:
- $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+ $(AM_V_LN)$(LN_S) -f ../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
bus-proxyd-uninstall-hook:
rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
units/systemd-bus-proxyd.socket
dist_userunit_DATA += \
- units/user/systemd-bus-proxyd.socket
-
-USER_UNIT_ALIASES += \
- $(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+ units/user/systemd-bus-proxyd.socket \
+ units/user/systemd-bus-proxyd@.service
endif
EXTRA_DIST += \
src/libsystemd-daemon/libsystemd-daemon.pc.in
# ------------------------------------------------------------------------------
-libsystemd_bus_la_SOURCES = \
- src/libsystemd-bus/libsystemd-bus.sym \
+libsystemd_la_SOURCES = \
+ src/libsystemd/libsystemd.sym \
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-utf8.h \
src/systemd/sd-event.h \
- src/libsystemd-bus/sd-bus.c \
- src/libsystemd-bus/bus-control.c \
- src/libsystemd-bus/bus-control.h \
- src/libsystemd-bus/bus-error.c \
- src/libsystemd-bus/bus-error.h \
- src/libsystemd-bus/bus-internal.c \
- src/libsystemd-bus/bus-internal.h \
- src/libsystemd-bus/bus-socket.c \
- src/libsystemd-bus/bus-socket.h \
- src/libsystemd-bus/bus-kernel.c \
- src/libsystemd-bus/bus-kernel.h \
- src/libsystemd-bus/bus-container.c \
- src/libsystemd-bus/bus-container.h \
- src/libsystemd-bus/bus-message.c \
- src/libsystemd-bus/bus-message.h \
- src/libsystemd-bus/bus-creds.c \
- src/libsystemd-bus/bus-creds.h \
- src/libsystemd-bus/bus-signature.c \
- src/libsystemd-bus/bus-signature.h \
- src/libsystemd-bus/bus-type.c \
- src/libsystemd-bus/bus-type.h \
- src/libsystemd-bus/bus-match.c \
- src/libsystemd-bus/bus-match.h \
- src/libsystemd-bus/bus-bloom.c \
- src/libsystemd-bus/bus-bloom.h \
- src/libsystemd-bus/bus-introspect.c \
- src/libsystemd-bus/bus-introspect.h \
- src/libsystemd-bus/bus-objects.c \
- src/libsystemd-bus/bus-objects.h \
- src/libsystemd-bus/bus-gvariant.c \
- src/libsystemd-bus/bus-gvariant.h \
- src/libsystemd-bus/bus-convenience.c \
- src/libsystemd-bus/kdbus.h \
- src/libsystemd-bus/sd-memfd.c \
- src/libsystemd-bus/bus-util.c \
- src/libsystemd-bus/bus-util.h \
- src/libsystemd-bus/sd-utf8.c \
- src/libsystemd-bus/sd-event.c \
- src/libsystemd-bus/event-util.h \
- src/libsystemd-bus/bus-protocol.h
-
-nodist_libsystemd_bus_la_SOURCES = \
- src/libsystemd-bus/bus-error-mapping.c
-
-libsystemd_bus_la_LIBADD = \
+ 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/sd-bus/bus-error-mapping.c
+
+libsystemd_la_LIBADD = \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
-libsystemd_bus_la_CFLAGS = \
+libsystemd_la_CFLAGS = \
$(AM_CFLAGS) \
- -pthread
+ -pthread \
+ -lresolv
-libsystemd_bus_la_LDFLAGS = \
+libsystemd_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
+ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
pkgconfiglib_DATA += \
- src/libsystemd-bus/libsystemd-bus.pc
+ src/libsystemd/libsystemd.pc
EXTRA_DIST += \
- src/libsystemd-bus/bus-error-mapping.gperf \
- src/libsystemd-bus/libsystemd-bus.pc.in \
- src/libsystemd-bus/DIFFERENCES \
- src/libsystemd-bus/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/bus-error-mapping.c
+ src/libsystemd/sd-bus/bus-error-mapping.c
lib_LTLIBRARIES += \
- libsystemd-bus.la
+ libsystemd.la
-libsystemd_bus_internal_la_SOURCES = \
- $(libsystemd_bus_la_SOURCES)
+libsystemd_internal_la_SOURCES = \
+ $(libsystemd_la_SOURCES)
-nodist_libsystemd_bus_internal_la_SOURCES = \
- $(nodist_libsystemd_bus_la_SOURCES)
+nodist_libsystemd_internal_la_SOURCES = \
+ $(nodist_libsystemd_la_SOURCES)
-libsystemd_bus_internal_la_CFLAGS = \
- $(libsystemd_bus_la_CFLAGS)
+libsystemd_internal_la_CFLAGS = \
+ $(libsystemd_la_CFLAGS)
noinst_LTLIBRARIES += \
- libsystemd-bus-internal.la
+ libsystemd-internal.la
-libsystemd_bus_dump_la_SOURCES = \
- src/libsystemd-bus/bus-dump.c \
- src/libsystemd-bus/bus-dump.h
+libsystemd_dump_la_SOURCES = \
+ src/libsystemd/sd-bus/bus-dump.c \
+ src/libsystemd/sd-bus/bus-dump.h
-libsystemd_bus_dump_la_CFLAGS = \
+libsystemd_dump_la_CFLAGS = \
$(AM_CFLAGS) \
$(CAP_CFLAGS)
noinst_LTLIBRARIES += \
- libsystemd-bus-dump.la
+ libsystemd-dump.la
tests += \
test-bus-marshal \
test-bus-signature \
test-bus-chat \
+ test-bus-cleanup \
test-bus-server \
test-bus-match \
test-bus-kernel \
test-bus-error \
test-bus-creds \
test-bus-gvariant \
- test-event
+ test-event \
+ test-rtnl \
+ test-resolve
bin_PROGRAMS += \
busctl
test_bus_marshal_SOURCES = \
- src/libsystemd-bus/test-bus-marshal.c
+ src/libsystemd/sd-bus/test-bus-marshal.c
test_bus_marshal_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(CAP_CFLAGS)
test_bus_signature_SOURCES = \
- src/libsystemd-bus/test-bus-signature.c
+ src/libsystemd/sd-bus/test-bus-signature.c
test_bus_signature_LDADD = \
libsystemd-shared.la \
- libsystemd-bus-internal.la
+ libsystemd-internal.la
test_bus_chat_SOURCES = \
- src/libsystemd-bus/test-bus-chat.c
+ src/libsystemd/sd-bus/test-bus-chat.c
test_bus_chat_CFLAGS = \
$(AM_CFLAGS) \
-pthread
test_bus_chat_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
+ libsystemd-id128-internal.la \
+ 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-bus/test-bus-server.c
+ src/libsystemd/sd-bus/test-bus-server.c
test_bus_server_CFLAGS = \
$(AM_CFLAGS) \
-pthread
test_bus_server_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_objects_SOURCES = \
- src/libsystemd-bus/test-bus-objects.c
+ src/libsystemd/sd-bus/test-bus-objects.c
test_bus_objects_CFLAGS = \
$(AM_CFLAGS) \
-pthread
test_bus_objects_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
test_bus_error_SOURCES = \
- src/libsystemd-bus/test-bus-error.c
+ src/libsystemd/sd-bus/test-bus-error.c
test_bus_error_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_gvariant_SOURCES = \
- src/libsystemd-bus/test-bus-gvariant.c
+ src/libsystemd/sd-bus/test-bus-gvariant.c
test_bus_gvariant_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(GLIB_LIBS) \
$(CAP_LIBS)
$(CAP_CFLAGS)
test_bus_creds_SOURCES = \
- src/libsystemd-bus/test-bus-creds.c
+ src/libsystemd/sd-bus/test-bus-creds.c
test_bus_creds_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la
test_bus_match_SOURCES = \
- src/libsystemd-bus/test-bus-match.c
+ src/libsystemd/sd-bus/test-bus-match.c
test_bus_match_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_kernel_SOURCES = \
- src/libsystemd-bus/test-bus-kernel.c
+ src/libsystemd/sd-bus/test-bus-kernel.c
test_bus_kernel_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
$(CAP_CFLAGS)
test_bus_kernel_bloom_SOURCES = \
- src/libsystemd-bus/test-bus-kernel-bloom.c
+ src/libsystemd/sd-bus/test-bus-kernel-bloom.c
test_bus_kernel_bloom_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-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
+ src/libsystemd/sd-bus/test-bus-kernel-benchmark.c
test_bus_kernel_benchmark_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_memfd_SOURCES = \
- src/libsystemd-bus/test-bus-memfd.c
+ src/libsystemd/sd-bus/test-bus-memfd.c
test_bus_memfd_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_bus_zero_copy_SOURCES = \
- src/libsystemd-bus/test-bus-zero-copy.c
+ src/libsystemd/sd-bus/test-bus-zero-copy.c
test_bus_zero_copy_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
$(CAP_CFLAGS)
test_bus_introspect_SOURCES = \
- src/libsystemd-bus/test-bus-introspect.c
+ src/libsystemd/sd-bus/test-bus-introspect.c
test_bus_introspect_LDADD = \
libsystemd-shared.la \
- libsystemd-bus-internal.la
+ libsystemd-internal.la
test_event_SOURCES = \
- src/libsystemd-bus/test-event.c
+ src/libsystemd/sd-event/test-event.c
test_event_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
+test_rtnl_SOURCES = \
+ src/libsystemd/sd-rtnl/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/sd-resolve/test-resolve.c
+
+test_resolve_LDADD = \
+ libsystemd-internal.la \
+ libsystemd-shared.la
+
+test_resolve_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
busctl_SOURCES = \
- src/libsystemd-bus/busctl.c
+ src/libsystemd/sd-bus/busctl.c
busctl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
- libsystemd-bus-dump.la \
+ libsystemd-dump.la \
libsystemd-capability.la \
$(CAP_LIBS)
$(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) \
systemd_journald_LDADD = \
libsystemd-journal-core.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
systemd_cat_SOURCES = \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la \
$(MICROHTTPD_LIBS)
systemd_socket_proxyd_LDADD = \
libsystemd-logs.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
systemd_hostnamed_LDADD = \
libsystemd-label.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
src/hostname/hostnamectl.c
hostnamectl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
src/bus-driverd/bus-driverd.c
systemd_bus_driverd_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
BUSNAMES_TARGET_WANTS += \
org.freedesktop.DBus.busname
+nodist_userunit_DATA += \
+ units/user/systemd-bus-driverd.service
+
+USER_BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.DBus.busname
+
+USER_UNIT_ALIASES += \
+ $(systemunitdir)/org.freedesktop.DBus.busname org.freedesktop.DBus.busname
endif
EXTRA_DIST += \
- units/systemd-bus-driverd.service.in
+ units/systemd-bus-driverd.service.in \
+ units/user/systemd-bus-driverd.service.in
# ------------------------------------------------------------------------------
if ENABLE_LOCALED
systemd_localed_LDADD = \
libsystemd-label.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
src/locale/localectl.c
localectl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
systemd_timedated_LDADD = \
libsystemd-label.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
src/timedate/timedatectl.c
timedatectl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
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-shared.la \
- libsystemd-bus.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-dhcp.la \
- libsystemd-shared.la \
- libsystemd-bus.la
-
-tests += \
- test-dhcp-option \
- test-dhcp-client
-
# ------------------------------------------------------------------------------
if ENABLE_MACHINED
systemd_machined_SOURCES = \
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-daemon-internal.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libudev-internal.la \
libsystemd-shared.la
src/machine/machinectl.c
machinectl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
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 \
systemd_networkd_LDADD = \
libudev-internal.la \
libsystemd-daemon-internal.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
+ libsystemd-dhcp.la \
libsystemd-id128-internal.la \
- libsystemd-rtnl.la \
+ libsystemd-label.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
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-bus-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
tests += \
libsystemd-capability.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
src/login/sysfs-show.c
loginctl_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-id128-internal.la \
src/login/inhibit.c
systemd_inhibit_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la
src/login/test-inhibit.c
test_inhibit_LDADD = \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la
pam_systemd_la_LIBADD = \
libsystemd-capability.la \
- libsystemd-bus-internal.la \
+ libsystemd-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
./ids-update.pl )
kdbus-update:
- ( cd $(top_srcdir)/src/libsystemd-bus/ && \
+ ( cd $(top_srcdir)/src/libsystemd/ && \
wget -N https://d-bus.googlecode.com/git/kdbus.h )
upload: all distcheck
# exclude the one perl script we have in there
valgrind-tests: $(TESTS)
$(AM_V_GEN)for f in $(filter-out %.pl, $^); do \
- echo "Running $$f"; \
- libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; \
+ 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=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
+ x="\n\n"; \
done
exported-%: %
$(AM_V_at)printf 'return 0; }\n' >> $@
endef
-test-libsystemd-bus-sym.c: \
- src/libsystemd-bus/libsystemd-bus.sym \
+test-libsystemd-sym.c: \
+ src/libsystemd/libsystemd.sym \
src/systemd/sd-bus.h \
src/systemd/sd-utf8.h
$(generate-sym-test)
src/udev/udev.h
$(generate-sym-test)
-test_libsystemd_bus_sym_SOURCES = \
- test-libsystemd-bus-sym.c
-test_libsystemd_bus_sym_LDADD = \
- libsystemd-bus.la
+test_libsystemd_sym_SOURCES = \
+ test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+ libsystemd.la
test_libsystemd_daemon_sym_SOURCES = \
test-libsystemd-daemon-sym.c
libudev.la
BUILT_SOURCES += \
- $(test_libsystemd_bus_sym_SOURCES) \
+ $(test_libsystemd_sym_SOURCES) \
$(test_libsystemd_daemon_sym_SOURCES) \
$(test_libsystemd_id128_sym_SOURCES) \
$(test_libsystemd_journal_sym_SOURCES) \
$(test_libudev_sym_SOURCES)
tests += \
- test-libsystemd-bus-sym \
+ test-libsystemd-sym \
test-libsystemd-daemon-sym \
test-libsystemd-id128-sym \
test-libsystemd-journal-sym \
cppcheck:
cppcheck --enable=all -q $(top_srcdir)
+
+# Used to extract compile flags for YCM.
+print-%:
+ @echo $($*)