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

diff --git a/docs/reference/gio/Makefile.am b/docs/reference/gio/Makefile.am
index fc02b6f..49f726b 100644 (file)
--- 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 b5626ba..ac2beb0 100644 (file)
--- 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 bfd4cd7..7483bec 100644 (file)
--- 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