Before: shared code such as log.c was linked once into the public
libraries (where it is entirely hidden) and once into the various tools
which might use those libraries. This is suboptimal, as this way static
variables such as the maximum log level are instantiated twice in all
tools.
After: our build the public libraries a second time, as a convenience
libary, and link our tools against those. Hence all tools use only a
single instance of everything.
$(AM_CFLAGS)
libsystemd_logs_la_LIBADD = \
$(AM_CFLAGS)
libsystemd_logs_la_LIBADD = \
- libsystemd-journal.la \
- libsystemd-id128.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
systemd_LDADD = \
libsystemd-core.la \
libsystemd-daemon.la \
systemd_LDADD = \
libsystemd-core.la \
libsystemd-daemon.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la
dist_pkgsysconf_DATA += \
libsystemd-dbus.la
dist_pkgsysconf_DATA += \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la \
libsystemd-logs.la
libsystemd-dbus.la \
libsystemd-logs.la
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la
+libsystemd_id128_internal_la_SOURCES = \
+ $(libsystemd_id128_la_SOURCES)
+
test_id128_SOURCES = \
src/test/test-id128.c
test_id128_LDADD = \
libsystemd-shared.la \
test_id128_SOURCES = \
src/test/test-id128.c
test_id128_LDADD = \
libsystemd-shared.la \
+ libsystemd-id128-internal.la
noinst_PROGRAMS += \
test-id128
noinst_PROGRAMS += \
test-id128
lib_LTLIBRARIES += \
libsystemd-id128.la
lib_LTLIBRARIES += \
libsystemd-id128.la
+noinst_LTLIBRARIES += \
+ libsystemd-id128-internal.la
+
pkgconfiglib_DATA += \
src/libsystemd-id128/libsystemd-id128.pc
pkgconfiglib_DATA += \
src/libsystemd-id128/libsystemd-id128.pc
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
+ libsystemd-id128-internal.la
if ENABLE_LOGIND
systemd_journald_LDADD += \
if ENABLE_LOGIND
systemd_journald_LDADD += \
+ libsystemd-login-internal.la
systemd_cat_LDADD = \
libsystemd-shared.la \
systemd_cat_LDADD = \
libsystemd-shared.la \
+ libsystemd-journal-internal.la
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_LDADD = \
libsystemd-shared.la \
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-logs.la
test_journal_SOURCES = \
libsystemd-logs.la
test_journal_SOURCES = \
test_journal_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
test_journal_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
+ libsystemd-id128-internal.la
if HAVE_XZ
test_journal_SOURCES += \
if HAVE_XZ
test_journal_SOURCES += \
test_journal_send_LDADD = \
libsystemd-shared.la \
test_journal_send_LDADD = \
libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-id128-internal.la
+
+libsystemd_journal_internal_la_SOURCES = \
+ $(libsystemd_journal_la_SOURCES)
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS = \
+ $(AM_CFLAGS)
+ $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD = \
+ $(XZ_LIBS)
+
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
lib_LTLIBRARIES += \
libsystemd-journal.la
lib_LTLIBRARIES += \
libsystemd-journal.la
+noinst_LTLIBRARIES += \
+ libsystemd-journal-internal.la
+
rootlibexec_PROGRAMS += \
systemd-journald
rootlibexec_PROGRAMS += \
systemd-journald
src/journal/coredump.c
systemd_coredump_LDADD = \
src/journal/coredump.c
systemd_coredump_LDADD = \
- libsystemd-journal.la \
+ libsystemd-journal-internal.la \
libsystemd-label.la \
libsystemd-shared.la
if ENABLE_LOGIND
systemd_coredump_LDADD += \
libsystemd-label.la \
libsystemd-shared.la
if ENABLE_LOGIND
systemd_coredump_LDADD += \
+ libsystemd-login-internal.la
endif
rootlibexec_PROGRAMS += \
endif
rootlibexec_PROGRAMS += \
src/login/test-login.c
test_login_LDADD = \
src/login/test-login.c
test_login_LDADD = \
+ libsystemd-login-internal.la \
libsystemd-shared.la
test_inhibit_SOURCES = \
libsystemd-shared.la
test_inhibit_SOURCES = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la
libsystemd_login_la_LIBADD = \
libsystemd-shared.la
+libsystemd_login_internal_la_SOURCES = \
+ $(libsystemd_login_la_SOURCES)
+
if HAVE_PAM
pam_systemd_la_SOURCES = \
src/login/pam-module.c
if HAVE_PAM
pam_systemd_la_SOURCES = \
src/login/pam-module.c
lib_LTLIBRARIES += \
libsystemd-login.la
lib_LTLIBRARIES += \
libsystemd-login.la
+noinst_LTLIBRARIES += \
+ libsystemd-login-internal.la
+
pkgconfiglib_DATA += \
src/login/libsystemd-login.pc
pkgconfiglib_DATA += \
src/login/libsystemd-login.pc