LIBSYSTEMD_LOGIN_AGE=9
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=10
+LIBSYSTEMD_DAEMON_REVISION=11
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=3
+LIBSYSTEMD_JOURNAL_REVISION=4
LIBSYSTEMD_JOURNAL_AGE=11
LIBSYSTEMD_CURRENT=0
systemd-system-update-generator
dist_bashcompletion_DATA = \
+ shell-completion/bash/busctl \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
shell-completion/bash/systemd-analyze \
tools/make-man-index.py \
tools/make-directive-index.py \
tools/make-man-rules.py \
- tools/xml_helper.py \
- man/less-variables.xml
+ tools/xml_helper.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
+ src/shared/architecture.c \
+ src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
src/shared/path-util.c \
src/shared/audit.c \
src/shared/audit.h \
src/shared/xml.c \
- src/shared/xml.h
+ src/shared/xml.h \
+ src/shared/condition-util.c \
+ src/shared/condition-util.h
nodist_libsystemd_shared_la_SOURCES = \
src/shared/errno-from-name.h \
$(AUDIT_CFLAGS) \
$(CAP_CFLAGS) \
$(KMOD_CFLAGS) \
+ $(APPARMOR_CFLAGS) \
$(SECCOMP_CFLAGS) \
-pthread
libsystemd-capability.la \
libsystemd-units.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
libudev-internal.la \
libsystemd-shared.la \
libsystemd-internal.la \
$(AUDIT_LIBS) \
$(CAP_LIBS) \
$(KMOD_LIBS) \
+ $(APPARMOR_LIBS) \
$(SECCOMP_LIBS)
if HAVE_SECCOMP
test-list \
test-tables \
test-device-nodes \
- test-xml
+ test-xml \
+ test-architecture
EXTRA_DIST += \
test/sched_idle_bad.service \
test_time_LDADD = \
libsystemd-core.la
+test_architecture_SOURCES = \
+ src/test/test-architecture.c
+
+test_architecture_LDADD = \
+ libsystemd-shared.la
+
test_log_SOURCES = \
src/test/test-log.c
src/test/test-daemon.c
test_daemon_LDADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_cgroup_SOURCES = \
test_cgroup_util_LDADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
test_env_replace_SOURCES = \
systemd_analyze_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_initctl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_update_utmp_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
$(AUDIT_LIBS)
systemd_shutdownd_LDADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
dist_doc_DATA += \
systemd_fsck_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libudev-internal.la \
libsystemd-shared.la
bootctl_LDADD = \
libsystemd-shared.la \
- libsystemd-internal.la \
- libsystemd-daemon-internal.la
+ libsystemd-internal.la
bin_PROGRAMS += \
bootctl
+dist_bashcompletion_DATA += \
+ shell-completion/bash/bootctl
+
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
systemd_cgroups_agent_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-internal.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/readahead/sd-readahead.c
systemd_notify_LDADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libudev-internal.la \
- libsystemd-shared.la \
+ libsystemd-shared.la
+
+if HAVE_SECCOMP
+systemd_nspawn_LDADD += \
libsystemd-seccomp.la \
$(SECCOMP_LIBS)
+endif
# ------------------------------------------------------------------------------
systemd_run_SOURCES = \
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
systemd_bus_proxyd_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
bus-proxyd-install-hook:
libsystemd-shared.la
# ------------------------------------------------------------------------------
-libsystemd_daemon_la_SOURCES = \
- src/libsystemd-daemon/libsystemd-daemon.sym \
- src/libsystemd-daemon/sd-daemon.c
-
-libsystemd_daemon_internal_la_SOURCES = \
- $(libsystemd_daemon_la_SOURCES)
-
-libsystemd_daemon_internal_la_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -DSD_DAEMON_DISABLE_MQ
-
-libsystemd_daemon_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=hidden \
- -DSD_EXPORT_SYMBOLS
-
-libsystemd_daemon_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
-
-libsystemd_daemon_la_LIBADD = \
- $(RT_LIBS)
-
-pkginclude_HEADERS += \
- src/systemd/sd-daemon.h
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libsystemd-daemon-install-hook:
- libname=libsystemd-daemon.so && $(move-to-rootlibdir)
-
-libsystemd-daemon-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-daemon-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook
-
-lib_LTLIBRARIES += \
- libsystemd-daemon.la
-
-noinst_LTLIBRARIES += \
- libsystemd-daemon-internal.la
-
-pkgconfiglib_DATA += \
- src/libsystemd-daemon/libsystemd-daemon.pc
-
-EXTRA_DIST += \
- src/libsystemd-daemon/libsystemd-daemon.pc.in
-
-# ------------------------------------------------------------------------------
-libsystemd_la_SOURCES = \
- src/libsystemd/libsystemd.sym \
+libsystemd_internal_la_SOURCES = \
src/systemd/sd-bus.h \
src/systemd/sd-bus-protocol.h \
src/systemd/sd-bus-vtable.h \
src/systemd/sd-resolve.h \
src/systemd/sd-login.h \
src/systemd/sd-id128.h \
+ src/systemd/sd-daemon.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-resolve/sd-resolve.c \
src/libsystemd/sd-resolve/resolve-util.h \
src/libsystemd/sd-id128/sd-id128.c \
+ src/libsystemd/sd-daemon/sd-daemon.c \
src/login/sd-login.c \
src/login/login-shared.c \
src/login/login-shared.h
-nodist_libsystemd_la_SOURCES = \
+nodist_libsystemd_internal_la_SOURCES = \
+ src/libsystemd/libsystemd.sym \
src/libsystemd/sd-bus/bus-error-mapping.c
-libsystemd_la_LIBADD = \
- libsystemd-daemon-internal.la \
- libsystemd-shared.la \
- -lresolv
-
-libsystemd_la_CFLAGS = \
+libsystemd_internal_la_CFLAGS = \
$(AM_CFLAGS) \
-pthread
-libsystemd_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
+noinst_LTLIBRARIES += \
+ libsystemd-internal.la
-pkgconfiglib_DATA += \
- src/libsystemd/libsystemd.pc
+libsystemd_dump_la_SOURCES = \
+ src/libsystemd/sd-bus/bus-dump.c \
+ src/libsystemd/sd-bus/bus-dump.h
-pkginclude_HEADERS += \
- src/systemd/sd-login.h \
- src/systemd/sd-id128.h
+libsystemd_dump_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(CAP_CFLAGS)
+
+noinst_LTLIBRARIES += \
+ libsystemd-dump.la
EXTRA_DIST += \
+ src/libsystemd/libsystemd.sym.m4 \
+ src/libsystemd/libsystemd.pc.in \
src/libsystemd/sd-bus/bus-error-mapping.gperf \
src/libsystemd/sd-bus/DIFFERENCES \
- src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
- src/libsystemd/libsystemd.pc.in
+ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
CLEANFILES += \
+ src/libsystemd/libsystemd.sym \
src/libsystemd/sd-bus/bus-error-mapping.c
-lib_LTLIBRARIES += \
- libsystemd.la
+BUILT_SOURCES += \
+ src/libsystemd/libsystemd.sym
-libsystemd_internal_la_SOURCES = \
- $(libsystemd_la_SOURCES)
+libsystemd_la_SOURCES = \
+ $(libsystemd_internal_la_SOURCES) \
+ $(libsystemd_journal_internal_la_SOURCES)
-nodist_libsystemd_internal_la_SOURCES = \
- $(nodist_libsystemd_la_SOURCES)
+nodist_libsystemd_la_SOURCES = \
+ $(nodist_libsystemd_internal_la_SOURCES)
-libsystemd_internal_la_CFLAGS = \
- $(libsystemd_la_CFLAGS)
+libsystemd_la_CFLAGS = \
+ $(libsystemd_internal_la_CFLAGS) \
+ $(libsystemd_journal_internal_la_CFLAGS)
-noinst_LTLIBRARIES += \
- libsystemd-internal.la
+libsystemd_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
+ -Wl,--version-script=$(top_builddir)/src/libsystemd/libsystemd.sym
-libsystemd_dump_la_SOURCES = \
- src/libsystemd/sd-bus/bus-dump.c \
- src/libsystemd/sd-bus/bus-dump.h
+libsystemd_la_LIBADD = \
+ libsystemd-shared.la \
+ $(libsystemd_journal_internal_la_LIBADD) \
+ $(RT_LIBS) \
+ -lresolv
-libsystemd_dump_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(CAP_CFLAGS)
+libsystemd-install-hook:
+ libname=libsystemd.so && $(move-to-rootlibdir)
+ -$(MKDIR_P) $(DESTDIR)/var/log/journal
+ -chown 0:0 $(DESTDIR)/var/log/journal
+ -chmod 755 $(DESTDIR)/var/log/journal
+ -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+ -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
-noinst_LTLIBRARIES += \
- libsystemd-dump.la
+libsystemd-uninstall-hook:
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd.so*
+
+INSTALL_EXEC_HOOKS += libsystemd-install-hook
+UNINSTALL_EXEC_HOOKS += libsystemd-uninstall-hook
+
+pkgconfiglib_DATA += \
+ src/libsystemd/libsystemd.pc
+
+pkginclude_HEADERS += \
+ src/systemd/sd-login.h \
+ src/systemd/sd-id128.h \
+ src/systemd/sd-daemon.h
+
+if ENABLE_KDBUS
+pkginclude_HEADERS += \
+ 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/systemd/sd-rtnl.h \
+ src/systemd/sd-resolve.h
+endif
+
+lib_LTLIBRARIES += \
+ libsystemd.la
tests += \
test-bus-marshal \
test_bus_marshal_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la \
test_bus_chat_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_cleanup_SOURCES = \
test_bus_cleanup_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_server_SOURCES = \
test_bus_server_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_objects_SOURCES = \
test_bus_objects_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la \
test_bus_error_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_gvariant_SOURCES = \
test_bus_gvariant_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la \
test_bus_creds_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la
test_bus_match_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_kernel_SOURCES = \
test_bus_kernel_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la \
test_bus_kernel_bloom_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_kernel_benchmark_SOURCES = \
test_bus_kernel_benchmark_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_bus_memfd_SOURCES = \
test_bus_zero_copy_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la \
test_event_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_rtnl_SOURCES = \
test_rtnl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_resolve_SOURCES = \
busctl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
libsystemd-dump.la \
libsystemd-capability.la \
test_dhcp_client_LDADD = \
libsystemd-dhcp.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
tests += \
-Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
libudev_la_LIBADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
pkgconfiglib_DATA += \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
hwdb/20-OUI.hwdb \
+ hwdb/20-net-ifname.hwdb \
hwdb/60-keyboard.hwdb
udevconfdir = $(sysconfdir)/udev
libudev_core_la_LIBADD = \
libudev-internal.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
test_id128_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
tests += \
systemd_activate_LDADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
test_catalog_LDADD = \
libsystemd-journal-core.la
-libsystemd_journal_la_SOURCES = \
- src/journal/libsystemd-journal.sym \
- 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 \
- src/journal/journal-vacuum.h \
- src/journal/journal-verify.c \
- src/journal/journal-verify.h \
- src/journal/lookup3.c \
- src/journal/lookup3.h \
- src/journal/journal-send.c \
- src/journal/journal-def.h \
- src/journal/compress.h \
- src/journal/catalog.c \
- src/journal/catalog.h \
- src/journal/mmap-cache.c \
- src/journal/mmap-cache.h
-
-libsystemd_journal_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=hidden
-
-libsystemd_journal_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
- -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym
-
-libsystemd_journal_la_LIBADD = \
- libsystemd-label.la \
- libsystemd-daemon-internal.la \
- libsystemd-internal.la \
- libsystemd-shared.la
-
-libsystemd_journal_internal_la_SOURCES = \
- $(libsystemd_journal_la_SOURCES)
-
-# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS = \
- $(AM_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD =
-
-if HAVE_XZ
-libsystemd_journal_la_SOURCES += \
- src/journal/compress.c
-
-libsystemd_journal_la_CFLAGS += \
- $(XZ_CFLAGS)
-
-libsystemd_journal_la_LIBADD += \
- $(XZ_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
- $(XZ_CFLAGS)
-
-libsystemd_journal_internal_la_LIBADD += \
- $(XZ_LIBS)
-endif
-
libsystemd_journal_core_la_SOURCES = \
src/journal/journald-kmsg.c \
src/journal/journald-kmsg.h \
libudev-internal.la \
libsystemd-capability.la \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
libsystemd-internal.la \
libsystemd-shared.la
noinst_LTLIBRARIES += \
libsystemd-journal-core.la
-if HAVE_GCRYPT
-libsystemd_journal_la_SOURCES += \
- src/journal/journal-authenticate.c \
- src/journal/journal-authenticate.h \
- src/journal/fsprg.c \
- src/journal/fsprg.h
-
-libsystemd_journal_la_CFLAGS += \
- $(GCRYPT_CFLAGS) \
- -Wno-pointer-arith
-
-libsystemd_journal_la_LIBADD += \
- $(GCRYPT_LIBS)
-
-libsystemd_journal_internal_la_CFLAGS += \
- $(GCRYPT_CFLAGS) \
- -Wno-pointer-arith
-
-libsystemd_journal_internal_la_LIBADD += \
- $(GCRYPT_LIBS)
-endif
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if
-# needed. Also, grant read access to new journal files to members of
-# "adm" and "wheel".
-libsystemd-journal-install-hook:
- libname=libsystemd-journal.so && $(move-to-rootlibdir)
- -$(MKDIR_P) $(DESTDIR)/var/log/journal
- -chown 0:0 $(DESTDIR)/var/log/journal
- -chmod 755 $(DESTDIR)/var/log/journal
- -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
- -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
-
-libsystemd-journal-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-
-INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook
-UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook
-
# ------------------------------------------------------------------------------
# Update catalog on installation. Do not bother if installing
src/systemd/sd-messages.h \
src/systemd/_sd-common.h
-lib_LTLIBRARIES += \
- libsystemd-journal.la
+libsystemd_journal_internal_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 \
+ src/journal/journal-vacuum.h \
+ src/journal/journal-verify.c \
+ src/journal/journal-verify.h \
+ src/journal/lookup3.c \
+ src/journal/lookup3.h \
+ src/journal/journal-send.c \
+ src/journal/journal-def.h \
+ src/journal/compress.h \
+ src/journal/catalog.c \
+ src/journal/catalog.h \
+ src/journal/mmap-cache.c \
+ src/journal/mmap-cache.h
+
+# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
+libsystemd_journal_internal_la_CFLAGS =
+ $(AM_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD =
+
+if HAVE_XZ
+libsystemd_journal_internal_la_SOURCES += \
+ src/journal/compress.c
+
+libsystemd_journal_internal_la_CFLAGS += \
+ $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD += \
+ $(XZ_LIBS)
+endif
+
+if HAVE_GCRYPT
+libsystemd_journal_internal_la_SOURCES += \
+ src/journal/journal-authenticate.c \
+ src/journal/journal-authenticate.h \
+ src/journal/fsprg.c \
+ src/journal/fsprg.h
+
+libsystemd_journal_internal_la_LIBADD += \
+ $(GCRYPT_LIBS)
+
+# fsprg.c is a drop-in file using void pointer arithmetic
+libsystemd_journal_internal_la_CFLAGS += \
+ $(GCRYPT_CFLAGS) \
+ -Wno-pointer-arith
+endif
noinst_LTLIBRARIES += \
libsystemd-journal-internal.la
dist_pkgsysconf_DATA += \
src/journal/journald.conf
-pkgconfiglib_DATA += \
- src/journal/libsystemd-journal.pc
-
dist_catalog_DATA = \
catalog/systemd.fr.catalog \
catalog/systemd.ru.catalog \
systemd-journal-flush.service
EXTRA_DIST += \
- src/journal/libsystemd-journal.pc.in \
units/systemd-journald.service.in \
units/systemd-journal-flush.service.in \
src/journal/journald-gperf.gperf
systemd_journal_gatewayd_LDADD = \
libsystemd-logs.la \
libsystemd-journal-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-internal.la \
libsystemd-shared.la \
$(MICROHTTPD_LIBS)
libsystemd-logs.la \
libsystemd-internal.la \
libsystemd-journal-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
# ------------------------------------------------------------------------------
src/readahead/readahead-common.h
systemd_readahead_LDADD = \
- libsystemd-daemon-internal.la \
+ libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
systemd_hostnamed_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
hostnamectl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
bin_PROGRAMS += \
systemd_bus_driverd_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
systemd_localed_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
nodist_systemunit_DATA += \
localectl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
bin_PROGRAMS += \
systemd_timedated_LDADD = \
libsystemd-label.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
rootlibexec_PROGRAMS += \
timedatectl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
bin_PROGRAMS += \
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-daemon-internal.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
machinectl_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
src/network/networkd-manager.c
nodist_systemd_networkd_SOURCES = \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
systemd_networkd_LDADD = \
libudev-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-internal.la \
libsystemd-dhcp.la \
libsystemd-label.la \
src/network/networkd-address.c \
src/network/networkd-route.c \
src/network/networkd-manager.c \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
test_network_LDADD = \
libudev-internal.la \
libsystemd-internal.la \
libsystemd-dhcp.la \
- libsystemd-daemon-internal.la \
libsystemd-label.la \
libsystemd-shared.la
test-network
EXTRA_DIST += \
- src/network/networkd-gperf.gperf \
+ src/network/networkd-network-gperf.gperf \
+ src/network/networkd-netdev-gperf.gperf \
units/systemd-networkd.service.in
CLEANFILES += \
- src/network/networkd-gperf.c
+ src/network/networkd-network-gperf.c \
+ src/network/networkd-netdev-gperf.c
endif
# ------------------------------------------------------------------------------
libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-capability.la \
- libsystemd-daemon-internal.la \
libsystemd-internal.la \
libudev-internal.la \
libsystemd-shared.la
loginctl_LDADD = \
libsystemd-internal.la \
libudev-internal.la \
- libsystemd-shared.la \
- libsystemd-daemon-internal.la
+ libsystemd-shared.la
rootbin_PROGRAMS += \
loginctl
systemd_inhibit_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
rootbin_PROGRAMS += \
test_inhibit_LDADD = \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
test_login_tables_SOURCES = \
pam_systemd_la_LIBADD = \
libsystemd-capability.la \
libsystemd-internal.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la \
$(PAM_LIBS)
_journal_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-journal.la
+ libsystemd.la
id128_la_SOURCES = \
src/python-systemd/id128.c \
id128_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd.la
+ libsystemd.la \
+ libsystemd-shared.la
_daemon_la_SOURCES = \
src/python-systemd/_daemon.c \
_daemon_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-daemon.la
+ libsystemd.la \
+ libsystemd-shared.la
_reader_la_SOURCES = \
src/python-systemd/_reader.c \
_reader_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-journal.la \
libsystemd.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
login_la_SOURCES = \
login_la_LIBADD = \
$(PYTHON_DEVEL_LIBS) \
- libsystemd-journal.la \
libsystemd.la \
- libsystemd-daemon-internal.la \
libsystemd-shared.la
dist_pkgpyexec_PYTHON = \
# ------------------------------------------------------------------------------
if ENABLE_COMPAT_LIBS
+EXTRA_DIST += \
+ src/compat-libs/linkwarning.h
+
define generate-fake-lib
$(AM_V_at)$(MKDIR_P) $(dir $@)
$(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/void new_\1(void);\n__asm__(".symver new_\1,\1@LIBSYSTEMD_209");\nstatic void (*resolve_\1(void)) (void) {\n\treturn new_\1;\n}\nvoid \1(void) __attribute__((ifunc("resolve_\1")));\nobsolete_lib(\1,$(notdir $(basename $<)));\n/p' <$< >$@
endef
+libsystemd_journal_la_SOURCES = \
+ libsystemd-journal.c \
+ src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -fvisibility=default \
+ -imacros $(top_srcdir)/src/compat-libs/linkwarning.h \
+ -fno-lto
+
+libsystemd_journal_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
+
+libsystemd_journal_la_LIBADD = \
+ libsystemd.la
+
libsystemd_login_la_SOURCES = \
libsystemd-login.c \
src/compat-libs/libsystemd-login.sym
libsystemd_id128_la_LIBADD = \
libsystemd.la
+libsystemd_daemon_la_SOURCES = \
+ libsystemd-daemon.c \
+ src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_CFLAGS = \
+ $(libsystemd_login_la_CFLAGS)
+
+libsystemd_daemon_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
+
+libsystemd_daemon_la_LIBADD = \
+ libsystemd.la
+
BUILT_SOURCES += \
+ libsystemd-journal.c \
libsystemd-login.c \
- libsystemd-id128.c
+ libsystemd-id128.c \
+ libsystemd-daemon.c
libsystemd-%.c: src/compat-libs/libsystemd-%.sym
$(generate-fake-lib)
lib_LTLIBRARIES += \
+ libsystemd-journal.la \
libsystemd-login.la \
- libsystemd-id128.la
+ libsystemd-id128.la \
+ libsystemd-daemon.la
pkgconfiglib_DATA += \
+ src/compat-libs/libsystemd-journal.pc \
src/compat-libs/libsystemd-login.pc \
- src/compat-libs/libsystemd-id128.pc
+ src/compat-libs/libsystemd-id128.pc \
+ src/compat-libs/libsystemd-daemon.pc
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
compat-lib-install-hook:
libname=libsystemd-login.so && $(move-to-rootlibdir)
libname=libsystemd-id128.so && $(move-to-rootlibdir)
+ libname=libsystemd-daemon.so && $(move-to-rootlibdir)
compat-lib-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
+ rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
INSTALL_EXEC_HOOKS += compat-lib-install-hook
UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
endif
EXTRA_DIST += \
+ src/compat-libs/libsystemd-journal.pc.in \
src/compat-libs/libsystemd-login.pc.in \
- src/compat-libs/libsystemd-id128.pc.in
+ src/compat-libs/libsystemd-id128.pc.in \
+ src/compat-libs/libsystemd-daemon.pc.in
# ------------------------------------------------------------------------------
substitutions = \
--with-pamconfdir=$$dc_install_base/$(pamconfdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr \
- --enable-kdbus
+ --enable-kdbus \
+ --enable-compat-libs
if HAVE_SYSV_COMPAT
DISTCHECK_CONFIGURE_FLAGS += \
endef
test-libsystemd-sym.c: \
- src/libsystemd/libsystemd.sym \
- src/systemd/sd-bus.h \
- src/systemd/sd-utf8.h \
- src/systemd/sd-login.h
+ $(top_builddir)/src/libsystemd/libsystemd.sym \
+ src/systemd/sd-journal.h \
+ src/systemd/sd-daemon.h \
+ src/systemd/sd-login.h \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-utf8.h
+ $(generate-sym-test)
+
+test-libudev-sym.c: \
+ src/libudev/libudev.sym \
+ src/udev/udev.h
$(generate-sym-test)
+test_libsystemd_sym_SOURCES = \
+ test-libsystemd-sym.c
+test_libsystemd_sym_LDADD = \
+ libsystemd.la
+
+test_libudev_sym_SOURCES = \
+ test-libudev-sym.c
+test_libudev_sym_LDADD = \
+ libudev.la
+
+BUILT_SOURCES += \
+ $(test_libsystemd_sym_SOURCES) \
+ $(test_libudev_sym_SOURCES)
+
+tests += \
+ test-libsystemd-sym \
+ test-libudev-sym
+
+if ENABLE_COMPAT_LIBS
test-libsystemd-daemon-sym.c: \
- src/libsystemd-daemon/libsystemd-daemon.sym \
- src/systemd/sd-daemon.h
+ src/compat-libs/libsystemd-daemon.sym \
+ src/systemd/sd-daemon.h
$(generate-sym-test)
test-libsystemd-id128-sym.c: \
- src/compat-libs/libsystemd-id128.sym \
- src/systemd/sd-id128.h
+ src/compat-libs/libsystemd-id128.sym \
+ src/systemd/sd-id128.h
$(generate-sym-test)
test-libsystemd-journal-sym.c: \
- src/journal/libsystemd-journal.sym \
- src/systemd/sd-journal.h
+ src/compat-libs/libsystemd-journal.sym \
+ src/systemd/sd-journal.h
$(generate-sym-test)
test-libsystemd-login-sym.c: \
- src/compat-libs/libsystemd-login.sym \
- src/systemd/sd-login.h
+ src/compat-libs/libsystemd-login.sym \
+ src/systemd/sd-login.h
$(generate-sym-test)
-test-libudev-sym.c: \
- src/libudev/libudev.sym \
- src/udev/udev.h
- $(generate-sym-test)
-
-test_libsystemd_sym_SOURCES = \
- test-libsystemd-sym.c
-test_libsystemd_sym_LDADD = \
- libsystemd.la
-
test_libsystemd_daemon_sym_SOURCES = \
test-libsystemd-daemon-sym.c
test_libsystemd_daemon_sym_LDADD = \
test_libsystemd_login_sym_LDADD = \
libsystemd-login.la
-test_libudev_sym_SOURCES = \
- test-libudev-sym.c
-test_libudev_sym_LDADD = \
- libudev.la
-
BUILT_SOURCES += \
- $(test_libsystemd_sym_SOURCES) \
- $(test_libsystemd_daemon_sym_SOURCES) \
$(test_libsystemd_journal_sym_SOURCES) \
- $(test_libudev_sym_SOURCES)
-
-tests += \
- test-libsystemd-sym \
- test-libsystemd-daemon-sym \
- test-libsystemd-journal-sym \
- test-libudev-sym
-
-if ENABLE_COMPAT_LIBS
-BUILT_SOURCES += \
$(test_libsystemd_login_sym_SOURCES) \
- $(test_libsystemd_id128_sym_SOURCES)
+ $(test_libsystemd_id128_sym_SOURCES) \
+ $(test_libsystemd_daemon_sym_SOURCES)
tests += \
+ test-libsystemd-journal-sym \
test-libsystemd-login-sym \
- test-libsystemd-id128-sym
+ test-libsystemd-id128-sym \
+ test-libsystemd-daemon-sym
endif
.PHONY: cppcheck