X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=21d833a4fc3f0548474a72f91ae4ccb39019e456;hb=b8079ae19b41c9b61850c796dddc601b826850e0;hp=1af9cbc5a5ff92e751cc8eb472a851ca3275be3b;hpb=000a2c98860e4c1de7e1477bedf6ad216f8c5854;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 1af9cbc5a..21d833a4f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,12 +56,12 @@ usergeneratordir=$(pkglibexecdir)/user-generators
 pkgincludedir=$(includedir)/systemd
 
 # And these are the special ones for /
-rootdir=@rootdir@
-rootbindir=$(rootdir)/bin
-rootlibexecdir=$(rootdir)/lib/systemd
+rootprefix=@rootprefix@
+rootbindir=$(rootprefix)/bin
+rootlibexecdir=$(rootprefix)/lib/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 systemshutdowndir=$(rootlibexecdir)/system-shutdown
-systemunitdir=$(rootdir)/lib/systemd/system
+systemunitdir=$(rootprefix)/lib/systemd/system
 
 CLEANFILES =
 EXTRA_DIST =
@@ -89,6 +89,7 @@ AM_CPPFLAGS = \
 	-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
 	-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
 	-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
+	-DROOTPREFIX=\"$(rootprefix)\" \
 	-DRUNTIME_DIR=\"/run\" \
 	-DRANDOM_SEED=\"$(localstatedir)/lib/random-seed\" \
 	-DSYSTEMD_CRYPTSETUP_PATH=\"$(rootlibexecdir)/systemd-cryptsetup\" \
@@ -98,7 +99,8 @@ AM_CPPFLAGS = \
 	-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
 	-I $(top_srcdir)/src \
 	-I $(top_srcdir)/src/readahead \
-	-I $(top_srcdir)/src/login
+	-I $(top_srcdir)/src/login \
+	-I $(top_srcdir)/src/journal
 
 if TARGET_GENTOO
 AM_CPPFLAGS += \
@@ -923,7 +925,8 @@ systemctl_SOURCES = \
 	src/unit-name.c \
 	src/pager.c \
 	src/install.c \
-	src/spawn-agent.c
+	src/spawn-agent.c \
+        src/logs-show.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -932,6 +935,7 @@ systemctl_CFLAGS = \
 systemctl_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
+	libsystemd-journal.la \
 	$(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1168,6 +1172,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)
@@ -1175,6 +1182,7 @@ systemd_journald_CFLAGS = \
 systemd_journald_LDADD = \
 	libsystemd-basic.la \
 	libsystemd-daemon.la \
+	libsystemd-login.la \
 	$(ACL_LIBS)
 
 if HAVE_XZ
@@ -1188,19 +1196,18 @@ endif
 
 systemd_journalctl_SOURCES = \
 	src/journal/journalctl.c \
-	src/journal/sd-journal.c \
-	src/journal/journal-file.c \
-	src/journal/lookup3.c \
-	src/sd-id128.c \
-	src/pager.c
+	src/pager.c \
+        src/logs-show.c
 
 systemd_journalctl_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+        libsystemd-journal.la
 
 if HAVE_XZ
 systemd_journalctl_SOURCES += \
 	src/journal/compress.c
 systemd_journalctl_CFLAGS = \
+        $(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 systemd_journalctl_LDADD += \
 	$(XZ_LIBS)
@@ -1222,6 +1229,7 @@ test_journal_SOURCES += \
 	src/journal/compress.c
 
 test_journal_CFLAGS = \
+        $(AM_CFLAGS) \
 	$(XZ_CFLAGS)
 
 test_journal_LDADD += \
@@ -1231,13 +1239,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 = \
@@ -1247,8 +1253,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:
@@ -1290,10 +1306,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 )
@@ -1310,7 +1331,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
@@ -1333,7 +1358,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 && \
@@ -1365,6 +1391,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 )
@@ -1469,6 +1497,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 )
@@ -1513,6 +1544,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 )
@@ -1854,6 +1887,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)
@@ -1910,7 +1945,7 @@ MANPAGES_ALIAS += \
 	man/sd_session_get_uid.3 \
 	man/sd_session_get_seat.3 \
 	man/sd_pid_get_owner_uid.3 \
-	man/sd_pid_get_service.3 \
+	man/sd_pid_get_unit.3 \
 	man/sd_uid_is_on_seat.3 \
 	man/sd_uid_get_sessions.3 \
 	man/sd_uid_get_seats.3 \
@@ -1925,7 +1960,7 @@ man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3
 man/sd_session_get_uid.3: man/sd_session_is_active.3
 man/sd_session_get_seat.3: man/sd_session_is_active.3
 man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3
-man/sd_pid_get_service.3: man/sd_pid_get_session.3
+man/sd_pid_get_unit.3: man/sd_pid_get_session.3
 man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3
 man/sd_uid_get_sessions.3: man/sd_uid_get_state.3
 man/sd_uid_get_seats.3: man/sd_uid_get_state.3
@@ -2049,11 +2084,11 @@ XSLTPROC_PROCESS_MAN_IN = \
 
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) man/custom-html.xsl $<
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
 XSLTPROC_PROCESS_HTML_IN = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) man/custom-html.xsl $< && \
+	$(XSLTPROC) -o ${@:.in=} $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $< && \
 	mv ${@:.in=} $@
 
 man/%.1: man/%.xml
@@ -2362,7 +2397,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 	--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
 	--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
-	--with-rootdir=$$dc_install_base/$(rootdir)
+	--with-rootprefix=$$dc_install_base/$(rootprefix)
 
 upload: all distcheck
 	cp -v systemd-$(VERSION).tar.bz2 /home/lennart/git.fedora/systemd/