[glib/wip/gapplication-22: 20/28] Clean up man page handling



commit 02a6c3759bb14d88526f9b2563003ae5419423bf
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri May 21 22:28:42 2010 -0400

    Clean up man page handling
    
    Remove all formatted man pages from git, and use the same
    Makefile fragment in all doc dirs.

 docs/reference/glib/Makefile.am          |   30 ++-
 docs/reference/glib/glib-gettextize.1    |   71 -------
 docs/reference/glib/gtester-report.1     |   44 -----
 docs/reference/glib/gtester.1            |  101 ----------
 docs/reference/gobject/Makefile.am       |   35 +++-
 docs/reference/gobject/glib-genmarshal.1 |  307 ------------------------------
 docs/reference/gobject/glib-mkenums.1    |  246 ------------------------
 docs/reference/gobject/gobject-query.1   |   83 --------
 gobject/Makefile.am                      |    2 -
 gobject/glib-genmarshal.1                |  212 --------------------
 gobject/glib-mkenums.1                   |  169 ----------------
 11 files changed, 48 insertions(+), 1252 deletions(-)
---
diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index a61110b..6c3384c 100644
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -93,18 +93,32 @@ man_MANS =		  	\
 	glib-gettextize.1 	\
 	gtester.1		\
 	gtester-report.1
+
 if ENABLE_MAN
 
-%.1 : %.xml 
-	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+.xml.1:
+	XSLTPROC@ -nonet 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
 
-BUILT_EXTRA_DIST = $(man_MANS)
+MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
+
+EXTRA_DIST += $(man_MANS)
 
-dist-hook-local: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)';				\
-	for f in $$files; do					\
-	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
-	  cp $$d/$$f $(distdir) || exit 1; done
+dist-hook-local: dist-local-check-mans-enabled glib-docs-clean 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 0c88234..5c495ea 100644
--- a/docs/reference/gobject/Makefile.am
+++ b/docs/reference/gobject/Makefile.am
@@ -67,19 +67,36 @@ EXTRA_DIST += 		\
 
 ########################################################################
 
-man_MANS = glib-mkenums.1 glib-genmarshal.1 gobject-query.1
+man_MANS = 			\
+	glib-mkenums.1 		\
+	glib-genmarshal.1 	\
+	gobject-query.1
 
 if ENABLE_MAN
 
-%.1 : %.xml 
-	@XSLTPROC@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+.xml.1:
+	XSLTPROC@ -nonet 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
 
-BUILT_EXTRA_DIST = $(man_MANS)
+MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
+
+EXTRA_DIST += $(man_MANS)
+
+dist-hook-local: dist-local-check-mans-enabled gobject-docs-clean all-local
 
-dist-hook-local: $(BUILT_EXTRA_DIST)
-	files='$(BUILT_EXTRA_DIST)';				\
-	for f in $$files; do					\
-	  if test -f $$f; then d=.; else d=$(srcdir); fi;	\
-	  cp $$d/$$f $(distdir) || exit 1; done
+gobject-docs-clean: clean
+	cd $(srcdir) && rm -rf xml html
diff --git a/gobject/Makefile.am b/gobject/Makefile.am
index 5f31e2a..9abcabc 100644
--- a/gobject/Makefile.am
+++ b/gobject/Makefile.am
@@ -235,9 +235,7 @@ EXTRA_DIST += 			\
 	makefile.msc.in 	\
 	gobject.rc.in		\
 	libgobject-gdb.py.in	\
-	glib-genmarshal.1	\
 	glib-mkenums.in		\
-	glib-mkenums.1		\
 	abicheck.sh		\
 	pltcheck.sh
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]