MySQL Lists: commits: svn commit - mysqldoc@docsrva: r6467 - in trunk: . administrator administrator-ro arbitrary dynamic-docs falcon gui-common gui-common-cy gui-common-ro...

List:	Commits	« Previous Message Next Message »
From:	paul	Date:	May 15 2007 7:07pm
Subject:	svn commit - mysqldoc@docsrva: r6467 - in trunk: . administrator administrator-ro arbitrary dynamic-docs falcon gui-common gui-common-cy gui-common-ro...
View as plain text
Author: paul
Date: 2007-05-15 19:07:25 +0200 (Tue, 15 May 2007)
New Revision: 6467

Log:
 r24982@polar:  paul | 2007-05-15 12:04:53 -0500
 Cleanups:
 Remove IDMAP_OBJS; it's not longer needed.
 Remove xmllist_to_idmaplist macro used for IDMAP_OBJS.


Modified:
   trunk/administrator-ro/Makefile
   trunk/administrator/Makefile
   trunk/arbitrary/Makefile
   trunk/dynamic-docs/Makefile
   trunk/falcon/Makefile
   trunk/gui-common-cy/Makefile
   trunk/gui-common-ro/Makefile
   trunk/gui-common/Makefile
   trunk/guibook/Makefile
   trunk/internals/Makefile
   trunk/make.d/vars-docbook
   trunk/migration-toolkit/Makefile
   trunk/mysqldoc-guide/Makefile
   trunk/mysqlqb/Makefile
   trunk/mysqltest/Makefile
   trunk/ndbapi/Makefile
   trunk/proto-doc/Makefile
   trunk/query-browser-cy/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:24974
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20364
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24982
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20364
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229


Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/administrator/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 708 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(administrator_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = administrator.xml
 
-# TODO: FIX
-administrator-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/administrator-ro/Makefile
===================================================================
--- trunk/administrator-ro/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/administrator-ro/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 717 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(administrator_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = administrator.xml
 
-# TODO: FIX
-administrator-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/arbitrary/Makefile
===================================================================
--- trunk/arbitrary/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/arbitrary/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 1, Lines Deleted: 1; 622 bytes

@@ -18,7 +18,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = ../administrator ../query-browser ../gui-common ../refman-4.1 ../refman-5.0
../refman-5.1 ../refman-common ../falcon ../internals
 IDMAP_SRCS = 
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -54,3 +53,4 @@
 
 # Import directory specific extensions
 
+include $(MAKE_DIR)/Makefile.ext


Modified: trunk/dynamic-docs/Makefile
===================================================================
--- trunk/dynamic-docs/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/dynamic-docs/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 499 bytes

@@ -22,7 +22,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-common ../refman-4.1 ../refman-5.0 ../refman-5.1 
 IDMAP_SRCS = $(MANUAL_SRCS)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 


Modified: trunk/falcon/Makefile
===================================================================
--- trunk/falcon/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/falcon/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 682 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-common ../refman-5.1 ../query-browser
 IDMAP_SRCS = $(falcon_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = falcon.xml
 
-# TODO: FIX
-falcon-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/gui-common/Makefile
===================================================================
--- trunk/gui-common/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/gui-common/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 546 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../workbench ../query-browser ../administrator ../migration-toolkit
../refman-5.1 ../refman-common
 IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 


Modified: trunk/gui-common-cy/Makefile
===================================================================
--- trunk/gui-common-cy/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/gui-common-cy/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 558 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../workbench ../query-browser-cy ../administrator ../migration-toolkit
../refman-5.1 ../refman-common
 IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 


Modified: trunk/gui-common-ro/Makefile
===================================================================
--- trunk/gui-common-ro/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/gui-common-ro/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 555 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../workbench ../query-browser ../administrator ../migration-toolkit
../refman-5.1 ../refman-common
 IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 


Modified: trunk/guibook/Makefile
===================================================================
--- trunk/guibook/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/guibook/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 711 bytes

@@ -18,7 +18,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../workbench ../query-browser ../administrator
../migration-toolkit ../userguide ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(guibook_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -33,9 +32,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = guibook.xml
 
-# TODO: FIX
-guibook-prepped.xml: $(IDMAP_OBJS)
-
 clean::
 	$(RM) guibook.txt
 


Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/internals/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 630 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-common ../refman-5.1
 IDMAP_SRCS = $(internals_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = internals.xml
 
-# TODO: FIX
-internals-prepped.xml: $(IDMAP_OBJS)
-
 clean::
 	$(RM) internals.txt
 


Modified: trunk/make.d/vars-docbook
===================================================================
--- trunk/make.d/vars-docbook	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/make.d/vars-docbook	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 22; 1292 bytes

@@ -409,28 +409,6 @@
 #   image files. This assumption will be satisfied if "make depend"
 #   has been run to update the dependency lists.
 
-# Macros for generating dependencies for ID map operations
-
-# Given the name of an .xml file, generate the name of the .idmap file
-# that depends on it. The .idmap file location is the metadata directory
-# under the directory where the .xml file is located, so the conversion
-# returns the concatentation of:
-# - The leading directory
-# - metadata/
-# - The filename, with .xml changed to .idmap
-# Examples:
-# a.xml -> metadata/a.idmap
-# ../a.xml -> ../metadata/a.idmap
-# ../dir/a.xml -> ../dir/metadata/a.idmap
-
-xml_to_idmap = $(dir $(1))metadata/$(patsubst %.xml,%.idmap,$(notdir $(1)))
-
-# Given a list of files, extract the .xml files from the list and map
-# them to the corresponding .idmap files that depend on them.
-
-xmllist_to_idmaplist = \
-  $(foreach path, $(filter %.xml, $(1)), $(call xml_to_idmap, $(path)))
-
 # Given a list of .xml files, return the "base" files, that is, those
 # that are not built as targets.
 


Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/migration-toolkit/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 732 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(migration_toolkit_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = migration-toolkit.xml
 
-# TODO: FIX
-migration-toolkit-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/mysqldoc-guide/Makefile
===================================================================
--- trunk/mysqldoc-guide/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/mysqldoc-guide/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 6; 778 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . 
 IDMAP_SRCS = $(mysqldoc_guide_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -33,11 +32,6 @@
 
 DEPEND_FILES = mysqldoc-guide.xml
 
-mysqldoc-guide-prepped.xml: $(MYSQLDOC_GUIDE_SRCS) $(IDMAP_OBJS)
-mysqldoc-guide-remprepped.xml: $(MYSQLDOC_GUIDE_SRCS) $(IDMAP_OBJS)
-
-# ... put any special-case target rules here ...
-
 # Include this clean target if you generate plain text output
 # from the document
 clean::


Modified: trunk/mysqlqb/Makefile
===================================================================
--- trunk/mysqlqb/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/mysqlqb/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 5; 740 bytes

@@ -35,7 +35,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-common ../refman-5.0
 IDMAP_SRCS = $(mysqlqb_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -50,10 +49,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = mysqlqb.xml
 
-# TODO: FIX
-mysqlqb-prepped.xml: $(IDMAP_OBJS)
-mysqlqb-manprepped.xml: $(IDMAP_OBJS)
-
 versions.ent: ../refman-5.0/versions.ent
 	cp $< $@
 all-entities.ent: ../refman-5.0/all-entities.ent


Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/mysqltest/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 5; 785 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-5.1
 IDMAP_SRCS = $(mysqltest_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,10 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = mysqltest.xml
 
-# TODO: FIX
-mysqltest-prepped.xml: $(IDMAP_OBJS)
-mysqltest-manprepped.xml: $(IDMAP_OBJS)
-
 # Manual page generation
 # mysqltest.man target processes mysqltest.xml and generates a bunch of
 # xxx.1 files in the current directory. These get copied to the


Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/ndbapi/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 4; 832 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(ndbapi_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = ndbapi.xml
 
-# TODO: FIX
-ndbapi-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends

@@ -59,3 +55,7 @@
 include $(MAKE_DIR)/xml-txt
 #include $(MAKE_DIR)/xml-info
 include $(MAKE_DIR)/xml-depend
+
+# Import directory specific extensions
+
+include $(MAKE_DIR)/Makefile.ext


Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/proto-doc/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 3, Lines Added: 4, Lines Deleted: 5; 925 bytes

@@ -20,7 +20,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . 
 IDMAP_SRCS = $(proto_book_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -35,10 +34,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = proto-book.xml
 
-# TODO: FIX
-proto-book-prepped.xml: $(IDMAP_OBJS)
-proto-book-remprepped.xml: $(IDMAP_OBJS)
-
 # ... put any special-case target rules here ...
 
 # Include this clean target if you generate plain text output

@@ -77,3 +72,7 @@
 include $(MAKE_DIR)/xml-remark
 include $(MAKE_DIR)/xml-depend
 include $(MAKE_DIR)/xml-useless
+
+# Import directory specific extensions
+
+include $(MAKE_DIR)/Makefile.ext


Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/query-browser/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 721 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../userguide ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(query_browser_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = query-browser.xml
 
-# TODO: FIX
-query-browser-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/query-browser-cy/Makefile
===================================================================
--- trunk/query-browser-cy/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/query-browser-cy/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 730 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../userguide ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(query_browser_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = query-browser.xml
 
-# TODO: FIX
-query-browser-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/refman-4.1/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 8; 877 bytes

@@ -26,7 +26,6 @@
 # Add the *-core files here because we need their IDs for ID resolution
 # even though they are not directly part of the manual sources
 IDMAP_SRCS = $(manual_IDMAP_SOURCES) dba-core.xml functions-core.xml
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -41,13 +40,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = manual.xml
 
-# TODO: FIX
-manual-prepped.xml: $(IDMAP_OBJS)
-manual-manprepped.xml: $(IDMAP_OBJS)
- 
-# Make sure we trigger a rebuild of the dynamic tables
-# when validating manual.xml or requiring the DBA chapter
- 
 mysql.info: manual.info
 	cp manual.info mysql.info
 


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/refman-5.0/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 8; 877 bytes

@@ -28,7 +28,6 @@
 # Add the *-core files here because we need their IDs for ID resolution
 # even though they are not directly part of the manual sources
 IDMAP_SRCS = $(manual_IDMAP_SOURCES) dba-core.xml functions-core.xml
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -43,13 +42,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = manual.xml
 
-# TODO: FIX
-manual-prepped.xml: $(IDMAP_OBJS)
-manual-manprepped.xml: $(IDMAP_OBJS)
- 
-# Make sure we trigger a rebuild of the dynamic tables
-# when validating manual.xml or requiring the DBA chapter
- 
 mysql.info: manual.info
 	cp manual.info mysql.info
 


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/refman-5.1/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 8; 891 bytes

@@ -26,7 +26,6 @@
 # Add the *-core files here because we need their IDs for ID resolution
 # even though they are not directly part of the manual sources
 IDMAP_SRCS = $(manual_IDMAP_SOURCES) dba-core.xml functions-core.xml
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -41,13 +40,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = manual.xml
 
-# TODO: FIX
-manual-prepped.xml: $(IDMAP_OBJS)
-manual-manprepped.xml: $(IDMAP_OBJS)
- 
-# Make sure we trigger a rebuild of the dynamic tables
-# when validating manual.xml or requiring the DBA chapter
-
 manual.wc: manual-prepped.xml
 	$(XMLWORDCOUNT) manual-prepped.xml
 


Modified: trunk/refman-common/Makefile
===================================================================
--- trunk/refman-common/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/refman-common/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 1; 512 bytes

@@ -20,7 +20,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-4.1 ../refman-5.0 ../refman-5.1/
 IDMAP_SRCS = $(call base_xml_files, $(wildcard *.xml))
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 


Modified: trunk/sample-data/sakila/Makefile
===================================================================
--- trunk/sample-data/sakila/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/sample-data/sakila/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 615 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . 
 IDMAP_SRCS = $(sakila_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = sakila.xml
 
-# TODO: FIX
-sakila-prepped.xml: $(IDMAP_OBJS)
-
 clean::
 	$(RM) sakila.txt
 


Modified: trunk/sample-data/world/Makefile
===================================================================
--- trunk/sample-data/world/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/sample-data/world/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 632 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . 
 IDMAP_SRCS = $(world_setup_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = world-setup.xml
 
-# TODO: FIX
-world-setup-prepped.xml: $(IDMAP_OBJS)
-
 clean::
 	$(RM) world-setup.txt
 


Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/userguide/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 670 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../refman-5.1 ../refman-common
 IDMAP_SRCS = $(userguide_IDMAP_SOURCES)
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = userguide.xml
 
-# TODO: FIX
-userguide-prepped.xml: $(IDMAP_OBJS)
-
 # Import document dependency specifications
 
 include Makefile.depends


Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile	2007-05-15 16:27:10 UTC (rev 6466)
+++ trunk/workbench/Makefile	2007-05-15 17:07:25 UTC (rev 6467)
Changed blocks: 2, Lines Added: 0, Lines Deleted: 4; 682 bytes

@@ -19,7 +19,6 @@
 IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
 IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common ../migration-toolkit
 IDMAP_SRCS = $(workbench_IDMAP_SOURCES) introduction.xml
-IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
 
 # Import standard variables
 

@@ -34,9 +33,6 @@
 # Files for which to generate dependencies
 DEPEND_FILES = workbench.xml
 
-# TODO: FIX
-workbench-prepped.xml: $(IDMAP_OBJS)
-
 clean::
 	$(RM) workbench.txt
Thread
• svn commit - mysqldoc@docsrva: r6467 - in trunk: . administrator administrator-ro arbitrary dynamic-docs falcon gui-common gui-common-cy gui-common-ro...	paul	15 May