MySQL Lists: commits: svn commit - mysqldoc@docsrva: r2800 - in trunk: . administrator internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browser refman-4....

List:	Commits	« Previous Message Next Message »
From:	paul	Date:	July 21 2006 5:42pm
Subject:	svn commit - mysqldoc@docsrva: r2800 - in trunk: . administrator internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browser refman-4....
View as plain text
Author: paul
Date: 2006-07-21 19:42:27 +0200 (Fri, 21 Jul 2006)
New Revision: 2800

Log:
 r12586@frost:  paul | 2006-07-21 12:39:38 -0500
 Revised make depend mechanism:
 - Invent make macro to determine image file names from list of full
 dependencies. This eliminates the need for a separate variable.
 - Revise rules that generate HTML files into separate directory to
 use make macro to calculate image names. This eliminates the need for
 the standard IMAGE_FILES variable.
 - Side effects: Simpler dependency specification in Makefiles; ability
 to correctly create multiple documents in same file that all have images.
 (IMAGE_FILES mechanism allowed only one such document per directory.)
 
 Also fixed some typos in help target rules.


Modified:
   trunk/administrator/Makefile
   trunk/internals/Makefile
   trunk/make.d/vars-docbook
   trunk/make.d/xml-depend
   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-pdf
   trunk/make.d/xml-prep
   trunk/make.d/xml-useless
   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/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:11816
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12585
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11816
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12586
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441


Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/administrator/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 2624 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: administrator.depend
 
-# Dependency list for MySQL Administrator document
-# This variable is updated by "make depend"
-
 ADMINISTRATOR_SRCS_EXTRA = ../gui-common/gui-common.ent
 
 ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml legalnotice.en.xml copyright.xml images/connection.png images/configure-service-mode-connection.png images/configure-service-mode-window.png images/mainwindow.png images/marked-area.png images/user-accounts.png images/user-information.png images/graph-settings.png images/server-logs-general-log.png images/restore-content.png images/replication.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-administrator.xml images/system-tray.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-trou!
 bleshooting.xml ../gui-common/images/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml 
 
-ADMINISTRATOR_IMAGES =  images/connection.png images/configure-service-mode-connection.png images/configure-service-mode-window.png images/mainwindow.png images/marked-area.png images/user-accounts.png images/user-information.png images/graph-settings.png images/server-logs-general-log.png images/restore-content.png images/replication.png ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/options.png ../gui-common/images/options-connection.png images/system-tray.png ../gui-common/images/connectionerror.png
-
 administrator-prepped.xml: $(ADMINISTRATOR_SRCS)
 
-IMAGE_FILES = $(ADMINISTRATOR_IMAGES)
-
 # Import standard target rules
 
 include $(MAKE_DIR)/xml-valid


Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/internals/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 796 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: internals.depend
 
-# Dependency list for internals document
-# This variable is updated by "make depend"
-
 INTERNALS_SRCS_EXTRA = fixedchars.ent
 
 INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.en.xml copyright.xml 
 
-INTERNALS_IMAGES = 
-
 internals-prepped.xml: $(INTERNALS_SRCS)
 
-IMAGE_FILES = $(INTERNALS_IMAGES)
-
 clean::
 	$(RM) internals.txt
 


Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/vars-docbook	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 25, Lines Deleted: 0; 1419 bytes

@@ -255,3 +255,28 @@
 
 EXTRACT_TITLES_XSL = $(XSL_DIR)/extract-titles.xsl
 EXTRACT_TITLES_XSL_DEPS = $(EXTRACT_TITLES_XSL)
+
+# ----------------------------------------------------------------------
+# Make macros
+
+# Given a target basename, target_images returns the list of image files
+# in the target's dependency list.
+
+# Let's break this down:
+# - $1 is the target basename (for example, manual from manual.html-chapter)
+# - The echo|tr shell command converts lowercase to uppercase and dashes to
+#    underscore
+# - To that result, we add _SRCS to get the name of the variable that
+#   contains the dependency list for the target (for example, MANUAL_SRCS)
+# - Taking $() on that result gives us theh value of the dependency list
+#   variable.
+# - filter selects image files from the list (filenames ending in .png,
+#   .gif, .jpg, .jpeg)
+
+# Assumptions:
+# - The _SRCS variable associated with the target must be set in the Makefile.
+# - The filter call names all appropriate extensions to extract image files.
+#   If we use some other image extension at some point, just update the list.
+
+target_images = $(filter %.png %.gif %.jpg %.jpeg, \
+					$($(shell echo $(1)|tr a-z- A-Z_)_SRCS))


Modified: trunk/make.d/xml-depend
===================================================================
--- trunk/make.d/xml-depend	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-depend	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 18, Lines Deleted: 27; 3577 bytes

@@ -1,54 +1,45 @@
-# General target for updating the Makefile with full and image-only
-# dependencies for an XML document.  For a document named abc-def.xml,
-# it adds lines that define two variables, ABC_DEF_SRCS and ABC_DEF_IMAGES:
-# - The first names all dependencies.  Its value includes abc-def.xml
-#   and any files referred to by abc-def.xml.
-# - The second names only the image files referred to by abc-def.xml
-#   (this is based on the assumption that anything not referred to via
-#   xinclude is an image.
+# General target for updating the Makefile with the list of dependencies
+# for an XML document.  For a document named abc-def.xml, it adds a line
+# that defines a variable named ABC_DEF_SRCS with a value that names all
+# dependencies.  Its value includes abc-def.xml and any files referred
+# to by abc-def.xml.
 
 # The rule works like this:
 # - Make a backup of the Makefile.  (If you kill the "make depend"
 #   command while it's processing the Makefile, you can recover it
 #   from Makefile.bak.)
-# - Determine the basename of the dependency variable names by
-#   converting to uppercase and converting hyphens to underscores
-# - Add _SRCS or _IMAGES to the end to complete the variable names.
-# - Compute the list of files referred to by the XML document, and
-#   the list of images referred to by the XML document.
-#   Note: xsltproc should be run without the --xinclude option.
-# - Delete from the Makefile any existing lines that define the
-#   dependency variables.  Write the result to Makefile.new.
-# - Add lines to Makefile.new with the new values of the dependency
-#   variables.
+# - Determine the basename of the dependency variable name by
+#   converting the target basename to uppercase and converting hyphens
+#   to underscores.  Add _SRCS to the end to complete the dependency
+#   variable name.
+# - Use the xmldepend.xsl transform to compute the list of files referred
+#   to by the XML document.
+#   Note: xsltproc must be run without the --xinclude option.
+# - Update the Makefile line that defines the dependency variable,
+#   writing the result to Makefile.new.
 # - Rename Makefile.new to Makefile.
 
 # IMPORTANT:
 # BEFORE RUNNING "make depend" the first time, you should put a line
 # in the Makefile that defines the _SRCS dependency variable (the value
 # can be anything, even empty):
-#     XXX_SRCS = 
+#   XXX_SRCS = 
 # If you do not include this variable line, it cannot be updated.
-# If you also need to use the _IMAGES variable, include a line for
-# it, too:
-#     XXX_IMAGES = 
 
 
 # If there are dependency files that xmldepend.xsl does not detect
 # (such as entity files that are processed by the XML parser and
 # do not appear at the XSL level), you can define XXX_SRCS_EXTRA
-# to list those files.
+# in the Makefile to list those files.
 
 %.depend: %.xml
 	cp Makefile Makefile.bak
-	VAR=`echo $* | tr a-z- A-Z_` && \
+	VAR=`echo $* | tr a-z- A-Z_`_SRCS && \
 	DEPS=`xsltproc --novalid \
 			--stringparam xmldepend.terminator " " \
 			$(XMLDEPEND_XSL) $<` && \
-	IMAGE_DEPS=`echo $$DEPS|sed -e 's/ *[^ ]*\.xml//g' -e 's/ *[^ ]*\.txt//g'` && \
 	sed \
-		-e "s|^$${VAR}_SRCS *=.*|$${VAR}_SRCS = "'$$'"($${VAR}_SRCS_EXTRA) $< $$DEPS|" \
-		-e "s|^$${VAR}_IMAGES *=.*|$${VAR}_IMAGES = $$IMAGE_DEPS|" \
+		-e "s|^$${VAR} *=.*|$${VAR} = "'$$'"($${VAR}_EXTRA) $< $$DEPS|" \
 		Makefile > Makefile.new
 	mv Makefile.new Makefile
 


Modified: trunk/make.d/xml-html-chapter
===================================================================
--- trunk/make.d/xml-html-chapter	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-html-chapter	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1051 bytes

@@ -1,11 +1,11 @@
 # 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.
 
+# The %_SRCS variable must be set to the list of target dependencies.
+
 %.html-chapter: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp
 	mkdir $@-tmp

@@ -15,9 +15,10 @@
 		--output $@-tmp/ \
 		$(MYSQL_HTML_SECTION_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@


Modified: trunk/make.d/xml-html-dir
===================================================================
--- trunk/make.d/xml-html-dir	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-html-dir	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 863 bytes

@@ -3,7 +3,7 @@
 # image files.
 # (Language sensitive)
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.html-dir: %-prepped.xml $(MYSQL_HTML_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -13,9 +13,10 @@
 		--output $@-tmp/$*.html \
 		$(MYSQL_HTML_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@


Modified: trunk/make.d/xml-html-help
===================================================================
--- trunk/make.d/xml-html-help	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-html-help	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 3, Lines Added: 5, Lines Deleted: 4; 1275 bytes

@@ -6,7 +6,7 @@
 # Use html-section driver file, but set chunk.section.depth to 0,
 # causes chunking at the chapter level.
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.html-help: %-prepped.xml $(MYSQL_HTML_HELP_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -17,9 +17,10 @@
 		--output $@-tmp/ \
 		$(MYSQL_HTML_HELP_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@

@@ -41,6 +42,6 @@
 	$(RM) *.chm
 
 help::
-	@echo "make file.html-html       - convert file.xml to HTML Help, 1 file/chapter"
+	@echo "make file.html-help       - 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-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-html-section	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 927 bytes

@@ -1,7 +1,7 @@
 # Convert DocBook -> HTML, with one file per section.
 # (Language sensitive)
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.html-section: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -11,9 +11,10 @@
 		--output $@-tmp/ \
 		$(MYSQL_HTML_SECTION_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@


Modified: trunk/make.d/xml-html-web
===================================================================
--- trunk/make.d/xml-html-web	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-html-web	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 1000 bytes

@@ -5,7 +5,7 @@
 # The l10n.gentext.default.language parameter MUST be set because
 # mysqlweb-chunk.xsl includes its value in each output page.
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.html-web: %-prepped.xml $(MYSQL_HTML_WEB_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -16,9 +16,10 @@
 		--output $@-tmp/ \
 		$(MYSQL_HTML_WEB_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-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


Modified: trunk/make.d/xml-pdf
===================================================================
--- trunk/make.d/xml-pdf	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-pdf	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 502 bytes

@@ -47,5 +47,5 @@
 	$(RM) *.fo *.pdf *.pdf-tmp *.pdf-err
 
 help::
-	@echo "make file.pdf             - convert file.xml to file.pdf (letter)"
+	@echo "make file.pdf             - convert file.xml to file.pdf (US letter)"
 	@echo "make file.a4.pdf          - convert file.xml to file.pdf (A4)"


Modified: trunk/make.d/xml-prep
===================================================================
--- trunk/make.d/xml-prep	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-prep	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 0; 448 bytes

@@ -26,3 +26,7 @@
 
 clean::
 	$(RM) *-prepped.xml *-manprepped.xml
+
+help::
+	@echo "make file-prepped.xml     - preprocess file.xml for producing output"
+	@echo "make file-manprepped.xml  - preprocess file.xml for producing manpages"


Modified: trunk/make.d/xml-useless
===================================================================
--- trunk/make.d/xml-useless	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-useless	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 436 bytes

@@ -5,4 +5,4 @@
 	$(XSLTPROC) $(FIND_CRUFT_XSL) $<
 
 help::
-	@echo "make file.useless         - file suboptimal constructs in file.xml"
+	@echo "make file.useless         - find suboptimal constructs in file.xml"


Modified: trunk/make.d/xml-xhtml-chapter
===================================================================
--- trunk/make.d/xml-xhtml-chapter	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-xhtml-chapter	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 963 bytes

@@ -4,7 +4,7 @@
 # Use xhtml-section driver file, but set chunk.section.depth to 0,
 # causes chunking at the chapter level.
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.xhtml-chapter: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -15,9 +15,10 @@
 		--output $@-tmp/ \
 		$(MYSQL_XHTML_SECTION_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@


Modified: trunk/make.d/xml-xhtml-dir
===================================================================
--- trunk/make.d/xml-xhtml-dir	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-xhtml-dir	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 870 bytes

@@ -3,7 +3,7 @@
 # image files.
 # (Language sensitive)
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.xhtml-dir: %-prepped.xml $(MYSQL_XHTML_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -13,9 +13,10 @@
 		--output $@-tmp/$*.xhtml \
 		$(MYSQL_XHTML_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@


Modified: trunk/make.d/xml-xhtml-section
===================================================================
--- trunk/make.d/xml-xhtml-section	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/make.d/xml-xhtml-section	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 2, Lines Added: 4, Lines Deleted: 3; 934 bytes

@@ -1,7 +1,7 @@
 # Convert DocBook -> XHTML, with one file per section.
 # (Language sensitive)
 
-# If there are any image files, IMAGE_FILES must be set to name them all.
+# The %_SRCS variable must be set to the list of target dependencies.
 
 %.xhtml-section: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS)
 	-$(RM) -r $@ $@-tmp

@@ -11,9 +11,10 @@
 		--output $@-tmp/ \
 		$(MYSQL_XHTML_SECTION_XSL) \
 		$<
-	if [ "x$(IMAGE_FILES)" != "x" ]; then \
+	IMAGE_FILES="$(call target_images,$*)"; \
+	if [ "x$$IMAGE_FILES" != "x" ]; then \
 		mkdir $@-tmp/images; \
-		cp $(IMAGE_FILES) $@-tmp/images; \
+		cp $$IMAGE_FILES $@-tmp/images; \
 		$(TOOLS_DIR)/remap-img-paths.pl $@-tmp/*.html; \
 	fi
 	mv $@-tmp $@


Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/migration-toolkit/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 6; 2552 bytes

@@ -20,19 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: migration-toolkit.depend
 
-# Dependency list for Migration Toolkit document
-# This variable is updated by "make depend"
+MIGRATION_TOOLKIT_SRCS_EXTRA =
 
 MIGRATION_TOOLKIT_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.xml legalnotice.en.xml copyright.xml images/migration-plan.png images/welcome-screen.png images/configuration-type.png images/source-database-access.png images/source-database-mssql.png images/source-database-oracle.png images/source-database-oracle-nodriver.png images/source-database-mysql.png images/target-database-mysql.png images/connect-servers.png images/schema-selection.png images/reverse-engineering.png images/object-selection.png images/object-selection-detail.png images/object-selection-expression.png images/object-mapping.png images/meta-migration.png images/manual-editing.png images/manual-editing-detail.png images/creation-options.png images/creating-objects.png images/mapping-options.png images/bulk-transfer.png images/summary.png images/access-options-show.png images/access-system-tables.png images/access-object-permissions.png 
 
-MIGRATION_TOOLKIT_IMAGES =  images/migration-plan.png images/welcome-screen.png images/configuration-type.png images/source-database-access.png images/source-database-mssql.png images/source-database-oracle.png images/source-database-oracle-nodriver.png images/source-database-mysql.png images/target-database-mysql.png images/connect-servers.png images/schema-selection.png images/reverse-engineering.png images/object-selection.png images/object-selection-detail.png images/object-selection-expression.png images/object-mapping.png images/meta-migration.png images/manual-editing.png images/manual-editing-detail.png images/creation-options.png images/creating-objects.png images/mapping-options.png images/bulk-transfer.png images/summary.png images/access-options-show.png images/access-system-tables.png images/access-object-permissions.png
-
 migration-toolkit-prepped.xml: $(MIGRATION_TOOLKIT_SRCS)
 
-IMAGE_FILES = $(MIGRATION_TOOLKIT_IMAGES)
-
 # Import standard target rules
 
 include $(MAKE_DIR)/xml-valid


Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/mysqltest/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 887 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: mysqltest.depend
 
-# Dependency list for mysqltest document
-# This variable is updated by "make depend"
-
 MYSQLTEST_SRCS_EXTRA = fixedchars.ent
 
 MYSQLTEST_SRCS = $(MYSQLTEST_SRCS_EXTRA) mysqltest.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml components.xml tutorial.xml programs.xml command-reference.xml 
 
-MYSQLTEST_IMAGES =
-
 mysqltest-prepped.xml: $(MYSQLTEST_SRCS)
 
-IMAGE_FILES = $(MYSQLTEST_IMAGES)
-
 clean::
 	$(RM) mysqltest.txt
 


Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/ndbapi/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 2757 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: ndbapi.depend
 
-# Dependency list for NDB API document
-# This variable is updated by "make depend"
-
 NDBAPI_SRCS_EXTRA = ndb.en.ent
 
 NDBAPI_SRCS = $(NDBAPI_SRCS_EXTRA) ndbapi.xml legalnotice.en.xml copyright.xml overview.xml getting-started.xml ndb-classes.xml images/Ndb-class.png images/Ndb-cluster-connection-class.png images/NdbBlob-class.png images/NdbDictionary-classes.png images/NdbDictionary-Dictionary-class.png images/NdbDictionary-Column-class.png images/NdbDictionary-Object-class.png images/NdbDictionary-Object-Datafile-class.png images/NdbDictionary-Object-Event-class.png images/NdbDictionary-Object-Index-class.png images/NdbDictionary-Object-LogfileGroup-class.png images/NdbDictionary-Object-Table-class.png images/NdbDictionary-Object-Tablespace-class.png images/NdbDictionary-Object-Undofile-class.png images/NdbDictionary-AutoGrowSpecification-struct.png images/NdbEventOperation-class.png images/NdbOperation-subclasses.png images/NdbOperation-class.png images/NdbIndexOperation-class.png images/NdbScanOperation-class.png images/NdbIndexScanOperation-class.png images/NdbRecAttr-class.png images/!
 NdbScanFilter-class.png images/NdbTransaction-class.png errors.xml images/NdbError-struct.png mgm-api.xml examples.xml 
 
-NDBAPI_IMAGES =  images/Ndb-class.png images/Ndb-cluster-connection-class.png images/NdbBlob-class.png images/NdbDictionary-classes.png images/NdbDictionary-Dictionary-class.png images/NdbDictionary-Column-class.png images/NdbDictionary-Object-class.png images/NdbDictionary-Object-Datafile-class.png images/NdbDictionary-Object-Event-class.png images/NdbDictionary-Object-Index-class.png images/NdbDictionary-Object-LogfileGroup-class.png images/NdbDictionary-Object-Table-class.png images/NdbDictionary-Object-Tablespace-class.png images/NdbDictionary-Object-Undofile-class.png images/NdbDictionary-AutoGrowSpecification-struct.png images/NdbEventOperation-class.png images/NdbOperation-subclasses.png images/NdbOperation-class.png images/NdbIndexOperation-class.png images/NdbScanOperation-class.png images/NdbIndexScanOperation-class.png images/NdbRecAttr-class.png images/NdbScanFilter-class.png images/NdbTransaction-class.png images/NdbError-struct.png
-
 ndbapi-prepped.xml: $(NDBAPI_SRCS)
 
-IMAGE_FILES = $(NDBAPI_IMAGES)
-
 # Import standard target rules
 
 include $(MAKE_DIR)/xml-valid


Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/proto-doc/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 3, Lines Added: 8, Lines Deleted: 8; 1385 bytes

@@ -20,22 +20,22 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: proto-doc.depend
 
-# Dependency list for [NAME OF DOCUMENT HERE]
-# This variable is updated by "make depend"
-
 PROTO_DOC_SRCS_EXTRA = fixedchars.ent
 
 PROTO_DOC_SRCS = $(PROTO_DOC_SRCS_EXTRA) proto-doc.xml legalnotice.en.xml copyright.xml 
 
-PROTO_DOC_IMAGES =
-
 proto-doc-prepped.xml: $(PROTO_DOC_SRCS)
 
-IMAGE_FILES = ($PROTO_DOC_IMAGES)
+# ... put any special-case target rules here ...
 
-# Include this target if you generate plain text format
+# Include this clean target if you generate plain text format
+# from the document
 clean::
 	$(RM) proto-doc.txt
 

@@ -44,7 +44,6 @@
 
 include $(MAKE_DIR)/xml-valid
 include $(MAKE_DIR)/xml-format
-include $(MAKE_DIR)/xml-useless
 include $(MAKE_DIR)/xml-prep
 # xml-html for single-page HTML output with no images
 # xml-html-dir for single-page HTML output that also has images

@@ -67,3 +66,4 @@
 include $(MAKE_DIR)/xml-help
 include $(MAKE_DIR)/xml-remark
 include $(MAKE_DIR)/xml-depend
+include $(MAKE_DIR)/xml-useless


Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/query-browser/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 2588 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: query-browser.depend
 
-# Dependency list for MySQL Query Browser document
-# This variable is updated by "make depend"
-
 QUERY_BROWSER_SRCS_EXTRA = ../gui-common/gui-common.ent
 
 QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml legalnotice.en.xml copyright.xml images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/file-open-script.png images/tabletool.png images/blob-buttons.png images/dynamiclist.png images/stored-procedure-database-browser.png ../gui-common/chapter-table-editor.xml ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/chapter-options-introduction.xml ../gui-common/images/options.png ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-connections.xml ../gui-common/images/options-connection.png ../gui-common/chapter-options-editors.xml chapter-options-query-browser.xml images/qb-options.png ../gui-common/appendix-source-install.xml ../gui-common/appendix-troubleshooting.xml ..!
 /gui-common/images/connectionerror.png ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-third-party.xml 
 
-QUERY_BROWSER_IMAGES =  images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/file-open-script.png images/tabletool.png images/blob-buttons.png images/dynamiclist.png images/stored-procedure-database-browser.png ../gui-common/images/tableeditor.png ../gui-common/images/columneditor.png ../gui-common/images/indexeditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/options.png ../gui-common/images/options-connection.png images/qb-options.png ../gui-common/images/connectionerror.png
-
 query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)
 
-IMAGE_FILES = $(QUERY_BROWSER_IMAGES)
-
 # Import standard target rules
 
 include $(MAKE_DIR)/xml-valid


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/refman-4.1/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 5, Lines Added: 4, Lines Deleted: 15; 8358 bytes

@@ -20,22 +20,19 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: manual.depend
 
-# Dependency list for MySQL Reference Manual
-# This variable is updated by "make depend"
-
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
 
 MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-in!
 stall-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myacce!
 ss.png images/myaccess-odbc.png connector-net.xml images/cnet-!
 win-inst
all-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml ../refman-common/news-connector-net.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
 
-MANUAL_IMAGES =  images/blackhole-1.png images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodb!
 c-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
-
 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.
 

@@ -45,8 +42,6 @@
 
 CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml 
 
-CONNECTOR_J_IMAGES = 
-
 connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
 
 depend:: connector-mxj.depend

@@ -55,8 +50,6 @@
 
 CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml 
 
-CONNECTOR_MXJ_IMAGES = 
-
 connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
 
 depend:: connector-net.depend

@@ -65,8 +58,6 @@
 
 CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png 
 
-CONNECTOR_NET_IMAGES = images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
-
 connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
 
 depend:: connector-odbc.depend

@@ -75,8 +66,6 @@
 
 CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
 el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png 
 
-CONNECTOR_ODBC_IMAGES = images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png ima!
 ges/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
-
 connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
 
 


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/refman-5.0/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 5, Lines Added: 4, Lines Deleted: 15; 8345 bytes

@@ -20,22 +20,19 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: manual.depend
 
-# Dependency list for MySQL Reference Manual
-# This variable is updated by "make depend"
-
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
 
 MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml!
  connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-st!
 ep3.png images/myodbc-excel-step4.png images/myodbc-excel-step!
 5.png im
ages/myaccess.png images/myaccess-odbc.png connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml ../refman-common/news-connector-net.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
 
-MANUAL_IMAGES =  images/blackhole-1.png images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodb!
 c-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
-
 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.
 

@@ -45,8 +42,6 @@
 
 CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml 
 
-CONNECTOR_J_IMAGES = 
-
 connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
 
 depend:: connector-mxj.depend

@@ -55,8 +50,6 @@
 
 CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml 
 
-CONNECTOR_MXJ_IMAGES = 
-
 connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
 
 depend:: connector-net.depend

@@ -65,8 +58,6 @@
 
 CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png 
 
-CONNECTOR_NET_IMAGES = images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
-
 connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
 
 depend:: connector-odbc.depend

@@ -75,8 +66,6 @@
 
 CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
 el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png 
 
-CONNECTOR_ODBC_IMAGES = images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png ima!
 ges/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
-
 connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
 
 


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/refman-5.1/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 5, Lines Added: 4, Lines Deleted: 15; 8697 bytes

@@ -20,22 +20,19 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: manual.depend
 
-# Dependency list for MySQL Reference Manual
-# This variable is updated by "make depend"
-
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
 
 MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml ../refman-common/cjk-faq.en.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png mysql-cluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images!
 /cluster-replication-overview.png images/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.!
 png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc!
 -win-tra
cing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml ../refman-common/news-connector-net.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
 
-MANUAL_IMAGES =  images/pluggable-storage-overview.png images/blackhole-1.png images/custom-engine-overview.png images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.png images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odb!
 cadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
-
 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.
 

@@ -45,8 +42,6 @@
 
 CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml ../refman-common/news-connector-j.xml 
 
-CONNECTOR_J_IMAGES = 
-
 connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
 
 depend:: connector-mxj.depend

@@ -55,8 +50,6 @@
 
 CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml 
 
-CONNECTOR_MXJ_IMAGES = 
-
 connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
 
 depend:: connector-net.depend

@@ -65,8 +58,6 @@
 
 CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png 
 
-CONNECTOR_NET_IMAGES = images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/cnet-win-install-step3.png
-
 connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
 
 depend:: connector-odbc.depend

@@ -75,8 +66,6 @@
 
 CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-exc!
 el-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png 
 
-CONNECTOR_ODBC_IMAGES = images/myarchitecture.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/myodbc-macosx-odbcadmin-tracing.png images/myflowchart.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png ima!
 ges/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myaccess.png images/myaccess-odbc.png
-
 connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
 
 


Modified: trunk/sample-data/sakila/Makefile
===================================================================
--- trunk/sample-data/sakila/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/sample-data/sakila/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 13; 1148 bytes

@@ -16,29 +16,22 @@
 include $(MAKE_DIR)/vars-shell
 include $(MAKE_DIR)/vars-docbook
 
-all::
-	@echo "You must say what you want to do."
-	@echo "Some commands supported by this Makefile:"
-	@make -s help
+# Import default target rule (causes help message to print)
 
-# Empty help target so that no error message occurs if none
-# of the included help modules have their own help target
+include $(MAKE_DIR)/default-target
 
-help::
-	@true
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
 
 depend:: sakila.depend
 
-# Dependency list for sakila document
-# This variable is updated by "make depend"
-
 SAKILA_SRCS_EXTRA = sakila.ent
+
 SAKILA_SRCS = $(SAKILA_SRCS_EXTRA) sakila.xml images/sakila-schema.png changelog.xml 
 
 sakila-prepped.xml = $(WORLD_SETUP_SRCS)
 
-IMAGE_FILES = images/*.png
-
 clean::
 	$(RM) sakila.txt
 


Modified: trunk/sample-data/world/Makefile
===================================================================
--- trunk/sample-data/world/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/sample-data/world/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 11; 1074 bytes

@@ -16,23 +16,18 @@
 include $(MAKE_DIR)/vars-shell
 include $(MAKE_DIR)/vars-docbook
 
-all::
-	@echo "You must say what you want to do."
-	@echo "Some commands supported by this Makefile:"
-	@make -s help
+# Import default target rule (causes help message to print)
 
-# Empty help target so that no error message occurs if none
-# of the included help modules have their own help target
+include $(MAKE_DIR)/default-target
 
-help::
-	@true
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
 
 depend:: world-setup.depend
 
-# Dependency list for world-setup document
-# This variable is updated by "make depend"
-
 WORLD_SETUP_SRCS_EXTRA =
+
 WORLD_SETUP_SRCS = $(WORLD_SETUP_SRCS_EXTRA) world-setup.xml 
 
 world-setup-prepped.xml = $(WORLD_SETUP_SRCS)


Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/userguide/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 1389 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: userguide.depend
 
-# Dependency list for MySQL User Guide document
-# This variable is updated by "make depend"
-
 USERGUIDE_SRCS_EXTRA =
 
 USERGUIDE_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.xml legalnotice.en.xml copyright.xml introduction.xml creating.xml populating.xml querying.xml modifying.xml indexing.xml images/indexing-displaying-administrator.png storage-engines.xml views.xml stored-procedures.xml installing.xml configuring.xml security.xml logfiles.xml images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png disaster.xml php-mysqli.xml dotnet.xml java.xml glossary.xml 
 
-USERGUIDE_IMAGES =  images/indexing-displaying-administrator.png images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png
-
 userguide-prepped.xml: $(USERGUIDE_SRCS)
 
-IMAGE_FILES = $(USERGUIDE_IMAGES)
-
 # Import standard target rules
 
 include $(MAKE_DIR)/xml-valid


Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile	2006-07-21 17:42:13 UTC (rev 2799)
+++ trunk/workbench/Makefile	2006-07-21 17:42:27 UTC (rev 2800)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 7; 972 bytes

@@ -20,21 +20,18 @@
 
 include $(MAKE_DIR)/default-target
 
+# Document dependency specifications
+# "make depend" updates the _SRCS variable
+# Set _SRCS_EXTRA variable by hand to any entity files needed
+
 depend:: workbench.depend
 
-# Dependency list for workbench document
-# This variable is updated by "make depend"
-
 WORKBENCH_SRCS_EXTRA = ../gui-common/gui-common.ent
 
 WORKBENCH_SRCS = $(WORKBENCH_SRCS_EXTRA) workbench.xml legalnotice.en.xml copyright.xml images/workbench-windows.png images/workbench-osx.png images/workbench-linux.png 
 
-WORKBENCH_IMAGES =  images/workbench-windows.png images/workbench-osx.png images/workbench-linux.png
-
 workbench-prepped.xml: $(WORKBENCH_SRCS)
 
-IMAGE_FILES = $(WORKBENCH_IMAGES)
-
 clean::
 	$(RM) workbench.txt
Thread
• svn commit - mysqldoc@docsrva: r2800 - in trunk: . administrator internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browser refman-4....	paul	21 Jul