Commit 7e8f489a authored by Kay Sievers's avatar Kay Sievers
Browse files

journal: restructure Makefile.am

parent 609518c1
......@@ -156,8 +156,7 @@ rootbin_PROGRAMS = \
systemd-ask-password \
systemd-tty-ask-password-agent \
systemd-tmpfiles \
systemd-machine-id-setup \
systemd-journalctl
systemd-machine-id-setup
bin_PROGRAMS = \
systemd-cgls \
......@@ -194,8 +193,7 @@ rootlibexec_PROGRAMS = \
systemd-timestamp \
systemd-ac-power \
systemd-detect-virt \
systemd-sysctl \
systemd-journald
systemd-sysctl
systemgenerator_PROGRAMS = \
systemd-getty-generator
......@@ -210,13 +208,11 @@ endif
lib_LTLIBRARIES = \
libsystemd-daemon.la \
libsystemd-id128.la \
libsystemd-journal.la
libsystemd-id128.la
pkginclude_HEADERS = \
src/sd-daemon.h \
src/sd-id128.h \
src/journal/sd-journal.h
src/sd-id128.h
noinst_PROGRAMS = \
test-engine \
......@@ -229,8 +225,7 @@ noinst_PROGRAMS = \
test-env-replace \
test-strv \
test-install \
test-id128 \
test-journal
test-id128
if HAVE_PAM
pamlib_LTLIBRARIES = \
......@@ -334,8 +329,7 @@ dist_systemunit_DATA = \
units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
units/systemd-journald.socket
units/syslog.target
if HAVE_SYSV_COMPAT
dist_systemunit_DATA += \
......@@ -349,7 +343,6 @@ nodist_systemunit_DATA = \
units/systemd-initctl.service \
units/systemd-stdout-syslog-bridge.service \
units/systemd-shutdownd.service \
units/systemd-journald.service \
units/systemd-kmsg-syslogd.service \
units/systemd-modules-load.service \
units/systemd-vconsole-setup.service \
......@@ -392,7 +385,6 @@ EXTRA_DIST += \
units/systemd-initctl.service.in \
units/systemd-stdout-syslog-bridge.service.in \
units/systemd-shutdownd.service.in \
units/systemd-journald.service.in \
units/systemd-kmsg-syslogd.service.in \
units/systemd-modules-load.service.in \
units/systemd-vconsole-setup.service.in \
......@@ -422,10 +414,8 @@ EXTRA_DIST += \
systemd.pc.in \
libsystemd-daemon.pc.in \
libsystemd-id128.pc.in \
libsystemd-journal.pc.in \
src/libsystemd-daemon.sym \
src/libsystemd-id128.sym \
src/journal/libsystemd-journal.sym \
introspect.awk \
src/73-seat-late.rules.in \
src/99-systemd.rules.in \
......@@ -504,8 +494,7 @@ pkgconfigdata_DATA = \
pkgconfiglib_DATA = \
libsystemd-daemon.pc \
libsystemd-id128.pc \
libsystemd-journal.pc
libsystemd-id128.pc
# First passed through sed, followed by intltool
polkitpolicy_in_in_files = \
......@@ -657,12 +646,6 @@ EXTRA_DIST += \
src/polkit.h \
src/dbus-loop.h \
src/spawn-agent.h \
src/journal/journal-def.h \
src/journal/journal-internal.h \
src/journal/journal-file.h \
src/journal/lookup3.h \
src/journal/compress.h \
src/journal/journal-rate-limit.h \
src/acl-util.h
MANPAGES = \
......@@ -882,29 +865,70 @@ test_id128_CFLAGS = \
test_id128_LDADD = \
libsystemd-basic.la
test_journal_SOURCES = \
src/journal/test-journal.c \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/lookup3.c \
src/journal/journal-send.c \
src/sd-id128.c
systemd_stdout_syslog_bridge_SOURCES = \
src/stdout-syslog-bridge.c \
src/tcpwrap.c
test_journal_CFLAGS = \
systemd_stdout_syslog_bridge_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(LIBWRAP_LIBS)
systemd_initctl_SOURCES = \
src/initctl.c \
src/dbus-common.c
systemd_initctl_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
systemd_initctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(DBUS_LIBS)
systemd_update_utmp_SOURCES = \
src/update-utmp.c \
src/dbus-common.c \
src/utmp-wtmp.c
systemd_update_utmp_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
$(AUDIT_CFLAGS)
systemd_update_utmp_LDADD = \
libsystemd-basic.la \
$(DBUS_LIBS) \
$(AUDIT_LIBS)
systemd_random_seed_SOURCES = \
src/random-seed.c
systemd_random_seed_CFLAGS = \
$(AM_CFLAGS)
test_journal_LDADD = \
systemd_random_seed_LDADD = \
libsystemd-basic.la
if HAVE_XZ
test_journal_SOURCES += \
src/journal/compress.c
test_journal_CFLAGS += \
$(XZ_CFLAGS)
test_journal_LDADD += \
$(XZ_LIBS)
endif
systemd_shutdownd_SOURCES = \
src/utmp-wtmp.c \
src/shutdownd.c
systemd_shutdownd_CFLAGS = \
$(AM_CFLAGS)
systemd_shutdownd_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
dist_pkgdata_DATA = \
src/kbd-model-map
dist_noinst_SCRIPT = \
src/generate-kbd-model-map
# ------------------------------------------------------------------------------
systemd_journald_SOURCES = \
src/journal/journald.c \
src/journal/sd-journal.c \
......@@ -956,68 +980,111 @@ systemd_journalctl_LDADD += \
$(XZ_LIBS)
endif
systemd_stdout_syslog_bridge_SOURCES = \
src/stdout-syslog-bridge.c \
src/tcpwrap.c
test_journal_SOURCES = \
src/journal/test-journal.c \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/lookup3.c \
src/journal/journal-send.c \
src/sd-id128.c
systemd_stdout_syslog_bridge_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(LIBWRAP_LIBS)
test_journal_LDADD = \
libsystemd-basic.la
systemd_initctl_SOURCES = \
src/initctl.c \
src/dbus-common.c
if HAVE_XZ
test_journal_SOURCES += \
src/journal/compress.c
systemd_initctl_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
test_journal_CFLAGS = \
$(XZ_CFLAGS)
systemd_initctl_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la \
$(DBUS_LIBS)
test_journal_LDADD += \
$(XZ_LIBS)
endif
systemd_update_utmp_SOURCES = \
src/update-utmp.c \
src/dbus-common.c \
src/utmp-wtmp.c
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/compress.c \
src/journal/lookup3.c \
src/journal/journal-send.c
systemd_update_utmp_CFLAGS = \
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
$(DBUS_CFLAGS) \
$(AUDIT_CFLAGS)
$(XZ_CFLAGS) \
-fvisibility=hidden
systemd_update_utmp_LDADD = \
libsystemd_journal_la_LDFLAGS = \
-shared \
-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-basic.la \
$(DBUS_LIBS) \
$(AUDIT_LIBS)
libsystemd-id128.la \
$(XZ_LIBS)
systemd_random_seed_SOURCES = \
src/random-seed.c
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
mkdir -p $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
fi
systemd_random_seed_CFLAGS = \
$(AM_CFLAGS)
INSTALL_EXEC_HOOKS += \
libsystemd-journal-install-hook
systemd_random_seed_LDADD = \
libsystemd-basic.la
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
systemd_shutdownd_SOURCES = \
src/utmp-wtmp.c \
src/shutdownd.c
UNINSTALL_EXEC_HOOKS += \
libsystemd-journal-uninstall-hook
systemd_shutdownd_CFLAGS = \
$(AM_CFLAGS)
noinst_PROGRAMS += \
test-journal
systemd_shutdownd_LDADD = \
libsystemd-basic.la \
libsystemd-daemon.la
pkginclude_HEADERS += \
src/journal/sd-journal.h
dist_pkgdata_DATA = \
src/kbd-model-map
lib_LTLIBRARIES += \
libsystemd-journal.la
dist_noinst_SCRIPT = \
src/generate-kbd-model-map
rootlibexec_PROGRAMS += \
systemd-journald
rootbin_PROGRAMS += \
systemd-journalctl
dist_systemunit_DATA += \
units/systemd-journald.socket
nodist_systemunit_DATA += \
units/systemd-journald.service
pkgconfiglib_DATA += \
src/journal/libsystemd-journal.pc
journal-install-data-hook:
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-journald.socket && \
$(LN_S) ../systemd-journald.socket )
INSTALL_DATA_HOOKS += \
journal-install-data-hook
EXTRA_DIST += \
src/journal/journal-def.h \
src/journal/journal-internal.h \
src/journal/journal-file.h \
src/journal/lookup3.h \
src/journal/compress.h \
src/journal/journal-rate-limit.h \
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
......@@ -1848,41 +1915,6 @@ libsystemd-id128-install-hook:
libsystemd-id128-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
src/journal/journal-file.c \
src/journal/compress.c \
src/journal/lookup3.c \
src/journal/journal-send.c
libsystemd_journal_la_CFLAGS = \
$(AM_CFLAGS) \
$(XZ_CFLAGS) \
-fvisibility=hidden
libsystemd_journal_la_LDFLAGS = \
-shared \
-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-basic.la \
libsystemd-id128.la \
$(XZ_LIBS)
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libsystemd-journal-install-hook:
if test "$(libdir)" != "$(rootlibdir)"; then \
mkdir -p $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libsystemd-journal.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libsystemd-journal.so && \
mv $(DESTDIR)$(libdir)/libsystemd-journal.so.* $(DESTDIR)$(rootlibdir); \
fi
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
$(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
......@@ -2078,12 +2110,11 @@ systemd-install-data-hook:
rm -f user && \
$(LN_S) $(pkgsysconfdir)/user user )
( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket systemd-journald.socket && \
rm -f systemd-initctl.socket systemd-stdout-syslog-bridge.socket systemd-shutdownd.socket syslog.socket && \
$(LN_S) ../systemd-stdout-syslog-bridge.socket systemd-stdout-syslog-bridge.socket && \
$(LN_S) ../systemd-initctl.socket systemd-initctl.socket && \
$(LN_S) ../systemd-shutdownd.socket systemd-shutdownd.socket && \
$(LN_S) ../syslog.socket syslog.socket && \
$(LN_S) ../systemd-journald.socket )
$(LN_S) ../syslog.socket syslog.socket )
( cd $(DESTDIR)$(systemunitdir)/runlevel1.target.wants && \
rm -f systemd-update-utmp-runlevel.service && \
$(LN_S) ../systemd-update-utmp-runlevel.service systemd-update-utmp-runlevel.service )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment