From b60168a5f5b4bcfa8f8ed175cd18a0cfaea96063 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Aug 2012 10:01:47 -0400 Subject: [PATCH] Remove man page placeholder generation I don't see a good reason for this - if man page generation is disabled, man pages are not produced, and things like 'make dist' will fail. That is simpler and better. https://bugzilla.gnome.org/show_bug.cgi?id=681336 --- docs/reference/gio/Makefile.am | 15 +-------------- docs/reference/glib/Makefile.am | 15 +-------------- docs/reference/gobject/Makefile.am | 15 +-------------- 3 files changed, 3 insertions(+), 42 deletions(-) diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am index fc02b6ff1..49f726bff 100644 --- a/docs/reference/gio/Makefile.am +++ b/docs/reference/gio/Makefile.am @@ -164,26 +164,13 @@ XSLTPROC_FLAGS = \ .xml.1: $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -dist-local-check-mans-enabled: - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi - -else - -$(man_MANS): - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@ - -dist-local-check-mans-enabled: - echo "*** --enable-man must be used in order to make dist" - false - endif CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) -dist-hook-local: dist-local-check-mans-enabled all-local +dist-hook-local: all-local gio-docs-clean: clean cd $(srcdir) && rm -rf xml html diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am index b5626ba44..ac2beb0b2 100644 --- a/docs/reference/glib/Makefile.am +++ b/docs/reference/glib/Makefile.am @@ -112,26 +112,13 @@ XSLTPROC_FLAGS = \ .xml.1: $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -dist-local-check-mans-enabled: - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi - -else - -$(man_MANS): - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@ - -dist-local-check-mans-enabled: - echo "*** --enable-man must be used in order to make dist" - false - endif CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) -dist-hook-local: dist-local-check-mans-enabled all-local +dist-hook-local: all-local glib-docs-clean: clean cd $(srcdir) && rm -rf xml html diff --git a/docs/reference/gobject/Makefile.am b/docs/reference/gobject/Makefile.am index bfd4cd722..7483becee 100644 --- a/docs/reference/gobject/Makefile.am +++ b/docs/reference/gobject/Makefile.am @@ -87,26 +87,13 @@ XSLTPROC_FLAGS = \ .xml.1: $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -dist-local-check-mans-enabled: - if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi - -else - -$(man_MANS): - echo Man generation disabled. Creating dummy $@. Configure with --enable-man to enable it. - echo Man generation disabled. Remove this file, configure with --enable-man, and rebuild > $@ - -dist-local-check-mans-enabled: - echo "*** --enable-man must be used in order to make dist" - false - endif CLEANFILES += $(man_MANS) EXTRA_DIST += $(man_MANS) -dist-hook-local: dist-local-check-mans-enabled all-local +dist-hook-local: all-local gobject-docs-clean: clean cd $(srcdir) && rm -rf xml html