journald: parse configuration file

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b778b1a2c66f9ce7bd2825068f124c2ca549e9d8..09df759d0e5d0997d51ef79041fb5560d2352c7e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1171,6 +1171,9 @@ systemd_journald_SOURCES = \
        src/acl-util.c \
        src/cgroup-util.c
 
+nodist_systemd_journald_SOURCES = \
+        src/journal/journald-gperf.c
+
 systemd_journald_CFLAGS = \
        $(AM_CFLAGS) \
        $(ACL_CFLAGS)
@@ -1203,6 +1206,7 @@ if HAVE_XZ
 systemd_journalctl_SOURCES += \
        src/journal/compress.c
 systemd_journalctl_CFLAGS = \
+        $(AM_CFLAGS) \
        $(XZ_CFLAGS)
 systemd_journalctl_LDADD += \
        $(XZ_LIBS)
@@ -1224,6 +1228,7 @@ test_journal_SOURCES += \
        src/journal/compress.c
 
 test_journal_CFLAGS = \
+        $(AM_CFLAGS) \
        $(XZ_CFLAGS)
 
 test_journal_LDADD += \
@@ -1233,13 +1238,11 @@ endif
 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 = \
@@ -1249,8 +1252,18 @@ libsystemd_journal_la_LDFLAGS = \
 
 libsystemd_journal_la_LIBADD = \
        libsystemd-basic.la \
-       libsystemd-id128.la \
+       libsystemd-id128.la
+
+if HAVE_XZ
+libsystemd_journal_la_SOURCES += \
+       src/journal/compress.c
+
+libsystemd_journal_la_CFLAGS += \
+       $(XZ_CFLAGS)
+
+libsystemd_journal_la_LIBADD += \
        $(XZ_LIBS)
+endif
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libsystemd-journal-install-hook:
@@ -1292,10 +1305,15 @@ dist_systemunit_DATA += \
 nodist_systemunit_DATA += \
        units/systemd-journald.service
 
+dist_pkgsysconf_DATA += \
+       src/journal/systemd-journald.conf
+
 pkgconfiglib_DATA += \
        src/journal/libsystemd-journal.pc
 
 journal-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/sockets.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
                rm -f systemd-journald.socket && \
                $(LN_S) ../systemd-journald.socket )
@@ -1312,7 +1330,11 @@ EXTRA_DIST += \
        src/journal/journal-rate-limit.h \
        src/journal/libsystemd-journal.pc.in \
        src/journal/libsystemd-journal.sym \
-       units/systemd-journald.service.in
+       units/systemd-journald.service.in \
+        src/journal/journald-gperf.gperf
+
+CLEANFILES += \
+        src/journal/journald-gperf.c
 
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
@@ -1335,7 +1357,8 @@ nodist_systemunit_DATA += \
 binfmt-install-data-hook:
        $(MKDIR_P) -m 0755 \
                $(DESTDIR)$(prefix)/lib/binfmt.d \
-               $(DESTDIR)$(sysconfdir)/binfmt.d
+               $(DESTDIR)$(sysconfdir)/binfmt.d \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f systemd-binfmt.service \
                        proc-sys-fs-binfmt_misc.automount && \
@@ -1367,6 +1390,8 @@ nodist_systemunit_DATA += \
        units/systemd-vconsole-setup.service
 
 vconsole-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f systemd-vconsole-setup.service && \
                $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service )
@@ -1471,6 +1496,9 @@ systemd_random_seed_LDADD = \
        libsystemd-basic.la
 
 randomseed-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/shutdown.target.wants && \
                rm -f systemd-random-seed-save.service && \
                $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service )
@@ -1515,6 +1543,8 @@ systemd_cryptsetup_generator_LDADD = \
        libsystemd-basic.la
 
 cryptsetup-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/sysinit.target.wants
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
                rm -f cryptsetup.target && \
                $(LN_S) ../cryptsetup.target cryptsetup.target )
@@ -1856,6 +1886,8 @@ polkitpolicy_in_files += \
        src/login/org.freedesktop.login1.policy.in
 
 logind-install-data-hook:
+       $(MKDIR_P) -m 0755 \
+               $(DESTDIR)$(systemunitdir)/multi-user.target.wants
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f dbus-org.freedesktop.login1.service && \
                $(LN_S) systemd-logind.service dbus-org.freedesktop.login1.service)