mirror of
https://github.com/cockpit-project/cockpit.git
synced 2026-11-03 21:49:50 -09:00
build: Fix make dist builds with disabling ssh/polkit/docs
The contents of the tarball should not depend on the configure options.
Still ship all our files even when configuring with
`--disable-{ssh,polkit,docs}`.
The Makefile already does the right thing for `--disable-pcp`, but this
was not done consistently.
This commit is contained in:
Martin Pitt
Martin Pitt
parent
b0c8efbd3e
commit
0691a34a46
6 changed files with 44 additions and 35 deletions
|
|
@ -290,10 +290,6 @@ recheck-memory: valgrind-suppressions
|
|||
|
||||
if ENABLE_DOC
|
||||
|
||||
include doc/Makefile-doc.am
|
||||
include doc/guide/Makefile-guide.am
|
||||
include doc/man/Makefile-man.am
|
||||
|
||||
dist-doc-hook:
|
||||
@true
|
||||
|
||||
|
|
@ -389,3 +385,6 @@ include src/tls/Makefile-tls.am
|
|||
include src/retest/Makefile.am
|
||||
include src/pam-ssh-add/Makefile.am
|
||||
include containers/Makefile.am
|
||||
include doc/Makefile-doc.am
|
||||
include doc/guide/Makefile-guide.am
|
||||
include doc/man/Makefile-man.am
|
||||
|
|
|
|||
|
|
@ -3,8 +3,12 @@ EXTRA_DIST += \
|
|||
doc/cockpit-transport.png \
|
||||
$(NULL)
|
||||
|
||||
if ENABLE_DOC
|
||||
|
||||
render-doc-images:
|
||||
inkscape --without-gui --export-area-page \
|
||||
--export-width=1280 --export-height=960 \
|
||||
--export-png=$(srcdir)/doc/cockpit-transport.png \
|
||||
$(srcdir)/doc/cockpit-transport.svg
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
GUIDE_DOCBOOK = doc/guide/cockpit-guide.xml
|
||||
|
||||
GUIDE_INCLUDES = \
|
||||
|
|
@ -80,6 +79,8 @@ EXTRA_DIST += \
|
|||
doc/guide/version.in \
|
||||
$(NULL)
|
||||
|
||||
if ENABLE_DOC
|
||||
|
||||
# we require fonts from `npm install` to build the docs
|
||||
noinst_DATA += $(GUIDE_HTML($SKIP_NODE))
|
||||
|
||||
|
|
@ -122,3 +123,5 @@ check-local::
|
|||
echo "Unexpected generated id in the documentation" >&2; \
|
||||
exit 1; \
|
||||
fi
|
||||
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,9 +1,19 @@
|
|||
man_MANS += \
|
||||
doc/man/cockpit-bridge.1 \
|
||||
EXTRA_DIST += \
|
||||
doc/man/cockpit.xml \
|
||||
doc/man/cockpit-bridge.xml \
|
||||
doc/man/cockpit-ws.xml \
|
||||
doc/man/cockpit-tls.xml \
|
||||
doc/man/cockpit-desktop.xml \
|
||||
doc/man/cockpit.conf.xml \
|
||||
doc/man/pam_cockpit_cert.xml \
|
||||
doc/man/pam_ssh_add.xml \
|
||||
doc/man/remotectl.xml \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST += \
|
||||
doc/man/cockpit-bridge.xml \
|
||||
if ENABLE_DOC
|
||||
|
||||
man_MANS += \
|
||||
doc/man/cockpit-bridge.1 \
|
||||
$(NULL)
|
||||
|
||||
man_MANS += \
|
||||
|
|
@ -17,17 +27,6 @@ man_MANS += \
|
|||
doc/man/remotectl.8 \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST += \
|
||||
doc/man/cockpit.xml \
|
||||
doc/man/cockpit-ws.xml \
|
||||
doc/man/cockpit-tls.xml \
|
||||
doc/man/cockpit-desktop.xml \
|
||||
doc/man/cockpit.conf.xml \
|
||||
doc/man/pam_cockpit_cert.xml \
|
||||
doc/man/pam_ssh_add.xml \
|
||||
doc/man/remotectl.xml \
|
||||
$(NULL)
|
||||
|
||||
MAN_PROC = $(MKDIR_P) doc/man/ && $(XSLTPROC) -nonet --param man.output.quietly 1 --output $@ \
|
||||
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
|
||||
|
||||
|
|
@ -37,3 +36,5 @@ MAN_PROC = $(MKDIR_P) doc/man/ && $(XSLTPROC) -nonet --param man.output.quietly
|
|||
$(AM_V_GEN) $(MAN_PROC)
|
||||
.xml.5:
|
||||
$(AM_V_GEN) $(MAN_PROC)
|
||||
|
||||
endif ENABLE_DOC
|
||||
|
|
|
|||
|
|
@ -255,15 +255,17 @@ EXTRA_DIST += \
|
|||
# -----------------------------------------------------------------------------
|
||||
# polkit
|
||||
|
||||
# make sure this ends up in the tarball, even with --disable-ssh
|
||||
polkit_in_files = src/bridge/org.cockpit-project.cockpit-bridge.policy.in
|
||||
EXTRA_DIST += $(polkit_in_files)
|
||||
|
||||
if WITH_POLKIT
|
||||
polkitdir = $(datadir)/polkit-1/actions
|
||||
polkit_in_files = src/bridge/org.cockpit-project.cockpit-bridge.policy.in
|
||||
polkit_DATA = $(polkit_in_files:.policy.in=.policy)
|
||||
|
||||
%.policy: %.policy.in $(PO_FILES)
|
||||
GETTEXTDATADIRS=$(srcdir)/po $(MSGFMT) --xml -d $(top_srcdir)/po --template $< --output $@
|
||||
|
||||
EXTRA_DIST += $(polkit_in_files)
|
||||
CLEANFILES += $(polkit_DATA)
|
||||
endif
|
||||
|
||||
|
|
|
|||
|
|
@ -1,3 +1,16 @@
|
|||
EXTRA_DIST += \
|
||||
src/ssh/mock_rsa_key \
|
||||
src/ssh/mock_dsa_key \
|
||||
src/ssh/test_rsa \
|
||||
src/ssh/test_rsa.pub \
|
||||
src/ssh/mock_known_hosts \
|
||||
src/ssh/mock-pid-cat \
|
||||
src/ssh/mock-bin/sss_ssh_knownhostsproxy \
|
||||
src/ssh/mock-config \
|
||||
src/ssh/invalid_known_hosts \
|
||||
src/ssh/mock_known_hosts_2 \
|
||||
$(NULL)
|
||||
|
||||
if WITH_COCKPIT_SSH
|
||||
|
||||
noinst_LIBRARIES += libcockpit-ssh.a
|
||||
|
|
@ -70,19 +83,6 @@ CLEANFILES += \
|
|||
test_rsa_key \
|
||||
$(NULL)
|
||||
|
||||
EXTRA_DIST += \
|
||||
src/ssh/mock_rsa_key \
|
||||
src/ssh/mock_dsa_key \
|
||||
src/ssh/test_rsa \
|
||||
src/ssh/test_rsa.pub \
|
||||
src/ssh/mock_known_hosts \
|
||||
src/ssh/mock-pid-cat \
|
||||
src/ssh/mock-bin/sss_ssh_knownhostsproxy \
|
||||
src/ssh/mock-config \
|
||||
src/ssh/invalid_known_hosts \
|
||||
src/ssh/mock_known_hosts_2 \
|
||||
$(NULL)
|
||||
|
||||
noinst_SCRIPTS += \
|
||||
src/ssh/mock-pid-cat \
|
||||
src/ssh/mock-bin/sss_ssh_knownhostsproxy \
|
||||
|
|
|
|||
Loading…
Reference in a new issue