Author: paul
Date: 2006-07-22 19:53:45 +0200 (Sat, 22 Jul 2006)
New Revision: 2806
Log:
r12648@frost: paul | 2006-07-22 12:50:12 -0500
xml-depend: remove duplicates from dependency list (suppresses cp
warning messages during image-copying operations for other targets).
Regenerate dependencies.
Modified:
trunk/administrator/Makefile
trunk/internals/Makefile
trunk/make.d/xml-depend
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/userguide/Makefile
trunk/workbench/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11840
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12594
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:11840
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:12648
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:8441
Modified: trunk/administrator/Makefile
===================================================================
--- trunk/administrator/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/administrator/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 2795 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-source-install.xml ../gui-common/appendix-third-party.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-troubleshooting.xml ../gui-common/chapter-options-connections.xml ../gui-common/chapter-options-editors.xml ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-introduction.xml ../gui-common/chapter-table-editor.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/indexeditor.png ../gui-common/images/options-connection.png ../gui-common/images/options.png ../gui-common/images/tableeditor.png chapter-options-administrator.xml copyright.xml images/configure-service-mode-connection.png images/configure-service-mode-window.png images/connection.png images/graph-settings.png!
images/mainwindow.png images/marked-area.png images/replication.png images/restore-content.png images/server-logs-general-log.png images/system-tray.png images/user-accounts.png images/user-information.png legalnotice.en.xml
administrator-prepped.xml: $(ADMINISTRATOR_SRCS)
Modified: trunk/internals/Makefile
===================================================================
--- trunk/internals/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/internals/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 505 bytes
@@ -28,7 +28,7 @@
INTERNALS_SRCS_EXTRA = fixedchars.ent
-INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml legalnotice.en.xml copyright.xml
+INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml copyright.xml legalnotice.en.xml
internals-prepped.xml: $(INTERNALS_SRCS)
Modified: trunk/make.d/xml-depend
===================================================================
--- trunk/make.d/xml-depend 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/make.d/xml-depend 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 4; 1076 bytes
@@ -13,7 +13,8 @@
# 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.
+# to by the XML document. Use sort -u to remove duplicates, tr to
+# replace newlines with spaces.
# Note: xsltproc must be run without the --xinclude option.
# - Update the Makefile line that defines the dependency variable,
# writing the result to Makefile.new.
@@ -35,9 +36,7 @@
%.depend: %.xml
cp Makefile Makefile.bak
VAR=`echo $* | tr a-z- A-Z_`_SRCS && \
- DEPS=`xsltproc --novalid \
- --stringparam xmldepend.terminator " " \
- $(XMLDEPEND_XSL) $<` && \
+ DEPS=`xsltproc --novalid $(XMLDEPEND_XSL) $<|sort -u|tr '\n' ' '` && \
sed \
-e "s|^$${VAR} *=.*|$${VAR} = "'$$'"($${VAR}_EXTRA) $< $$DEPS|" \
Makefile > Makefile.new
Modified: trunk/migration-toolkit/Makefile
===================================================================
--- trunk/migration-toolkit/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/migration-toolkit/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 2222 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.xml copyright.xml images/access-object-permissions.png images/access-options-show.png images/access-system-tables.png images/bulk-transfer.png images/configuration-type.png images/connect-servers.png images/creating-objects.png images/creation-options.png images/manual-editing-detail.png images/manual-editing.png images/mapping-options.png images/meta-migration.png images/migration-plan.png images/object-mapping.png images/object-selection-detail.png images/object-selection-expression.png images/object-selection.png images/reverse-engineering.png images/schema-selection.png images/source-database-access.png images/source-database-mssql.png images/source-database-mysql.png images/source-database-oracle-nodriver.png images/source-database-oracle.png images/summary.png images/target-database-mysql.png images/welcome-screen.png legalnotice.en.xml
migration-toolkit-prepped.xml: $(MIGRATION_TOOLKIT_SRCS)
Modified: trunk/mysqltest/Makefile
===================================================================
--- trunk/mysqltest/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/mysqltest/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 689 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(MYSQLTEST_SRCS_EXTRA) mysqltest.xml command-reference.xml components.xml copyright.xml introduction.xml legalnotice.en.xml preface.xml programs.xml tutorial.xml
mysqltest-prepped.xml: $(MYSQLTEST_SRCS)
Modified: trunk/ndbapi/Makefile
===================================================================
--- trunk/ndbapi/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/ndbapi/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 2521 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(NDBAPI_SRCS_EXTRA) ndbapi.xml copyright.xml errors.xml examples.xml getting-started.xml images/Ndb-class.png images/Ndb-cluster-connection-class.png images/NdbBlob-class.png images/NdbDictionary-AutoGrowSpecification-struct.png images/NdbDictionary-Column-class.png images/NdbDictionary-Dictionary-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-Object-class.png images/NdbDictionary-classes.png images/NdbError-struct.png images/NdbEventOperation-class.png images/NdbIndexOperation-class.png images/NdbIndexScanOperation-class.png images/NdbOperation-class.png images/NdbOperation-subclasses.png images/NdbRecAttr-class.png images/NdbScanFilter-class.png images/!
NdbScanOperation-class.png images/NdbTransaction-class.png legalnotice.en.xml mgm-api.xml ndb-classes.xml overview.xml
ndbapi-prepped.xml: $(NDBAPI_SRCS)
Modified: trunk/proto-doc/Makefile
===================================================================
--- trunk/proto-doc/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/proto-doc/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 505 bytes
@@ -28,7 +28,7 @@
PROTO_DOC_SRCS_EXTRA = fixedchars.ent
-PROTO_DOC_SRCS = $(PROTO_DOC_SRCS_EXTRA) proto-doc.xml legalnotice.en.xml copyright.xml
+PROTO_DOC_SRCS = $(PROTO_DOC_SRCS_EXTRA) proto-doc.xml copyright.xml legalnotice.en.xml
proto-doc-prepped.xml: $(PROTO_DOC_SRCS)
Modified: trunk/query-browser/Makefile
===================================================================
--- trunk/query-browser/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/query-browser/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 2759 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-source-install.xml ../gui-common/appendix-third-party.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-troubleshooting.xml ../gui-common/chapter-options-connections.xml ../gui-common/chapter-options-editors.xml ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-introduction.xml ../gui-common/chapter-table-editor.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/indexeditor.png ../gui-common/images/options-connection.png ../gui-common/images/options.png ../gui-common/images/tableeditor.png chapter-options-query-browser.xml copyright.xml images/blob-buttons.png images/buttonbar.png images/connection.png images/dynamiclist.png images/file-open-script.png images/mainscre!
en.png images/qb-options.png images/querybar.png images/schematabrowser.png images/script-editor.png images/stored-procedure-database-browser.png images/tabletool.png images/twosakilas.png legalnotice.en.xml
query-browser-prepped.xml: $(QUERY_BROWSER_SRCS)
Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/refman-4.1/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 9185 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-3.23.xml ../refman-common/news-4.0.xml ../refman-common/news-4.1.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml data-types.xml database-ad!
ministration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functions.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.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/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-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadm!
in-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png im!
ages/myo
dbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml porting.xml preface.xml problems.xml replication.xml reservedwords.xml restrictions.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
@@ -56,7 +56,7 @@
CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-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_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
@@ -64,7 +64,7 @@
CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-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_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.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/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-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.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-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png i!
mages/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/refman-5.0/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 9159 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-5.0.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml data-types.xml database-administration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml extending-mysql.xml functi!
ons.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.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/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-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png imag!
es/myodbc-win-install-step2.png images/myodbc-win-install-step!
3.png im
ages/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png information-schema.xml innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml porting.xml precision-math.xml preface.xml problems.xml replication.xml reservedwords.xml restrictions.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
@@ -56,7 +56,7 @@
CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-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_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
@@ -64,7 +64,7 @@
CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-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_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.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/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-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.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-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png i!
mages/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/refman-5.1/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 3, Lines Added: 3, Lines Deleted: 3; 9545 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml ../refman-common/bug-reports.xml ../refman-common/cjk-faq.en.xml ../refman-common/credits.xml ../refman-common/environment-variables.xml ../refman-common/gpl-license.xml ../refman-common/information-sources.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/mysql-floss-license-exception.xml ../refman-common/news-5.1.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/regexp.xml ../refman-common/reserved-new-5.1.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml apis.xml charset.xml client-utility-programs.xml connector-j.xml connector-mxj.xml connector-net.xml connector-odbc.xml connector-php.xml connectors.xml copyright.xml custom-engine.xml data-types.xml database-administration.xml errmsgs-client.xml errmsgs-server.xml error-handling.xml events.xml extending-mysql.xml functions.x!
ml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png images/custom-engine-overview.png images/multi-comp-1.png images/myaccess-odbc.png images/myaccess.png images/myarchitecture.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/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-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodb!
c-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmi!
n-tracin
g.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-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png images/pluggable-storage-overview.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png information-schema.xml innodb.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml limits.xml mysql-cluster.xml news.xml optimization.xml partitioning.xml pluggable-storage.xml porting.xml precision-math.xml preface.xml problems.xml replication.xml reservedwords.xml restrictions.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml
manual-prepped.xml: $(MANUAL_SRCS)
manual-manprepped.xml: $(MANUAL_SRCS)
@@ -56,7 +56,7 @@
CONNECTOR_NET_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-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_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png
connector-net-prepped.xml: $(CONNECTOR_NET_SRCS)
@@ -64,7 +64,7 @@
CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/urls.ent
-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_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.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/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-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.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-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png i!
mages/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png
connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS)
Modified: trunk/sample-data/sakila/Makefile
===================================================================
--- trunk/sample-data/sakila/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/sample-data/sakila/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 519 bytes
@@ -28,7 +28,7 @@
SAKILA_SRCS_EXTRA = sakila.ent
-SAKILA_SRCS = $(SAKILA_SRCS_EXTRA) sakila.xml images/sakila-schema.png changelog.xml
+SAKILA_SRCS = $(SAKILA_SRCS_EXTRA) sakila.xml changelog.xml images/sakila-schema.png
sakila-prepped.xml = $(WORLD_SETUP_SRCS)
Modified: trunk/userguide/Makefile
===================================================================
--- trunk/userguide/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/userguide/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 1314 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.xml configuring.xml copyright.xml creating.xml disaster.xml dotnet.xml glossary.xml images/indexing-displaying-administrator.png images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png indexing.xml installing.xml introduction.xml java.xml legalnotice.en.xml logfiles.xml modifying.xml php-mysqli.xml populating.xml querying.xml security.xml storage-engines.xml stored-procedures.xml views.xml
userguide-prepped.xml: $(USERGUIDE_SRCS)
Modified: trunk/workbench/Makefile
===================================================================
--- trunk/workbench/Makefile 2006-07-22 05:57:05 UTC (rev 2805)
+++ trunk/workbench/Makefile 2006-07-22 17:53:45 UTC (rev 2806)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 681 bytes
@@ -28,7 +28,7 @@
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_SRCS = $(WORKBENCH_SRCS_EXTRA) workbench.xml copyright.xml images/workbench-linux.png images/workbench-osx.png images/workbench-windows.png legalnotice.en.xml
workbench-prepped.xml: $(WORKBENCH_SRCS)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2806 - in trunk: . administrator internals make.d migration-toolkit mysqltest ndbapi proto-doc query-browser refman-4.... | paul | 22 Jul |
