man: Fix out-of-source manpage builds.

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 651b37df0c0fb0c4dd798f8db74a97e2f4f33997..b778b1a2c66f9ce7bd2825068f124c2ca549e9d8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -98,7 +98,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 +924,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 +934,7 @@ systemctl_CFLAGS = \
 systemctl_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
+       libsystemd-journal.la \
        $(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
@@ -1175,6 +1178,7 @@ systemd_journald_CFLAGS = \
 systemd_journald_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la \
+       libsystemd-login.la \
        $(ACL_LIBS)
 
 if HAVE_XZ
@@ -1188,14 +1192,12 @@ 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 += \
@@ -1910,7 +1912,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 +1927,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_session.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 +2051,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