X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=b6d330696af27c18a473a71547811d1f9e6e10fc;hb=783162123dbac43d5b7a3fab9d4f11dcf86d06e1;hp=680dd6597ef4e742c1127e6128a4b4935402ab11;hpb=f432bb914499e2c28b43f592bb273f0a8664f352;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 680dd6597..b6d330696 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -177,7 +177,7 @@ define move-to-rootlibdir
 		$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
 		so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
 		so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
-		ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+		$(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
 		mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
 	fi
 endef
@@ -652,8 +652,6 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/watchdog.h \
 	src/shared/spawn-ask-password-agent.c \
 	src/shared/spawn-ask-password-agent.h \
-	src/shared/specifier.c \
-	src/shared/specifier.h \
 	src/shared/replace-var.c \
 	src/shared/replace-var.h \
 	src/shared/spawn-polkit-agent.c \
@@ -697,7 +695,9 @@ libsystemd_units_la_SOURCES = \
 	src/shared/install-printf.c \
 	src/shared/install-printf.h \
 	src/shared/path-lookup.c \
-	src/shared/path-lookup.h
+	src/shared/path-lookup.h \
+	src/shared/specifier.c \
+	src/shared/specifier.h
 
 libsystemd_units_la_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1235,6 +1235,7 @@ test_strv_SOURCES = \
 
 test_strv_LDADD = \
 	libsystemd-shared.la \
+	libsystemd-units.la \
 	libsystemd-id128-internal.la
 
 test_strxcpyx_SOURCES = \
@@ -2877,7 +2878,8 @@ if ENABLE_BOOTCHART
 systemd_bootchart_SOURCES = \
 	src/bootchart/bootchart.c \
 	src/bootchart/bootchart.h \
-	src/bootchart/log.c \
+	src/bootchart/store.c \
+	src/bootchart/store.h \
 	src/bootchart/svg.c
 
 systemd_bootchart_LDADD = \
@@ -3678,38 +3680,38 @@ XSLTPROC_FLAGS = \
 	--nonet \
 	--stringparam man.output.quietly 1 \
 	--stringparam funcsynopsis.style ansi \
-	--stringparam man.th.extra1.suppress 1 \
 	--stringparam man.authors.section.enabled 0 \
-	--stringparam man.copyright.section.enabled 0
+	--stringparam man.copyright.section.enabled 0 \
+	--stringparam systemd.version $(VERSION)
 
 XSLTPROC_PROCESS_MAN = \
 	$(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
-	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
 
 XSLTPROC_PROCESS_HTML = \
 	$(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
 	$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
-man/%.1: man/%.xml
+man/%.1: man/%.xml man/custom-man.xsl
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.3: man/%.xml
+man/%.3: man/%.xml man/custom-man.xsl
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.5: man/%.xml
+man/%.5: man/%.xml man/custom-man.xsl
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.7: man/%.xml
+man/%.7: man/%.xml man/custom-man.xsl
 	$(XSLTPROC_PROCESS_MAN)
 
-man/%.8: man/%.xml
+man/%.8: man/%.xml man/custom-man.xsl
 	$(XSLTPROC_PROCESS_MAN)
 
 man/%.html: man/%.xml man/custom-html.xsl
 	$(XSLTPROC_PROCESS_HTML)
 
 define html-alias
-	$(AM_V_LN)$(LN_S) $(notdir $<) $@
+	$(AM_V_LN)$(LN_S) -f $(notdir $<) $@
 endef
 
 endif