[systemd-commits] 2 commits - Makefile.am

Lennart Poettering lennart at kemper.freedesktop.org
Wed Jan 4 10:37:54 PST 2012


 Makefile.am |   30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

New commits:
commit 3606df64abfa79e8fad7bd75c8634c116a6f1c96
Author: Michał Górny <mgorny at gentoo.org>
Date:   Wed Jan 4 19:01:58 2012 +0100

    build-sys: Fix missing directories with parallel 'make install'.

diff --git a/Makefile.am b/Makefile.am
index 7962db0..fe54ead 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1306,6 +1306,8 @@ 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 )
@@ -1345,7 +1347,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 && \
@@ -1377,6 +1380,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 )
@@ -1481,6 +1486,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 )
@@ -1525,6 +1533,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 )
@@ -1866,6 +1876,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)

commit 96d1efbabeecef9a7e079e5b92d9ee04619cfa65
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jan 4 19:36:45 2012 +0100

    journal: fix XZ build flags

diff --git a/Makefile.am b/Makefile.am
index b778b1a..7962db0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1203,6 +1203,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 +1225,7 @@ test_journal_SOURCES += \
 	src/journal/compress.c
 
 test_journal_CFLAGS = \
+        $(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 test_journal_LDADD += \
@@ -1233,13 +1235,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 +1249,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:



More information about the systemd-commits mailing list