Author: paul
Date: 2007-08-23 18:45:59 +0200 (Thu, 23 Aug 2007)
New Revision: 7526
Log:
r29269@polar: paul | 2007-08-23 11:37:56 -0500
Parameterized manpage target rules so that the machinery previously
located in individual Makefiles can be placed in the make.d/xml-man
module file.
Modified:
trunk/make.d/xml-man
trunk/mysqltest/Makefile
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
trunk/refman-5.2/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29258
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24002
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:29269
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:24002
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:19696
Modified: trunk/make.d/xml-man
===================================================================
--- trunk/make.d/xml-man 2007-08-23 14:56:09 UTC (rev 7525)
+++ trunk/make.d/xml-man 2007-08-23 16:45:59 UTC (rev 7526)
Changed blocks: 2, Lines Added: 16, Lines Deleted: 6; 1510 bytes
@@ -1,6 +1,14 @@
# Convert DocBook -> Unix manpage format
# (Language sensitive)
+# The %.man target processes %.xml, generates a bunch of xxx.[1-8] files in
+# the current directory, and touches %.man to indicate that the target has
+# been built.
+
+# The man target requires MAIN_DOC_BASENAME to be set and creates a
+# "man" directory containing fixed-up main-document manpages that have
+# been post-processed by fixup-manpages.pl.
+
%.man: %-manprepped.xml $(MYSQL_MAN_XSL_DEPS)
$(RM) *.[1-8]
$(XSLTPROC) \
@@ -9,13 +17,15 @@
$<
echo $@ has been made > $@
-# The only file listed here for the clean target is the target name. The
-# manpage names are not listed because they can vary quite a bit. Instead,
-# list the names of the manpages to be cleaned in the main Makefile, which
-# is where you know exactly what those pages are.
+man: $(MAIN_DOC_BASENAME).man $(FIXUP_MANPAGES)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ $(FIXUP_MANPAGES) --destdir=$@-tmp *.[1-8]
+ mv $@-tmp $@
clean::
- $(RM) *.man
+ $(RM) -r *.[1-8] *.man man man-tmp
help::
- @echo "make file.man - generate Unix manpages from file.xml"
+ @echo "make file.man - generate preliminary Unix manpages from file.xml"
+ @echo "make man - generate final Unix manpages from $(MAIN_DOC_BASENAME).xml"
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2007-08-23 14:56:09 UTC (rev 7525)
+++ trunk/mysqltest/Makefile 2007-08-23 16:45:59 UTC (rev 7526)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 15; 814 bytes
@@ -33,22 +33,7 @@
# Files for which to generate dependencies
DEPEND_FILES = mysqltest.xml
-# Manual page generation
-# mysqltest.man target processes mysqltest.xml and generates a bunch of
-# xxx.1 files in the current directory. These get copied to the
-# man-tmp directory and post-processed by fix-manpages.pl. Then
-# man-tmp is renamed to man, the final target name.
-
-man: mysqltest.man
- -$(RM) -r $@ $@-tmp
- mkdir $@-tmp
- $(FIXUP_MANPAGES) --destdir=$@-tmp *.1
- mv $@-tmp $@
-
clean::
- $(RM) -r *.1 man man-tmp
-
-clean::
$(RM) mysqltest.txt
# Import document dependency specifications
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2007-08-23 14:56:09 UTC (rev 7525)
+++ trunk/refman-4.1/Makefile 2007-08-23 16:45:59 UTC (rev 7526)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 15; 785 bytes
@@ -43,21 +43,6 @@
clean::
$(RM) manual.txt
-# Manual page generation
-# manual.man target processes manual.xml and generates a bunch of
-# xxx.1 files in the current directory. These get copied to the
-# man-tmp directory and post-processed by fix-manpages.pl. Then
-# man-tmp is renamed to man, the final target name.
-
-man: manual.man
- -$(RM) -r $@ $@-tmp
- mkdir $@-tmp
- $(FIXUP_MANPAGES) --destdir=$@-tmp *.[1-8]
- mv $@-tmp $@
-
-clean::
- $(RM) -r *.[1-8] man man-tmp
-
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2007-08-23 14:56:09 UTC (rev 7525)
+++ trunk/refman-5.0/Makefile 2007-08-23 16:45:59 UTC (rev 7526)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 15; 785 bytes
@@ -45,21 +45,6 @@
clean::
$(RM) manual.txt
-# Manual page generation
-# manual.man target processes manual.xml and generates a bunch of
-# xxx.1 files in the current directory. These get copied to the
-# man-tmp directory and post-processed by fix-manpages.pl. Then
-# man-tmp is renamed to man, the final target name.
-
-man: manual.man
- -$(RM) -r $@ $@-tmp
- mkdir $@-tmp
- $(FIXUP_MANPAGES) --destdir=$@-tmp *.[1-8]
- mv $@-tmp $@
-
-clean::
- $(RM) -r *.[1-8] man man-tmp
-
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2007-08-23 14:56:09 UTC (rev 7525)
+++ trunk/refman-5.1/Makefile 2007-08-23 16:45:59 UTC (rev 7526)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 15; 785 bytes
@@ -46,21 +46,6 @@
clean::
$(RM) manual.txt
-# Manual page generation
-# manual.man target processes manual.xml and generates a bunch of
-# xxx.1 files in the current directory. These get copied to the
-# man-tmp directory and post-processed by fix-manpages.pl. Then
-# man-tmp is renamed to man, the final target name.
-
-man: manual.man
- -$(RM) -r $@ $@-tmp
- mkdir $@-tmp
- $(FIXUP_MANPAGES) --destdir=$@-tmp *.[1-8]
- mv $@-tmp $@
-
-clean::
- $(RM) -r *.[1-8] man man-tmp
-
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
Modified: trunk/refman-5.2/Makefile
===================================================================
--- trunk/refman-5.2/Makefile 2007-08-23 14:56:09 UTC (rev 7525)
+++ trunk/refman-5.2/Makefile 2007-08-23 16:45:59 UTC (rev 7526)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 15; 785 bytes
@@ -46,21 +46,6 @@
clean::
$(RM) manual.txt
-# Manual page generation
-# manual.man target processes manual.xml and generates a bunch of
-# xxx.1 files in the current directory. These get copied to the
-# man-tmp directory and post-processed by fix-manpages.pl. Then
-# man-tmp is renamed to man, the final target name.
-
-man: manual.man
- -$(RM) -r $@ $@-tmp
- mkdir $@-tmp
- $(FIXUP_MANPAGES) --destdir=$@-tmp *.[1-8]
- mv $@-tmp $@
-
-clean::
- $(RM) -r *.[1-8] man man-tmp
-
# Help-table content generation.
fill_help_tables.sql: manual.help $(FILL_HELP_TABLES2)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7526 - in trunk: . make.d mysqltest refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 23 Aug |
