Author: paul
Date: 2006-07-18 22:41:19 +0200 (Tue, 18 Jul 2006)
New Revision: 2768
Log:
r11570@polar: paul | 2006-07-18 15:42:14 -0500
Update make target rules and Makefiles.
- Add help targets so that make modules are self-describing.
- Redo directory-building target rules so that if operation gets
killed in the middle, make doesn't get fooled into thinking that
the target has been built already
- Use IMAGE_FILES in Makefiles to specify image files; change make target
rules to be aware of this and use it to copy image files and remap image
paths. This change enables the abolition of override rules in the
Makefiles.
Modified:
trunk/administrator/Makefile
trunk/gui-common/Makefile
trunk/internals/Makefile
trunk/make.d/texi-info
trunk/make.d/xml-depend
trunk/make.d/xml-format
trunk/make.d/xml-help
trunk/make.d/xml-html
trunk/make.d/xml-html-chapter
trunk/make.d/xml-html-dir
trunk/make.d/xml-html-help
trunk/make.d/xml-html-section
trunk/make.d/xml-html-web
trunk/make.d/xml-html-web-single
trunk/make.d/xml-man
trunk/make.d/xml-pdf
trunk/make.d/xml-remark
trunk/make.d/xml-texi
trunk/make.d/xml-titles
trunk/make.d/xml-toc
trunk/make.d/xml-txt
trunk/make.d/xml-useless
trunk/make.d/xml-valid
trunk/make.d/xml-xhtml
trunk/make.d/xml-xhtml-chapter
trunk/make.d/xml-xhtml-dir
trunk/make.d/xml-xhtml-section
trunk/migration-toolkit/Makefile
trunk/mysqltest/Makefile
trunk/ndbapi/Makefile
trunk/proto-doc/Makefile
trunk/query-browser/Makefile
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
trunk/refman-common/Makefile
trunk/sample-data/sakila/Makefile
trunk/sample-data/world/Makefile
trunk/userguide/Makefile
trunk/workbench/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11558
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12366
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11570
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12366
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/administrator/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 37; 1770 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: administrator.depend
# Dependency list for MySQL Administrator document
@@ -35,40 +38,8 @@
administrator-prepped.xml: $(ADMINISTRATOR_SRCS)
-# Overrides for generic rules
+IMAGE_FILES = ../gui-common/images/*.png images/*.png
-administrator.html-section: administrator.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
-administrator.html-chapter: administrator.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
-administrator.html-web: administrator.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
-administrator.html-help: administrator.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/gui-common/Makefile
===================================================================
--- trunk/gui-common/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/gui-common/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 679 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.valid"
- @echo " make doc_name.format"
- @echo " make doc_name.useless"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/internals/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 801 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: internals.depend
# Dependency list for internals document
@@ -35,9 +38,6 @@
internals-prepped.xml: $(INTERNALS_SRCS)
-#%.txt: %.html
-# lynx -dump $< > $@
-
clean::
$(RM) internals.txt
Modified: trunk/make.d/texi-info
===================================================================
--- trunk/make.d/texi-info 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/texi-info 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 335 bytes
@@ -5,3 +5,6 @@
clean::
$(RM) *.info
+
+help::
+ @echo "make file.info - convert file.texi to file.info"
Modified: trunk/make.d/xml-depend
===================================================================
--- trunk/make.d/xml-depend 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-depend 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 348 bytes
@@ -36,3 +36,6 @@
clean::
$(RM) Makefile.bak
+
+help::
+ @echo "make depend - regenerate document dependencies"
Modified: trunk/make.d/xml-format
===================================================================
--- trunk/make.d/xml-format 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-format 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 361 bytes
@@ -2,3 +2,6 @@
%.format %.reformat: %.xml
$(XMLFORMAT) $<
+
+help::
+ @echo "make file.format - put file.xml in standard format"
Modified: trunk/make.d/xml-help
===================================================================
--- trunk/make.d/xml-help 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-help 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 365 bytes
@@ -21,3 +21,6 @@
clean::
$(RM) *-help.xml
$(RM) *.help
+
+help::
+ @echo "make file.help - extract help-table information from file.xml"
Modified: trunk/make.d/xml-html
===================================================================
--- trunk/make.d/xml-html 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 524 bytes
@@ -4,9 +4,12 @@
%.html: %-prepped.xml $(MYSQL_HTML_XSL_DEPS)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $*.html \
+ --output $@ \
$(MYSQL_HTML_XSL) \
$<
clean::
$(RM) *.html
+
+help::
+ @echo "make file.html - convert file.xml to HTML, single file"
Modified: trunk/make.d/xml-html-chapter
===================================================================
--- trunk/make.d/xml-html-chapter 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html-chapter 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 10; 1382 bytes
@@ -1,23 +1,30 @@
# Convert DocBook -> HTML, with one file per chapter.
# (Language sensitive)
+# If there are any image files, IMAGE_FILES must be set to name them all.
+
# Use html-section driver file, but set chunk.section.depth to 0,
# causes chunking at the chapter level.
-%.html-chapter: %.html-chapter.d
- touch $@
-
-.PRECIOUS: %.html-chapter.d
-
-%.html-chapter.d: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.html-chapter: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--param chunk.section.depth 0 \
- --output $@/ \
+ --output $@-tmp/ \
$(MYSQL_HTML_SECTION_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.html-chapter *.html-chapter.d
+ $(RM) -r *.html-chapter *.html-chapter-tmp
+
+help::
+ @echo "make file.html-chapter - convert file.xml to HTML, 1 file/chapter"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-html-dir
===================================================================
--- trunk/make.d/xml-html-dir 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html-dir 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 12; 1473 bytes
@@ -1,23 +1,28 @@
# Convert DocBook -> single HTML file, but write the output in a subdirectory.
# This is used when the file must be packaged up with other files such as
-# image files. (Presumed use is that you will override the generic
-# %.html-dir rule below with one that copies images into the output
-# directory after formatting the document.)
+# image files.
# (Language sensitive)
-%.html-dir: %.html-dir.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.html-dir.d
-
-%.html-dir.d: %-prepped.xml $(MYSQL_HTML_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.html-dir: %-prepped.xml $(MYSQL_HTML_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@/$*.html \
+ --output $@-tmp/$*.html \
$(MYSQL_HTML_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.html-dir *.html-dir.d
+ $(RM) -r *.html-dir *.html-dir-tmp
+
+help::
+ @echo "make file.html-dir - convert file.xml to HTML, single file"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-html-help
===================================================================
--- trunk/make.d/xml-html-help 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html-help 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 19, Lines Deleted: 13; 1828 bytes
@@ -6,35 +6,41 @@
# Use html-section driver file, but set chunk.section.depth to 0,
# causes chunking at the chapter level.
-%.html-help: %.html-help.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.html-help.d
-
-%.html-help.d: %-prepped.xml $(MYSQL_HTML_HELP_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.html-help: %-prepped.xml $(MYSQL_HTML_HELP_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--param chunk.section.depth 0 \
- --output $@/ \
+ --output $@-tmp/ \
$(MYSQL_HTML_HELP_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.html-help *.html-help.d
+ $(RM) -r *.html-help *.html-help-tmp
-# HTML Help -> CHM conversion. The .html-help.d directory must already be
+# HTML Help -> CHM conversion. The .html-help directory must already be
# populated with all HTML files and any image and other files needed to
# build the .chm file.
-# Note that the dependency is on the fake .html-help file, but the build-chm
-# script is passed the .html-help.d directory name.
.PRECIOUS: %.html-help
%.chm: %.html-help
- $(TOOLS_DIR)/build-chm $<.d $@
+ $(TOOLS_DIR)/build-chm $< $@
clean::
$(RM) *.chm
+
+help::
+ @echo "make file.html-html - convert file.xml to HTML Help, 1 file/chapter"
+ @echo " (used for generating CHM)"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-html-section
===================================================================
--- trunk/make.d/xml-html-section 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html-section 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 9; 1240 bytes
@@ -1,19 +1,26 @@
# Convert DocBook -> HTML, with one file per section.
# (Language sensitive)
-%.html-section: %.html-section.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.html-section.d
-
-%.html-section.d: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.html-section: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@/ \
+ --output $@-tmp/ \
$(MYSQL_HTML_SECTION_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.html-section *.html-section.d
+ $(RM) -r *.html-section *.html-section-tmp
+
+help::
+ @echo "make file.html-section - convert file.xml to HTML, 1 file/section"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-html-web
===================================================================
--- trunk/make.d/xml-html-web 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html-web 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 19, Lines Deleted: 12; 1538 bytes
@@ -5,24 +5,31 @@
# The l10n.gentext.default.language parameter MUST be set because
# mysqlweb-chunk.xsl includes its value in each output page.
-%.html-web: %.html-web.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.html-web.d
-
-%.html-web.d: %-prepped.xml $(MYSQL_HTML_WEB_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.html-web: %-prepped.xml $(MYSQL_HTML_WEB_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--stringparam document.name.stem $* \
- --output $@/ \
+ --output $@-tmp/ \
$(MYSQL_HTML_WEB_XSL) \
$<
- cat $@/*.html | openssl dgst -md5 > $@/checksum.txt
- if [ -f $$PWD/renamed-nodes.txt ]; then \
- cp $$PWD/renamed-nodes.txt $@/ ; \
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
fi
+ cat $@-tmp/*.html | openssl dgst -md5 > $@-tmp/checksum.txt
+ if [ -f renamed-nodes.txt ]; then \
+ cp renamed-nodes.txt $@-tmp/ ; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.html-web *.html-web.d
+ $(RM) -r *.html-web *.html-web-tmp
+
+help::
+ @echo "make file.html-web - convert file.xml to online manual HTML"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-html-web-single
===================================================================
--- trunk/make.d/xml-html-web-single 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-html-web-single 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 10, Lines Deleted: 10; 1366 bytes
@@ -5,25 +5,25 @@
# The l10n.gentext.default.language parameter MUST be set because
# mysqlweb-single.xsl includes its value in each output page.
-%.html-web-single: %.html-web-single.d
- touch $@
-
-.PRECIOUS: %.html-web-single.d
-
# Note: This rule builds the single output file for abc.xml as abc.html,
# but does so in a subdirectory named abc.html-single.d to avoid conflicts
# in case abc.html is built in the current directory with the xml-html
# rule.
-%.html-web-single.d: %-prepped.xml $(MYSQL_HTML_WEB_SINGLE_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.html-web-single: %-prepped.xml $(MYSQL_HTML_WEB_SINGLE_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--stringparam document.name.stem $* \
- --output $@/$*.html \
+ --output $@-tmp/$*.html \
$(MYSQL_HTML_WEB_SINGLE_XSL) \
$<
+ mv $@-tmp $@
clean::
- $(RM) -r *.html-web-single *.html-web-single.d
+ $(RM) -r *.html-web-single *.html-web-single-tmp
+
+help::
+ @echo "make file.html-web-single - convert file.xml to online manual HTML"
+ @echo " (single-page)"
Modified: trunk/make.d/xml-man
===================================================================
--- trunk/make.d/xml-man 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-man 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 3; 808 bytes
@@ -8,9 +8,13 @@
$<
echo $@ has been made > $@
-# There are no files listed for the clean target because the names
-# of generated man pages can vary quite a bit. List targets to be
-# cleaned in the main Makefile.
+# 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.
clean::
$(RM) *.man
+
+help::
+ @echo "make file.man - generate Unix manpages from file.xml"
Modified: trunk/make.d/xml-pdf
===================================================================
--- trunk/make.d/xml-pdf 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-pdf 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 433 bytes
@@ -45,3 +45,7 @@
clean::
$(RM) *.fo *.pdf *.pdf-tmp *.pdf-err
+
+help::
+ @echo "make file.pdf - convert file.xml to file.pdf (letter)"
+ @echo "make file.a4.pdf - convert file.xml to file.pdf (A4)"
Modified: trunk/make.d/xml-remark
===================================================================
--- trunk/make.d/xml-remark 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-remark 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 445 bytes
@@ -27,3 +27,7 @@
clean::
$(RM) *.remark
$(RM) *.remark-count
+
+help::
+ @echo "make file.remark - extract <remark> elements from file.xml"
+ @echo "make file.remark-count - count <remark> elements in file.xml"
Modified: trunk/make.d/xml-texi
===================================================================
--- trunk/make.d/xml-texi 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-texi 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 333 bytes
@@ -13,3 +13,6 @@
clean::
$(RM) *.texi
+
+help::
+ @echo "make file.texi - convert file.xml to file.texi"
Modified: trunk/make.d/xml-titles
===================================================================
--- trunk/make.d/xml-titles 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-titles 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 344 bytes
@@ -6,3 +6,6 @@
clean::
$(RM) *.titles
+
+help::
+ @echo "make file.titles - convert file.xml to id/titles file"
Modified: trunk/make.d/xml-toc
===================================================================
--- trunk/make.d/xml-toc 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-toc 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 367 bytes
@@ -26,3 +26,6 @@
clean::
$(RM) *-toc-entries.xml
$(RM) *-toc.txt
+
+help::
+ @echo "make file-toc.txt - produce table of contents from file.xml"
Modified: trunk/make.d/xml-txt
===================================================================
--- trunk/make.d/xml-txt 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-txt 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 349 bytes
@@ -53,3 +53,6 @@
clean::
$(RM) *-nolink.xml *-nolink.html
+
+help::
+ @echo "make file.txt - convert file.xml to file.txt"
Modified: trunk/make.d/xml-useless
===================================================================
--- trunk/make.d/xml-useless 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-useless 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 428 bytes
@@ -3,3 +3,6 @@
%.useless: %.xml $(STRIP_COMMENTS_XSL_DEPS) $(FIND_CRUFT_XSL_DEPS)
$(XSLTPROC) $(FIND_CRUFT_XSL) $<
+
+help::
+ @echo "make file.useless - file suboptimal constructs in file.xml"
Modified: trunk/make.d/xml-valid
===================================================================
--- trunk/make.d/xml-valid 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-valid 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 413 bytes
@@ -5,3 +5,7 @@
%.deepcheck: %-prepped.xml
$(DEEP_CHECK) $<
+
+help::
+ @echo "make file.valid - validate file.xml"
+ @echo "make file.deepcheck - perform deep check of file.xml"
Modified: trunk/make.d/xml-xhtml
===================================================================
--- trunk/make.d/xml-xhtml 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-xhtml 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 1; 533 bytes
@@ -4,9 +4,12 @@
%.xhtml: %-prepped.xml $(MYSQL_XHTML_XSL_DEPS)
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $*.xhtml \
+ --output $@ \
$(MYSQL_XHTML_XSL) \
$<
clean::
$(RM) *.xhtml
+
+help::
+ @echo "make file.xhtml - convert file.xml to XHTML, single file"
Modified: trunk/make.d/xml-xhtml-chapter
===================================================================
--- trunk/make.d/xml-xhtml-chapter 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-xhtml-chapter 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 9; 1320 bytes
@@ -4,20 +4,27 @@
# Use xhtml-section driver file, but set chunk.section.depth to 0,
# causes chunking at the chapter level.
-%.xhtml-chapter: %.xhtml-chapter.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.xhtml-chapter.d
-
-%.xhtml-chapter.d: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.xhtml-chapter: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
--param chunk.section.depth 0 \
- --output $@/ \
+ --output $@-tmp/ \
$(MYSQL_XHTML_SECTION_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.xhtml-chapter *.xhtml-chapter.d
+ $(RM) -r *.xhtml-chapter *.xhtml-chapter-tmp
+
+help::
+ @echo "make file.xhtml-chapter - convert file.xml to XHTML, 1 file/chapter"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-xhtml-dir
===================================================================
--- trunk/make.d/xml-xhtml-dir 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-xhtml-dir 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 17, Lines Deleted: 12; 1493 bytes
@@ -1,23 +1,28 @@
# Convert DocBook -> single XHTML file, but write the output in a subdirectory.
# This is used when the file must be packaged up with other files such as
-# image files. (Presumed use is that you will override the generic
-# %.xhtml-dir rule below with one that copies images into the output
-# directory after formatting the document.)
+# image files.
# (Language sensitive)
-%.xhtml-dir: %.xhtml-dir.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.xhtml-dir.d
-
-%.xhtml-dir.d: %-prepped.xml $(MYSQL_XHTML_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.xhtml-dir: %-prepped.xml $(MYSQL_XHTML_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@/$*.xhtml \
+ --output $@-tmp/$*.xhtml \
$(MYSQL_XHTML_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.xhtml-dir *.xhtml-dir.d
+ $(RM) -r *.xhtml-dir *.xhtml-dir-tmp
+
+help::
+ @echo "make file.xhtml-dir - convert file.xml to XHTML, single file"
+ @echo " (putting output in subdirectory)"
Modified: trunk/make.d/xml-xhtml-section
===================================================================
--- trunk/make.d/xml-xhtml-section 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/make.d/xml-xhtml-section 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 16, Lines Deleted: 9; 1257 bytes
@@ -1,19 +1,26 @@
# Convert DocBook -> XHTML, with one file per section.
# (Language sensitive)
-%.xhtml-section: %.xhtml-section.d
- touch $@
+# If there are any image files, IMAGE_FILES must be set to name them all.
-.PRECIOUS: %.xhtml-section.d
-
-%.xhtml-section.d: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
- -$(RM) -r $@/
- mkdir $@/
+%.xhtml-section: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
$(XSLTPROC) \
--stringparam l10n.gentext.default.language $(DOC_LANG) \
- --output $@/ \
+ --output $@-tmp/ \
$(MYSQL_XHTML_SECTION_XSL) \
$<
+ if [ "x$(IMAGE_FILES)" != "x" ]; then \
+ mkdir $@-tmp/images; \
+ cp $(IMAGE_FILES) $@-tmp/images; \
+ $(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
+ fi
+ mv $@-tmp $@
clean::
- $(RM) -r *.xhtml-section *.xhtml-section.d
+ $(RM) -r *.xhtml-section *.xhtml-section-tmp
+
+help::
+ @echo "make file.xhtml-section - convert file.xml to XHTML, 1 file/section"
+ @echo " (putting output in subdirectory)"
Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/migration-toolkit/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 9, Lines Deleted: 28; 1463 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: migration-toolkit.depend
# Dependency list for Migration Toolkit document
@@ -33,32 +36,10 @@
migration-toolkit-prepped.xml: $(MIGRATION_TOOLKIT_SRCS)
+IMAGE_FILES = images/*.png
+
# Overrides for generic rules
-migration-toolkit.html-section: migration-toolkit.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-migration-toolkit.html-chapter: migration-toolkit.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-migration-toolkit.html-web: migration-toolkit.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-migration-toolkit.html-help: migration-toolkit.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/mysqltest/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 801 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: mysqltest.depend
# Dependency list for mysqltest document
@@ -35,9 +38,6 @@
mysqltest-prepped.xml: $(MYSQLTEST_SRCS)
-#%.txt: %.html
-# lynx -dump $< > $@
-
clean::
$(RM) mysqltest.txt
Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/ndbapi/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 35; 1408 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: ndbapi.depend
# Dependency list for NDB API document
@@ -35,38 +38,8 @@
ndbapi-prepped.xml: $(NDBAPI_SRCS)
-# Overrides for generic rules
+IMAGE_FILES = images/*.png
-ndbapi.html-section: ndbapi.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-ndbapi.html-chapter: ndbapi.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-ndbapi.html-web: ndbapi.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-ndbapi.html-help: ndbapi.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-ndbapi.html-dir: ndbapi.html-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/proto-doc/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 4; 917 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: proto-doc.depend
# Dependency list for [NAME OF DOCUMENT HERE]
@@ -35,6 +38,10 @@
proto-doc-prepped.xml: $(PROTO_DOC_SRCS)
+# If the document refers to image files, set this variable to name them all
+
+IMAGE_FILES =
+
# Include this target if you generate plain text format
clean::
$(RM) proto-doc.txt
Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/query-browser/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 37; 1770 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: query-browser.depend
# Dependency list for MySQL Query Browser document
@@ -35,40 +38,8 @@
query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)
-# Overrides for generic rules
+IMAGE_FILES = ../gui-common/images/*.png images/*.png
-query-browser.html-section: query-browser.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
-query-browser.html-chapter: query-browser.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
-query-browser.html-web: query-browser.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
-query-browser.html-help: query-browser.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp ../gui-common/images/*.png $</images
- cp images/*.png $</images
- $(TOOLS_DIR)/remap-img-paths.pl $</*.html
- touch $@
-
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/refman-4.1/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 4, Lines Added: 17, Lines Deleted: 52; 2406 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: manual.depend
# Dependency list for MySQL Reference Manual
@@ -36,6 +39,8 @@
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
+IMAGE_FILES = images/*.png
+
# We also build the connector sections as separate docs, so list dependencies
# for them as well.
@@ -67,44 +72,7 @@
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-# Overrides for generic rules
-manual.html-section: manual.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-chapter: manual.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-web: manual.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-help: manual.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-dir: manual.html-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.xhtml-dir: manual.xhtml-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
mysql.info: manual.info
cp manual.info mysql.info
@@ -180,20 +148,17 @@
# 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.d directory and post-processed by fix-manpages.pl.
+# man-tmp directory and post-processed by fix-manpages.pl. Then
+# man-tmp is renamed to man, the final target name.
-.PRECIOUS: man.d
+man: manual.man
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ $(FIXUP_MANPAGES) --destdir=$@-tmp *.1
+ mv $@-tmp $@
-man: man.d
- touch $@
-
-man.d: manual.man
- -$(RM) -r $@
- mkdir $@
- $(FIXUP_MANPAGES) --destdir=man.d *.1
-
clean::
- $(RM) -r *.1 man man.d
+ $(RM) -r *.1 man man-tmp
# Help-table content generation.
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/refman-5.0/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 4, Lines Added: 17, Lines Deleted: 52; 2406 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: manual.depend
# Dependency list for MySQL Reference Manual
@@ -36,6 +39,8 @@
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
+IMAGE_FILES = images/*.png
+
# We also build the connector sections as separate docs, so list dependencies
# for them as well.
@@ -67,44 +72,7 @@
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-# Overrides for generic rules
-manual.html-section: manual.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-chapter: manual.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-web: manual.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-help: manual.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-dir: manual.html-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.xhtml-dir: manual.xhtml-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
mysql.info: manual.info
cp manual.info mysql.info
@@ -180,20 +148,17 @@
# 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.d directory and post-processed by fix-manpages.pl.
+# man-tmp directory and post-processed by fix-manpages.pl. Then
+# man-tmp is renamed to man, the final target name.
-.PRECIOUS: man.d
+man: manual.man
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ $(FIXUP_MANPAGES) --destdir=$@-tmp *.1
+ mv $@-tmp $@
-man: man.d
- touch $@
-
-man.d: manual.man
- -$(RM) -r $@
- mkdir $@
- $(FIXUP_MANPAGES) --destdir=man.d *.1
-
clean::
- $(RM) -r *.1 man man.d
+ $(RM) -r *.1 man man-tmp
# Help-table content generation.
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/refman-5.1/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 4, Lines Added: 17, Lines Deleted: 52; 2406 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: manual.depend
# Dependency list for MySQL Reference Manual
@@ -36,6 +39,8 @@
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
+IMAGE_FILES = images/*.png
+
# We also build the connector sections as separate docs, so list dependencies
# for them as well.
@@ -67,44 +72,7 @@
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-# Overrides for generic rules
-manual.html-section: manual.html-section.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-chapter: manual.html-chapter.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-web: manual.html-web.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-help: manual.html-help.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.html-dir: manual.html-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
-manual.xhtml-dir: manual.xhtml-dir.d
- -$(RM) -r $</images
- mkdir $</images
- cp images/*.png $</images
- touch $@
-
mysql.info: manual.info
cp manual.info mysql.info
@@ -180,20 +148,17 @@
# 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.d directory and post-processed by fix-manpages.pl.
+# man-tmp directory and post-processed by fix-manpages.pl. Then
+# man-tmp is renamed to man, the final target name.
-.PRECIOUS: man.d
+man: manual.man
+ -$(RM) -r $@ $@-tmp
+ mkdir $@-tmp
+ $(FIXUP_MANPAGES) --destdir=$@-tmp *.1
+ mv $@-tmp $@
-man: man.d
- touch $@
-
-man.d: manual.man
- -$(RM) -r $@
- mkdir $@
- $(FIXUP_MANPAGES) --destdir=man.d *.1
-
clean::
- $(RM) -r *.1 man man.d
+ $(RM) -r *.1 man man-tmp
# Help-table content generation.
Modified: trunk/refman-common/Makefile
===================================================================
--- trunk/refman-common/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/refman-common/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 4; 688 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.valid"
- @echo " make doc_name.format"
- @echo " make doc_name.useless"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/sample-data/sakila/Makefile
===================================================================
--- trunk/sample-data/sakila/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/sample-data/sakila/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 6; 845 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: sakila.depend
# Dependency list for sakila document
@@ -34,8 +37,7 @@
sakila-prepped.xml = $(WORLD_SETUP_SRCS)
-#%.txt: %.html
-# lynx -dump $< > $@
+IMAGE_FILES = images/*.png
clean::
$(RM) sakila.txt
Modified: trunk/sample-data/world/Makefile
===================================================================
--- trunk/sample-data/world/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/sample-data/world/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 836 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: world-setup.depend
# Dependency list for world-setup document
@@ -34,9 +37,6 @@
world-setup-prepped.xml = $(WORLD_SETUP_SRCS)
-#%.txt: %.html
-# lynx -dump $< > $@
-
clean::
$(RM) world-setup.txt
Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/userguide/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 6; 839 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: userguide.depend
# Dependency list for MySQL User Guide document
@@ -33,9 +36,7 @@
userguide-prepped.xml: $(USERGUIDE_SRCS)
-# Any override rules needed here?
-
# Import standard target rules
include $(MAKE_DIR)/xml-valid
Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile 2006-07-18 19:30:36 UTC (rev 2767)
+++ trunk/workbench/Makefile 2006-07-18 20:41:19 UTC (rev 2768)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 6; 827 bytes
@@ -19,11 +19,14 @@
all::
@echo "You must say what you want to do."
@echo "Some commands supported by this Makefile:"
- @echo " make clean"
- @echo " make doc_name.html"
- @echo " make doc_name.pdf"
- @echo " make doc_name.txt"
+ @make -s help
+# Empty help target so that no error message occurs if none
+# of the included help modules have their own help target
+
+help::
+ @true
+
depend:: workbench.depend
# Dependency list for workbench document
@@ -35,8 +38,7 @@
workbench-prepped.xml: $(WORKBENCH_SRCS)
-#%.txt: %.html
-# lynx -dump $< > $@
+IMAGE_FILES = images/*.png
clean::
$(RM) workbench.txt
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2768 - in trunk: . administrator gui-common internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browse... | paul | 18 Jul |
