Author: paul
Date: 2005-10-18 19:22:15 +0200 (Tue, 18 Oct 2005)
New Revision: 79
Log:
Add hook to dependency mechanism for manually-specified files.
Modified:
trunk/administrator/Makefile
trunk/internals/Makefile
trunk/make.d/xml-depend
trunk/migration-toolkit/Makefile
trunk/query-browser/Makefile
trunk/refman-4.1/Makefile
trunk/refman-5.0/Makefile
trunk/refman-5.1/Makefile
trunk/refman/Makefile
trunk/sample-data/world/Makefile
trunk/userguide/Makefile
Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/administrator/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -31,10 +31,9 @@
# Dependency list for MySQL Administrator document
# This variable is updated by "make depend"
-# NOTE: THIS ISN'T ENTIRELY CORRECT BECAUSE SOME FILES ARE REFERENCED
-# WITH ENTITIES RATHER THAN WITH XINCLUDEs.
+ADMINISTRATOR_SRCS_EXTRA = ../gui-common/gui-common.ent
-ADMINISTRATOR_SRCS = administrator.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-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
+ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.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-troubleshooting.xml gui-common/images/connectionerror.png gui-common/appendi!
x-connection-storage.xml gui-common/appendix-common-files.xml gui-common/appendix-translator-notes.xml gui-common/appendix-third-party.xml
administrator-prepped.xml: $(ADMINISTRATOR_SRCS)
Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/internals/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -33,8 +33,10 @@
# Dependency list for internals document
# This variable is updated by "make depend"
-INTERNALS_SRCS = internals.xml
+INTERNALS_SRCS_EXTRA = fixedchars.ent
+INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml
+
internals-prepped.xml = $(INTERNALS_SRCS)
#%.txt: %.html
Modified: trunk/make.d/xml-depend
===================================================================
--- trunk/make.d/xml-depend 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/make.d/xml-depend 2005-10-18 17:22:15 UTC (rev 79)
@@ -6,7 +6,7 @@
# 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.
+# from Makefile.bak.)
# - Determine the dependency variable name to hold the document
# dependencies:
# - Convert to uppercase, and convert hyphens to underscores
@@ -15,11 +15,16 @@
# Note: xsltproc should be run without the --xinclude option.
# - Update the Makefile line that defines the dependency variable.
# BEFORE RUNNING "make depend" the first time, you should put a
-# line in the Makefile that defines dependency variable (the value
+# line in the Makefile that defines the dependency variable (the value
# can be anything, even empty):
# XXX_SRCS =
# - Rename Makefile.new to Makefile.
+# 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.
+
XMLDEPEND_XSL = $(XSL_DIR)/xmldepend.xsl
%.depend: %.xml
@@ -28,7 +33,7 @@
DEPS=`xsltproc --novalid \
--stringparam xmldepend.terminator " " \
$(XMLDEPEND_XSL) $<` && \
- sed -e "s|^$$VAR.*|$$VAR = $< $$DEPS|" Makefile > Makefile.new
+ sed -e "s|^$$VAR *=.*|$$VAR = "'$$'"($${VAR}_EXTRA) $< $$DEPS|" Makefile > Makefile.new
mv Makefile.new Makefile
clean::
Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/migration-toolkit/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -31,7 +31,7 @@
# Dependency list for Migration Toolkit document
# This variable is updated by "make depend"
-MIGRATION_TOOLKIT_SRCS = migration-toolkit.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_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.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-prepped.xml: $(MIGRATION_TOOLKIT_SRCS)
Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/query-browser/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -31,10 +31,9 @@
# Dependency list for MySQL Query Browser document
# This variable is updated by "make depend"
-# NOTE: THIS ISN'T ENTIRELY CORRECT BECAUSE SOME FILES ARE REFERENCED
-# WITH ENTITIES RATHER THAN WITH XINCLUDEs.
+QUERY_BROWSER_SRCS_EXTRA = ../gui-common/gui-common.ent
-QUERY_BROWSER_SRCS = query-browser.xml images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/tabletool.png images/blob-buttons.png images/dynamiclist.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/appen!
dix-third-party.xml
+QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml images/connection.png images/mainscreen.png images/querybar.png images/twosakilas.png images/buttonbar.png images/schematabrowser.png images/script-editor.png images/tabletool.png images/blob-buttons.png images/dynamiclist.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-translato!
r-notes.xml gui-common/appendix-third-party.xml
query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)
Modified: trunk/refman/Makefile
===================================================================
--- trunk/refman/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/refman/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -34,8 +34,10 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS = manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png ima!
ges/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml refman-common/credits.xml todo.xml news.xml refman-common/news-5.0.xml refman-common/news-4.1.xml refman-common/news-4.0.xml refman-common/news-3.23.xml refman-common/news-3.22.xml refman-common/news-3.21.xml refman-common/news-3.20.xml refman-common/news-3.19.xml refman-common/news-innodb.xml refman-common/news-cluster.xml refman-common/news-myodbc.xml porting.xml refman-common/environment-variables.xml regexp.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml images/blackhole-1.png innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.pn!
g images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml refman-common/credits.xml todo.xml news.xml refman-common/news-5.0.xml refman-common/news-4.1.xml refman-common/news-4.0.xml refman-common/news-3.23.xml refman-common/news-3.22.xml refman-common/news-3.21.xml refman-common/news-3.20.xml refman-common/news-3.19.xml refman-common/news-innodb.xml refman-common/news-cluster.xml refman-common/news-myodbc.xml porting.xml refman-common/environment-variables.xml regexp.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/refman-4.1/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -35,8 +35,10 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS = manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png!
images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.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 porting.xml refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml images/blackhole-1.png innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png ima!
ges/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.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 porting.xml refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/refman-5.0/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -34,8 +34,10 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS = manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml images/blackhole-1.png innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.p!
ng images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.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 porting.xml refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml images/blackhole-1.png innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.pn!
g images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.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 porting.xml refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/refman-5.1/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -35,8 +35,10 @@
# Dependency list for MySQL Reference Manual
# This variable is updated by "make depend"
-MANUAL_SRCS = manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml partitioning.xml innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png spatial-extensions-in-mysql.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png ima!
ges/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.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 porting.xml refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.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 installing.xml tutorial.xml using-mysql-programs.xml mysql-database-administration.xml replication.xml mysql-optimization.xml client-side-scripts.xml language-structure.xml reservedwords.xml charset.xml column-types.xml functions.xml sql-syntax.xml storage-engines.xml images/blackhole-1.png innodb.xml ndbcluster.xml images/cluster-components-1.png images/multi-comp-1.png partitioning.xml spatial-extensions-in-mysql.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml mysql-apis.xml mysql-connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images!
/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml refman-common/news-connector-net.xml connector-j.xml connector-mxj.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 porting.xml refman-common/environment-variables.xml regexp.xml limits.xml restrictions.xml refman-common/gpl-license.xml refman-common/mysql-floss-license-exception.xml
+
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
Modified: trunk/sample-data/world/Makefile
===================================================================
--- trunk/sample-data/world/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/sample-data/world/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -21,7 +21,7 @@
# Dependency list for world-setup document
# This variable is updated by "make depend"
-WORLD_SETUP_SRCS = world-setup.xml
+WORLD_SETUP_SRCS = $(WORLD_SETUP_SRCS_EXTRA) world-setup.xml
world-setup-prepped.xml = $(WORLD_SETUP_SRCS)
Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile 2005-10-18 15:36:01 UTC (rev 78)
+++ trunk/userguide/Makefile 2005-10-18 17:22:15 UTC (rev 79)
@@ -31,7 +31,7 @@
# Dependency list for MySQL User Guide document
# This variable is updated by "make depend"
-USERGUIDE_SRCS = userguide.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_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.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-prepped.xml: $(USERGUIDE_SRCS)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r79 - in trunk: administrator internals make.d migration-toolkit query-browser refman refman-4.1 refman-5.0 refman-5.1 ... | paul | 18 Oct |
