chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
html: make python docs look more like the rest
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index f18cccd070d36ba935f84da93058670ac002cf18..7b1f17f65a944f18397b52711cc1d48c17af91a0 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-32,16
+32,16
@@
SUBDIRS = . po
.SECONDARY:
LIBUDEV_CURRENT=3
.SECONDARY:
LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=
1
+LIBUDEV_REVISION=
2
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
LIBUDEV_AGE=2
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=
3
-LIBSYSTEMD_LOGIN_REVISION=
11
-LIBSYSTEMD_LOGIN_AGE=
3
+LIBSYSTEMD_LOGIN_CURRENT=
4
+LIBSYSTEMD_LOGIN_REVISION=
0
+LIBSYSTEMD_LOGIN_AGE=
4
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
LIBSYSTEMD_DAEMON_CURRENT=0
LIBSYSTEMD_DAEMON_REVISION=7
@@
-51,9
+51,9
@@
LIBSYSTEMD_ID128_CURRENT=0
LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_ID128_REVISION=17
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=
7
-LIBSYSTEMD_JOURNAL_REVISION=
1
-LIBSYSTEMD_JOURNAL_AGE=
7
+LIBSYSTEMD_JOURNAL_CURRENT=
8
+LIBSYSTEMD_JOURNAL_REVISION=
0
+LIBSYSTEMD_JOURNAL_AGE=
8
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
@@
-104,17
+104,18
@@
UNINSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
+CLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
include_HEADERS =
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 =
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 =
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_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 \
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
@@
-318,7
+323,6
@@
systemd_analyze_LDADD = \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
- shell-completion/bash/systemd-coredumpctl \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
shell-completion/bash/udevadm
dist_tmpfiles_DATA = \
@@
-383,11
+387,7
@@
dist_systemunit_DATA = \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-parse-etc.service \
- units/initrd-cleanup.service \
- units/initrd-switch-root.target \
- units/initrd-udevadm-cleanup-db.service \
- units/initrd-switch-root.service
+ units/initrd-switch-root.target
nodist_systemunit_DATA = \
units/getty@.service \
nodist_systemunit_DATA = \
units/getty@.service \
@@
-419,7
+419,11
@@
nodist_systemunit_DATA = \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/debug-shell.service
+ units/debug-shell.service \
+ units/initrd-parse-etc.service \
+ units/initrd-cleanup.service \
+ units/initrd-udevadm-cleanup-db.service \
+ units/initrd-switch-root.service
dist_userunit_DATA = \
units/user/default.target \
dist_userunit_DATA = \
units/user/default.target \
@@
-461,6
+465,10
@@
EXTRA_DIST += \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
+ units/initrd-parse-etc.service.in \
+ units/initrd-cleanup.service.in \
+ units/initrd-udevadm-cleanup-db.service.in \
+ units/initrd-switch-root.service.in \
introspect.awk \
man/custom-html.xsl
introspect.awk \
man/custom-html.xsl
@@
-501,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)}}}}}
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)
if ENABLE_MANPAGES
man_MANS = \
$(MANPAGES) \
$(MANPAGES_ALIAS)
-noinst_DATA = \
- ${XML_FILES:.xml=.html}
+noinst_DATA += \
+ $(HTML_FILES) \
+ $(HTML_ALIAS)
CLEANFILES += \
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
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 += \
noinst_DATA += \
man/index.html
CLEANFILES += \
- man/index.html
-
-man/index.html:
- $(AM_V_GEN)$(LN_S) systemd.index.html $@
+ man/index.html
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
@@
-546,15
+569,19
@@
EXTRA_DIST += \
man/index.html \
man/systemd.directives.xml
man/index.html \
man/systemd.directives.xml
+CLEANFILES += \
+ man/systemd.index.xml \
+ man/systemd.directives.xml
+
endif
endif
EXTRA_DIST += \
$(XML_FILES) \
endif
endif
EXTRA_DIST += \
$(XML_FILES) \
- $
{XML_FILES:.xml=.html}
\
- $(
MANPAGE
S) \
- $(
MANPAGES_ALIA
S) \
+ $
(HTML_FILES)
\
+ $(
HTML_ALIA
S) \
+ $(
dist_MAN
S) \
make-man-index.py \
make-directive-index.py
make-man-index.py \
make-directive-index.py
@@
-843,6
+870,8
@@
libsystemd_core_la_SOURCES = \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
+ src/core/smack-setup.c \
+ src/core/smack-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
@@
-1609,6
+1638,10
@@
EXTRA_DIST += \
if ENABLE_GTK_DOC
SUBDIRS += \
docs/libudev
if ENABLE_GTK_DOC
SUBDIRS += \
docs/libudev
+
+noinst_DATA += \
+ docs/html/libudev \
+ docs/html/gudev
endif
include_HEADERS += \
endif
include_HEADERS += \
@@
-1651,7
+1684,17
@@
EXTRA_DIST += \
src/libudev/libudev.sym
CLEANFILES += \
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:
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libudev-install-hook:
@@
-2374,13
+2417,6
@@
journalctl_LDADD += \
$(QRENCODE_LIBS)
endif
$(QRENCODE_LIBS)
endif
-systemd_coredumpctl_SOURCES = \
- src/journal/coredumpctl.c
-
-systemd_coredumpctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-journal.la
-
test_journal_SOURCES = \
src/journal/test-journal.c
test_journal_SOURCES = \
src/journal/test-journal.c
@@
-2569,9
+2605,16
@@
libsystemd_journal_internal_la_LIBADD += \
$(GCRYPT_LIBS)
endif
$(GCRYPT_LIBS)
endif
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
+# move lib from $(libdir) to $(rootlibdir) and update devel link, if
+# needed. Also, grant read access to new journal files to members of
+# "adm" and "wheel".
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
+ -$(MKDIR_P) $(DESTDIR)/var/log/journal
+ -chown 0:0 $(DESTDIR)/var/log/journal
+ -chmod 755 $(DESTDIR)/var/log/journal
+ -setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
+ -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
libsystemd-journal-uninstall-hook:
rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
@@
-2625,7
+2668,6
@@
rootbin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
journalctl
bin_PROGRAMS += \
- systemd-coredumpctl \
systemd-cat
dist_systemunit_DATA += \
systemd-cat
dist_systemunit_DATA += \
@@
-2717,6
+2759,19
@@
endif
rootlibexec_PROGRAMS += \
systemd-coredump
rootlibexec_PROGRAMS += \
systemd-coredump
+systemd_coredumpctl_SOURCES = \
+ src/journal/coredumpctl.c
+
+systemd_coredumpctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal.la
+
+bin_PROGRAMS += \
+ systemd-coredumpctl
+
+dist_bashcompletion_DATA += \
+ shell-completion/bash/systemd-coredumpctl
+
sysctl_DATA = \
sysctl.d/coredump.conf
sysctl_DATA = \
sysctl.d/coredump.conf
@@
-3494,21
+3549,27
@@
src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
-endif
PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
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; }
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)/
man
/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/
man
/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
destdir-sphinx: all
- dir="
`mktemp -d /tmp/systemd-install.XXXXXX`
" && \
+ dir="
$$(mktemp -d /tmp/systemd-install.XXXXXX)
" && \
$(MAKE) DESTDIR="$$dir" install && \
$(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
$(MAKE) DESTDIR="$$dir" install && \
$(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 $@) && \
# ------------------------------------------------------------------------------
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@
-3607,7
+3668,6
@@
EXTRA_DIST += \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(nodist_man_MANS) \
$(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
$(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
@@
-3648,9
+3708,10
@@
man/%.8: man/%.xml
man/%.html: man/%.xml man/custom-html.xsl
$(XSLTPROC_PROCESS_HTML)
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
# ------------------------------------------------------------------------------
endif
# ------------------------------------------------------------------------------
@@
-3787,7
+3848,7
@@
install-data-hook: $(INSTALL_DATA_HOOKS)
distclean-local: $(DISTCLEAN_LOCAL_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
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
@@
-3837,7
+3898,7
@@
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
gtkdoc-rebase --html-dir=docs/gudev/html --online
rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -av --delete --omit-dir-times
man/python-systemd/ $(www_target)/man
/python-systemd/
+ rsync -av --delete --omit-dir-times
docs/python-systemd/ $(www_target)
/python-systemd/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"