X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=7b1f17f65a944f18397b52711cc1d48c17af91a0;hp=d85eb702c640755a6d68d3a4145d1e659bbefa91;hb=9f06e912f6a0db45c80d41e94eea65caae7a7c90;hpb=f6354e8c113e9e6e63f4c517b9a2dbccacb9af64

diff --git a/Makefile.am b/Makefile.am
index d85eb702c..7b1f17f65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,17 +104,18 @@ UNINSTALL_EXEC_HOOKS =
 INSTALL_DATA_HOOKS =
 UNINSTALL_DATA_HOOKS =
 DISTCLEAN_LOCAL_HOOKS =
+CLEAN_LOCAL_HOOKS =
 pkginclude_HEADERS =
 noinst_LTLIBRARIES =
 lib_LTLIBRARIES =
 include_HEADERS =
+noinst_DATA =
 pkgconfiglib_DATA =
 polkitpolicy_in_in_files =
 polkitpolicy_in_files =
 polkitpolicy_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
-dist_man_MANS =
 dist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
@@ -260,6 +261,10 @@ AM_V_GPERF = $(AM_V_GPERF_$(V))
 AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
 AM_V_GPERF_0 = @echo "  GPERF   " $@;
 
+AM_V_LN = $(AM_V_LN_$(V))
+AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
+AM_V_LN_0 = @echo "  LN      " $@;
+
 # ------------------------------------------------------------------------------
 rootbin_PROGRAMS = \
 	systemctl \
@@ -504,29 +509,44 @@ include Makefile-man.am
 
 XML_FILES = \
 	${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+HTML_FILES = \
+	${XML_FILES:.xml=.html}
+HTML_ALIAS = \
+	${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}}
 
 if ENABLE_MANPAGES
 man_MANS = \
 	$(MANPAGES) \
 	$(MANPAGES_ALIAS)
 
-noinst_DATA = \
-	${XML_FILES:.xml=.html}
+noinst_DATA += \
+	$(HTML_FILES) \
+	$(HTML_ALIAS)
 
 CLEANFILES += \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS) \
-	${XML_FILES:.xml=.html}
+	$(man_MANS) \
+	$(HTML_FILES) \
+	$(HTML_ALIAS)
+
+docs/html/man:
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_LN)$(LN_S) -f ../../man $@
+
+noinst_DATA += \
+	docs/html/man
+
+CLEANFILES += \
+	docs/html/man
 
 if HAVE_PYTHON
+man/index.html: man/systemd.index.html
+	$(AM_V_LN)$(LN_S) -f systemd.index.html $@
+
 noinst_DATA += \
 	man/index.html
 
 CLEANFILES += \
-       man/index.html
-
-man/index.html:
-	$(AM_V_GEN)$(LN_S) -f systemd.index.html $@
+	man/index.html
 
 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
 
@@ -549,15 +569,19 @@ EXTRA_DIST += \
 	man/index.html \
 	man/systemd.directives.xml
 
+CLEANFILES += \
+	man/systemd.index.xml \
+	man/systemd.directives.xml
+
 endif
 
 endif
 
 EXTRA_DIST += \
 	$(XML_FILES) \
-	${XML_FILES:.xml=.html} \
-	$(MANPAGES) \
-	$(MANPAGES_ALIAS) \
+	$(HTML_FILES) \
+	$(HTML_ALIAS) \
+	$(dist_MANS) \
 	make-man-index.py \
 	make-directive-index.py
 
@@ -1614,6 +1638,10 @@ EXTRA_DIST += \
 if ENABLE_GTK_DOC
 SUBDIRS += \
 	docs/libudev
+
+noinst_DATA += \
+	docs/html/libudev \
+	docs/html/gudev
 endif
 
 include_HEADERS += \
@@ -1656,7 +1684,17 @@ EXTRA_DIST += \
 	src/libudev/libudev.sym
 
 CLEANFILES += \
-	src/libudev/libudev.pc
+	src/libudev/libudev.pc \
+	docs/html/libudev \
+	docs/html/gudev
+
+docs/html/libudev:
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_LN)$(LN_S) -f ../libudev/html $@
+
+docs/html/gudev:
+	$(AM_V_at)$(MKDIR_P) $(dir $@)
+	$(AM_V_LN)$(LN_S) -f ../gudev/html $@
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-hook:
@@ -3511,14 +3549,13 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
 
 BUILT_SOURCES += \
 	src/python-systemd/id128-constants.h
-endif
 
 PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER)
+SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
 sphinx-%:
 	$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
-	$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/python-systemd/
-	$(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/python-systemd/
+	$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
+	$(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
 
 destdir-sphinx: all
 	dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
@@ -3526,6 +3563,13 @@ destdir-sphinx: all
 	        $(MAKE) DESTDIR="$$dir" sphinx-html && \
 		rm -rf "$$dir"
 
+endif
+
+CLEAN_LOCAL_HOOKS += clean-sphinx
+
+clean-sphinx:
+	-rm -rf docs/html/python-systemd/
+
 # ------------------------------------------------------------------------------
 SED_PROCESS = \
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -3624,7 +3668,6 @@ EXTRA_DIST += \
 CLEANFILES += \
 	$(nodist_systemunit_DATA) \
 	$(nodist_userunit_DATA) \
-	$(nodist_man_MANS) \
 	$(pkgconfigdata_DATA) \
 	$(pkgconfiglib_DATA) \
 	$(nodist_polkitpolicy_DATA)
@@ -3665,9 +3708,10 @@ man/%.8: man/%.xml
 man/%.html: man/%.xml man/custom-html.xsl
 	$(XSLTPROC_PROCESS_HTML)
 
-CLEANFILES += \
-	$(dist_man_MANS) \
-	${XML_FILES:.xml=.html}
+define html-alias
+	$(AM_V_LN)$(LN_S) $(notdir $<) $@
+endef
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -3804,7 +3848,7 @@ install-data-hook: $(INSTALL_DATA_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
-clean-local:
+clean-local: $(CLEAN_LOCAL_HOOKS)
 	rm -rf $(abs_srcdir)/install-tree
 	rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
               $(abs_srcdir)/hwdb/iab.txt