Author: paul
Date: 2010-10-26 20:43:26 +0200 (Tue, 26 Oct 2010)
New Revision: 23400
Log:
r43645@arctic: paul | 2010-10-26 13:41:57 -0500
Update dependencies
Modified:
trunk/innodb-plugin-1.0/Makefile.depends
trunk/innodb-plugin-1.1/Makefile.depends
trunk/refman-4.1/Makefile.depends
trunk/refman-5.0/Makefile.depends
trunk/refman-5.1/Makefile.depends
trunk/refman-5.5/Makefile.depends
trunk/refman-5.6/Makefile.depends
trunk/refman-6.0/Makefile.depends
trunk/topic-guides/topics-5.6/Makefile.depends
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43644
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64739
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
+ 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:35498
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:43645
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:64739
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39546
Modified: trunk/innodb-plugin-1.0/Makefile.depends
===================================================================
--- trunk/innodb-plugin-1.0/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/innodb-plugin-1.0/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 623 bytes
@@ -288,7 +288,7 @@
innodb_plugin_SOURCES = innodb-plugin.xml $(innodb_plugin_INCLUDES)
innodb_plugin_IDMAPS = \
../refman-5.1/metadata/news.idmap \
- ../refman-5.1/metadata/preface-core.idmap \
+ ../refman-5.1/metadata/preface.idmap \
metadata/innodb-compression.idmap \
metadata/innodb-create-index.idmap \
metadata/innodb-downgrading.idmap \
Modified: trunk/innodb-plugin-1.1/Makefile.depends
===================================================================
--- trunk/innodb-plugin-1.1/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/innodb-plugin-1.1/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 663 bytes
@@ -306,7 +306,7 @@
../refman-5.1/metadata/information-schema.idmap \
../refman-5.1/metadata/news-5.1-core.idmap \
../refman-5.1/metadata/optimization.idmap \
- ../refman-5.1/metadata/preface-core.idmap \
+ ../refman-5.1/metadata/preface.idmap \
../refman-5.1/metadata/programs-using.idmap \
../refman-5.1/metadata/se-innodb-core.idmap \
../refman-5.5/metadata/news-5.5-core.idmap \
Modified: trunk/refman-4.1/Makefile.depends
===================================================================
--- trunk/refman-4.1/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/refman-4.1/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 5, Lines Added: 30, Lines Deleted: 6; 3119 bytes
@@ -1774,6 +1774,32 @@
legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+licenses_third_party_INCLUDES = \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-libedit.xml \
+ ../common/license-md5-41.xml \
+ ../common/license-regex.xml \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ versions.ent
+licenses_third_party_IMAGES =
+licenses_third_party_SOURCES = licenses-third-party.xml $(licenses_third_party_INCLUDES)
+licenses_third_party_IDMAPS = \
+ ../common/metadata/license-libedit.idmap
+licenses-third-party.validpure: $(licenses_third_party_SOURCES)
+licenses-third-party.titles: $(licenses_third_party_SOURCES)
+licenses-third-party.useless: $(licenses_third_party_SOURCES)
+licenses-third-party.valid: $(licenses_third_party_SOURCES) $(licenses_third_party_IDMAPS)
+licenses-third-party.validwarn: $(licenses_third_party_SOURCES) $(licenses_third_party_IDMAPS)
+licenses-third-party-prepped.xml: $(licenses_third_party_SOURCES) $(licenses_third_party_IDMAPS)
+licenses-third-party-helpprepped.xml: $(licenses_third_party_SOURCES) $(licenses_third_party_IDMAPS)
+licenses-third-party-manprepped.xml: $(licenses_third_party_SOURCES) $(licenses_third_party_IDMAPS)
+licenses-third-party-remprepped.xml: $(licenses_third_party_SOURCES) $(licenses_third_party_IDMAPS)
+
manual_INCLUDES = \
../../mysqldoc/dynamic-docs/changelog/connector-j-versions.xml \
../../mysqldoc/dynamic-docs/changelog/connector-j.xml \
@@ -2032,6 +2058,7 @@
introduction.xml \
language-structure.xml \
legalnotice.en.xml \
+ licenses-third-party.xml \
mysql-cluster-configuration-core.xml \
mysql-cluster-faq.xml \
mysql-cluster-management.xml \
@@ -2268,6 +2295,7 @@
metadata/introduction.idmap \
metadata/language-structure.idmap \
metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party.idmap \
metadata/mysql-cluster-configuration-core.idmap \
metadata/mysql-cluster-faq.idmap \
metadata/mysql-cluster-management.idmap \
@@ -2766,11 +2794,7 @@
optimization-remprepped.xml: $(optimization_SOURCES) $(optimization_IDMAPS)
preface_INCLUDES = \
- ../common/all-entities.ent \
../common/fixedchars.ent \
- ../common/license-libedit.xml \
- ../common/license-md5-41.xml \
- ../common/license-regex.xml \
../common/phrases.ent \
../common/product-versions.ent \
../refman-common/urls.ent \
@@ -2780,8 +2804,8 @@
preface_IMAGES =
preface_SOURCES = preface.xml $(preface_INCLUDES)
preface_IDMAPS = \
- ../common/metadata/license-libedit.idmap \
- metadata/legalnotice.en.idmap
+ metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party.idmap
preface.validpure: $(preface_SOURCES)
preface.titles: $(preface_SOURCES)
preface.useless: $(preface_SOURCES)
Modified: trunk/refman-5.0/Makefile.depends
===================================================================
--- trunk/refman-5.0/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/refman-5.0/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 12, Lines Added: 133, Lines Deleted: 103; 15392 bytes
@@ -1704,6 +1704,94 @@
dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure.xml: $(dynxml_local_language_structure_IDMAPS) $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_licenses_third_party_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/licenses/products.xml \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
+ ../common/license-apache-commons-digester.xml \
+ ../common/license-apache-commons-fileupload.xml \
+ ../common/license-apache-commons-io.xml \
+ ../common/license-apache-commons-lang.xml \
+ ../common/license-apache-commons-logging.xml \
+ ../common/license-apache-commons-pool.xml \
+ ../common/license-apache-commons-validator.xml \
+ ../common/license-asm.xml \
+ ../common/license-boost.xml \
+ ../common/license-dbug.xml \
+ ../common/license-jdom.xml \
+ ../common/license-jquery.xml \
+ ../common/license-jqueryui.xml \
+ ../common/license-libcurl.xml \
+ ../common/license-libedit.xml \
+ ../common/license-libevent.xml \
+ ../common/license-libstring.xml \
+ ../common/license-log4j-1-2-9.xml \
+ ../common/license-log4j.xml \
+ ../common/license-lpeg.xml \
+ ../common/license-luafilesystem.xml \
+ ../common/license-openssl-0.9.8o.xml \
+ ../common/license-regex.xml \
+ ../common/license-spring-framework.xml \
+ ../common/license-stringtemplate.xml \
+ ../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
+ ../common/license-zlib.xml \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ licenses-third-party-core.xml \
+ versions.ent
+dynxml_local_licenses_third_party_IMAGES =
+dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
+dynxml_local_licenses_third_party_IDMAPS = \
+ ../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
+ ../common/metadata/license-apache-commons-digester.idmap \
+ ../common/metadata/license-apache-commons-fileupload.idmap \
+ ../common/metadata/license-apache-commons-io.idmap \
+ ../common/metadata/license-apache-commons-lang.idmap \
+ ../common/metadata/license-apache-commons-logging.idmap \
+ ../common/metadata/license-apache-commons-pool.idmap \
+ ../common/metadata/license-apache-commons-validator.idmap \
+ ../common/metadata/license-asm.idmap \
+ ../common/metadata/license-boost.idmap \
+ ../common/metadata/license-dbug.idmap \
+ ../common/metadata/license-jdom.idmap \
+ ../common/metadata/license-jquery.idmap \
+ ../common/metadata/license-jqueryui.idmap \
+ ../common/metadata/license-libcurl.idmap \
+ ../common/metadata/license-libedit.idmap \
+ ../common/metadata/license-libevent.idmap \
+ ../common/metadata/license-libstring.idmap \
+ ../common/metadata/license-log4j-1-2-9.idmap \
+ ../common/metadata/license-log4j.idmap \
+ ../common/metadata/license-lpeg.idmap \
+ ../common/metadata/license-luafilesystem.idmap \
+ ../common/metadata/license-openssl-0.9.8o.idmap \
+ ../common/metadata/license-regex.idmap \
+ ../common/metadata/license-spring-framework.idmap \
+ ../common/metadata/license-stringtemplate.idmap \
+ ../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
+ ../common/metadata/license-zlib.idmap
+dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.valid: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.validwarn: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-prepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-helpprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-manprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-remprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.xml: $(dynxml_local_licenses_third_party_IDMAPS) $(dynxml_local_licenses_third_party_INCLUDES)
dynxml_local_manual_index_cfunc_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -3881,93 +3969,6 @@
dynxml-local-news-5.0-manprepped.xml: $(dynxml_local_news_5_0_SOURCES) $(dynxml_local_news_5_0_IDMAPS)
dynxml-local-news-5.0-remprepped.xml: $(dynxml_local_news_5_0_SOURCES) $(dynxml_local_news_5_0_IDMAPS)
dynxml-local-news-5.0.xml: $(dynxml_local_news_5_0_IDMAPS) $(dynxml_local_news_5_0_INCLUDES)
-dynxml_local_preface_INCLUDES = \
- ../../mysqldoc/dynamic-docs/licenses/products.xml \
- ../common/all-entities.ent \
- ../common/fixedchars.ent \
- ../common/license-apache-2-0.xml \
- ../common/license-apache-commons-collections.xml \
- ../common/license-apache-commons-dbcp.xml \
- ../common/license-apache-commons-digester.xml \
- ../common/license-apache-commons-fileupload.xml \
- ../common/license-apache-commons-io.xml \
- ../common/license-apache-commons-lang.xml \
- ../common/license-apache-commons-logging.xml \
- ../common/license-apache-commons-pool.xml \
- ../common/license-apache-commons-validator.xml \
- ../common/license-asm.xml \
- ../common/license-boost.xml \
- ../common/license-dbug.xml \
- ../common/license-jdom.xml \
- ../common/license-jquery.xml \
- ../common/license-jqueryui.xml \
- ../common/license-libcurl.xml \
- ../common/license-libedit.xml \
- ../common/license-libevent.xml \
- ../common/license-libstring.xml \
- ../common/license-log4j-1-2-9.xml \
- ../common/license-log4j.xml \
- ../common/license-lpeg.xml \
- ../common/license-luafilesystem.xml \
- ../common/license-openssl-0.9.8o.xml \
- ../common/license-regex.xml \
- ../common/license-spring-framework.xml \
- ../common/license-stringtemplate.xml \
- ../common/license-tomcat.xml \
- ../common/license-zlib.xml \
- ../common/phrases.ent \
- ../common/product-versions.ent \
- ../mysql-monitor-2.0/version.ent \
- ../mysql-monitor-common/enterprise.ent \
- ../refman-common/urls.ent \
- ../workbench/workbench.ent \
- all-entities.ent \
- preface-core.xml \
- versions.ent
-dynxml_local_preface_IMAGES =
-dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
-dynxml_local_preface_IDMAPS = \
- ../common/metadata/license-apache-2-0.idmap \
- ../common/metadata/license-apache-commons-collections.idmap \
- ../common/metadata/license-apache-commons-dbcp.idmap \
- ../common/metadata/license-apache-commons-digester.idmap \
- ../common/metadata/license-apache-commons-fileupload.idmap \
- ../common/metadata/license-apache-commons-io.idmap \
- ../common/metadata/license-apache-commons-lang.idmap \
- ../common/metadata/license-apache-commons-logging.idmap \
- ../common/metadata/license-apache-commons-pool.idmap \
- ../common/metadata/license-apache-commons-validator.idmap \
- ../common/metadata/license-asm.idmap \
- ../common/metadata/license-boost.idmap \
- ../common/metadata/license-dbug.idmap \
- ../common/metadata/license-jdom.idmap \
- ../common/metadata/license-jquery.idmap \
- ../common/metadata/license-jqueryui.idmap \
- ../common/metadata/license-libcurl.idmap \
- ../common/metadata/license-libedit.idmap \
- ../common/metadata/license-libevent.idmap \
- ../common/metadata/license-libstring.idmap \
- ../common/metadata/license-log4j-1-2-9.idmap \
- ../common/metadata/license-log4j.idmap \
- ../common/metadata/license-lpeg.idmap \
- ../common/metadata/license-luafilesystem.idmap \
- ../common/metadata/license-openssl-0.9.8o.idmap \
- ../common/metadata/license-regex.idmap \
- ../common/metadata/license-spring-framework.idmap \
- ../common/metadata/license-stringtemplate.idmap \
- ../common/metadata/license-tomcat.idmap \
- ../common/metadata/license-zlib.idmap \
- metadata/legalnotice.en.idmap
-dynxml-local-preface.validpure: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.titles: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.useless: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.valid: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.validwarn: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-prepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-helpprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-manprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-remprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.xml: $(dynxml_local_preface_IDMAPS) $(dynxml_local_preface_INCLUDES)
dynxml_local_programs_admin_util_INCLUDES = \
../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
../../mysqldoc/dynamic-docs/command-optvars/mysql_tableinfo.xml \
@@ -4852,6 +4853,20 @@
legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+licenses_third_party_core_INCLUDES =
+licenses_third_party_core_IMAGES =
+licenses_third_party_core_SOURCES = licenses-third-party-core.xml $(licenses_third_party_core_INCLUDES)
+licenses_third_party_core_IDMAPS =
+licenses-third-party-core.validpure: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.titles: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.useless: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.valid: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core.validwarn: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-prepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-helpprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-manprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-remprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+
manual_index_cfunc_core_INCLUDES =
manual_index_cfunc_core_IMAGES =
manual_index_cfunc_core_SOURCES = manual-index-cfunc-core.xml $(manual_index_cfunc_core_INCLUDES)
@@ -5226,6 +5241,7 @@
../common/license-spring-framework.xml \
../common/license-stringtemplate.xml \
../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
../common/license-zlib.xml \
../common/oracle-notice-ga.en.xml \
../common/phrases.ent \
@@ -5574,6 +5590,7 @@
dynxml-local-functions.xml \
dynxml-local-installing.xml \
dynxml-local-language-structure.xml \
+ dynxml-local-licenses-third-party.xml \
dynxml-local-manual-index-cfunc.xml \
dynxml-local-manual-index-command.xml \
dynxml-local-manual-index-function.xml \
@@ -5591,7 +5608,6 @@
dynxml-local-mysql-cluster-configuration.xml \
dynxml-local-mysql-cluster-programs.xml \
dynxml-local-news-5.0.xml \
- dynxml-local-preface.xml \
dynxml-local-programs-admin-util.xml \
dynxml-local-programs-client.xml \
dynxml-local-programs-server.xml \
@@ -5622,6 +5638,7 @@
introduction.xml \
language-structure-core.xml \
legalnotice.en.xml \
+ licenses-third-party-core.xml \
manual-index-cfunc-core.xml \
manual-index-command-core.xml \
manual-index-core.xml \
@@ -5751,7 +5768,7 @@
news.xml \
optimization.xml \
precision-math.xml \
- preface-core.xml \
+ preface.xml \
programs-admin-util-core.xml \
programs-client-core.xml \
programs-development.xml \
@@ -6049,6 +6066,7 @@
../common/metadata/license-spring-framework.idmap \
../common/metadata/license-stringtemplate.idmap \
../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
../common/metadata/license-zlib.idmap \
../mysql-monitor-2.0/metadata/dashboard-replication.idmap \
../mysql-monitor-2.0/metadata/install-uninstall.idmap \
@@ -6159,6 +6177,7 @@
metadata/introduction.idmap \
metadata/language-structure-core.idmap \
metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap \
metadata/mysql-cluster-configuration-core.idmap \
metadata/mysql-cluster-management.idmap \
metadata/mysql-cluster-multi-computer.idmap \
@@ -6169,7 +6188,7 @@
metadata/news.idmap \
metadata/optimization.idmap \
metadata/precision-math.idmap \
- metadata/preface-core.idmap \
+ metadata/preface.idmap \
metadata/programs-admin-util-core.idmap \
metadata/programs-client-core.idmap \
metadata/programs-development.idmap \
@@ -7164,19 +7183,30 @@
precision-math-manprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
precision-math-remprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
-preface_core_INCLUDES =
-preface_core_IMAGES =
-preface_core_SOURCES = preface-core.xml $(preface_core_INCLUDES)
-preface_core_IDMAPS =
-preface-core.validpure: $(preface_core_SOURCES)
-preface-core.titles: $(preface_core_SOURCES)
-preface-core.useless: $(preface_core_SOURCES)
-preface-core.valid: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core.validwarn: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-prepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-helpprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-manprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-remprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
+preface_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ versions.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS = \
+ metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-helpprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
programs_admin_util_core_INCLUDES =
programs_admin_util_core_IMAGES =
Modified: trunk/refman-5.1/Makefile.depends
===================================================================
--- trunk/refman-5.1/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/refman-5.1/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 12, Lines Added: 145, Lines Deleted: 114; 16338 bytes
@@ -1900,6 +1900,105 @@
dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure.xml: $(dynxml_local_language_structure_IDMAPS) $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_licenses_third_party_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/licenses/products.xml \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
+ ../common/license-apache-commons-digester.xml \
+ ../common/license-apache-commons-fileupload.xml \
+ ../common/license-apache-commons-io.xml \
+ ../common/license-apache-commons-lang.xml \
+ ../common/license-apache-commons-logging.xml \
+ ../common/license-apache-commons-pool.xml \
+ ../common/license-apache-commons-validator.xml \
+ ../common/license-asm.xml \
+ ../common/license-boost.xml \
+ ../common/license-dbug.xml \
+ ../common/license-findgtest-cmake.xml \
+ ../common/license-getarg.xml \
+ ../common/license-jdom.xml \
+ ../common/license-jquery.xml \
+ ../common/license-jqueryui.xml \
+ ../common/license-libcurl.xml \
+ ../common/license-libedit.xml \
+ ../common/license-libevent.xml \
+ ../common/license-libstring.xml \
+ ../common/license-log4j-1-2-9.xml \
+ ../common/license-log4j.xml \
+ ../common/license-lpeg.xml \
+ ../common/license-luafilesystem.xml \
+ ../common/license-md5.xml \
+ ../common/license-nt-servc.xml \
+ ../common/license-openssl-0.9.8o.xml \
+ ../common/license-regex.xml \
+ ../common/license-sha1-in-c.xml \
+ ../common/license-spring-framework.xml \
+ ../common/license-stringtemplate.xml \
+ ../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
+ ../common/license-zlib.xml \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../innodb-plugin-1.0/innodb-entities.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ licenses-third-party-core.xml \
+ versions.ent
+dynxml_local_licenses_third_party_IMAGES =
+dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
+dynxml_local_licenses_third_party_IDMAPS = \
+ ../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
+ ../common/metadata/license-apache-commons-digester.idmap \
+ ../common/metadata/license-apache-commons-fileupload.idmap \
+ ../common/metadata/license-apache-commons-io.idmap \
+ ../common/metadata/license-apache-commons-lang.idmap \
+ ../common/metadata/license-apache-commons-logging.idmap \
+ ../common/metadata/license-apache-commons-pool.idmap \
+ ../common/metadata/license-apache-commons-validator.idmap \
+ ../common/metadata/license-asm.idmap \
+ ../common/metadata/license-boost.idmap \
+ ../common/metadata/license-dbug.idmap \
+ ../common/metadata/license-findgtest-cmake.idmap \
+ ../common/metadata/license-getarg.idmap \
+ ../common/metadata/license-jdom.idmap \
+ ../common/metadata/license-jquery.idmap \
+ ../common/metadata/license-jqueryui.idmap \
+ ../common/metadata/license-libcurl.idmap \
+ ../common/metadata/license-libedit.idmap \
+ ../common/metadata/license-libevent.idmap \
+ ../common/metadata/license-libstring.idmap \
+ ../common/metadata/license-log4j-1-2-9.idmap \
+ ../common/metadata/license-log4j.idmap \
+ ../common/metadata/license-lpeg.idmap \
+ ../common/metadata/license-luafilesystem.idmap \
+ ../common/metadata/license-md5.idmap \
+ ../common/metadata/license-nt-servc.idmap \
+ ../common/metadata/license-openssl-0.9.8o.idmap \
+ ../common/metadata/license-regex.idmap \
+ ../common/metadata/license-sha1-in-c.idmap \
+ ../common/metadata/license-spring-framework.idmap \
+ ../common/metadata/license-stringtemplate.idmap \
+ ../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
+ ../common/metadata/license-zlib.idmap
+dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.valid: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.validwarn: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-prepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-helpprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-manprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-remprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.xml: $(dynxml_local_licenses_third_party_IDMAPS) $(dynxml_local_licenses_third_party_INCLUDES)
dynxml_local_manual_index_cfunc_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -4456,104 +4555,6 @@
dynxml-local-news-5.1-manprepped.xml: $(dynxml_local_news_5_1_SOURCES) $(dynxml_local_news_5_1_IDMAPS)
dynxml-local-news-5.1-remprepped.xml: $(dynxml_local_news_5_1_SOURCES) $(dynxml_local_news_5_1_IDMAPS)
dynxml-local-news-5.1.xml: $(dynxml_local_news_5_1_IDMAPS) $(dynxml_local_news_5_1_INCLUDES)
-dynxml_local_preface_INCLUDES = \
- ../../mysqldoc/dynamic-docs/licenses/products.xml \
- ../common/all-entities.ent \
- ../common/fixedchars.ent \
- ../common/license-apache-2-0.xml \
- ../common/license-apache-commons-collections.xml \
- ../common/license-apache-commons-dbcp.xml \
- ../common/license-apache-commons-digester.xml \
- ../common/license-apache-commons-fileupload.xml \
- ../common/license-apache-commons-io.xml \
- ../common/license-apache-commons-lang.xml \
- ../common/license-apache-commons-logging.xml \
- ../common/license-apache-commons-pool.xml \
- ../common/license-apache-commons-validator.xml \
- ../common/license-asm.xml \
- ../common/license-boost.xml \
- ../common/license-dbug.xml \
- ../common/license-findgtest-cmake.xml \
- ../common/license-getarg.xml \
- ../common/license-jdom.xml \
- ../common/license-jquery.xml \
- ../common/license-jqueryui.xml \
- ../common/license-libcurl.xml \
- ../common/license-libedit.xml \
- ../common/license-libevent.xml \
- ../common/license-libstring.xml \
- ../common/license-log4j-1-2-9.xml \
- ../common/license-log4j.xml \
- ../common/license-lpeg.xml \
- ../common/license-luafilesystem.xml \
- ../common/license-md5.xml \
- ../common/license-nt-servc.xml \
- ../common/license-openssl-0.9.8o.xml \
- ../common/license-regex.xml \
- ../common/license-sha1-in-c.xml \
- ../common/license-spring-framework.xml \
- ../common/license-stringtemplate.xml \
- ../common/license-tomcat.xml \
- ../common/license-zlib.xml \
- ../common/phrases.ent \
- ../common/product-versions.ent \
- ../innodb-plugin-1.0/innodb-entities.ent \
- ../mysql-monitor-2.0/version.ent \
- ../mysql-monitor-common/enterprise.ent \
- ../refman-common/urls.ent \
- ../workbench/workbench.ent \
- all-entities.ent \
- preface-core.xml \
- versions.ent
-dynxml_local_preface_IMAGES =
-dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
-dynxml_local_preface_IDMAPS = \
- ../common/metadata/license-apache-2-0.idmap \
- ../common/metadata/license-apache-commons-collections.idmap \
- ../common/metadata/license-apache-commons-dbcp.idmap \
- ../common/metadata/license-apache-commons-digester.idmap \
- ../common/metadata/license-apache-commons-fileupload.idmap \
- ../common/metadata/license-apache-commons-io.idmap \
- ../common/metadata/license-apache-commons-lang.idmap \
- ../common/metadata/license-apache-commons-logging.idmap \
- ../common/metadata/license-apache-commons-pool.idmap \
- ../common/metadata/license-apache-commons-validator.idmap \
- ../common/metadata/license-asm.idmap \
- ../common/metadata/license-boost.idmap \
- ../common/metadata/license-dbug.idmap \
- ../common/metadata/license-findgtest-cmake.idmap \
- ../common/metadata/license-getarg.idmap \
- ../common/metadata/license-jdom.idmap \
- ../common/metadata/license-jquery.idmap \
- ../common/metadata/license-jqueryui.idmap \
- ../common/metadata/license-libcurl.idmap \
- ../common/metadata/license-libedit.idmap \
- ../common/metadata/license-libevent.idmap \
- ../common/metadata/license-libstring.idmap \
- ../common/metadata/license-log4j-1-2-9.idmap \
- ../common/metadata/license-log4j.idmap \
- ../common/metadata/license-lpeg.idmap \
- ../common/metadata/license-luafilesystem.idmap \
- ../common/metadata/license-md5.idmap \
- ../common/metadata/license-nt-servc.idmap \
- ../common/metadata/license-openssl-0.9.8o.idmap \
- ../common/metadata/license-regex.idmap \
- ../common/metadata/license-sha1-in-c.idmap \
- ../common/metadata/license-spring-framework.idmap \
- ../common/metadata/license-stringtemplate.idmap \
- ../common/metadata/license-tomcat.idmap \
- ../common/metadata/license-zlib.idmap \
- metadata/legalnotice.en.idmap
-dynxml-local-preface.validpure: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.titles: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.useless: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.valid: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.validwarn: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-prepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-helpprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-manprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-remprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.xml: $(dynxml_local_preface_IDMAPS) $(dynxml_local_preface_INCLUDES)
dynxml_local_programs_admin_util_INCLUDES = \
../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
@@ -6101,6 +6102,20 @@
legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+licenses_third_party_core_INCLUDES =
+licenses_third_party_core_IMAGES =
+licenses_third_party_core_SOURCES = licenses-third-party-core.xml $(licenses_third_party_core_INCLUDES)
+licenses_third_party_core_IDMAPS =
+licenses-third-party-core.validpure: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.titles: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.useless: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.valid: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core.validwarn: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-prepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-helpprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-manprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-remprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+
manual_index_cfunc_core_INCLUDES =
manual_index_cfunc_core_IMAGES =
manual_index_cfunc_core_SOURCES = manual-index-cfunc-core.xml $(manual_index_cfunc_core_INCLUDES)
@@ -6534,6 +6549,7 @@
../common/license-spring-framework.xml \
../common/license-stringtemplate.xml \
../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
../common/license-zlib.xml \
../common/oracle-notice-ga.en.xml \
../common/phrases.ent \
@@ -6925,6 +6941,7 @@
dynxml-local-functions.xml \
dynxml-local-installing-source.xml \
dynxml-local-language-structure.xml \
+ dynxml-local-licenses-third-party.xml \
dynxml-local-manual-index-cfunc.xml \
dynxml-local-manual-index-command.xml \
dynxml-local-manual-index-function.xml \
@@ -6944,7 +6961,6 @@
dynxml-local-mysql-cluster-programs.xml \
dynxml-local-mysql-cluster-replication.xml \
dynxml-local-news-5.1.xml \
- dynxml-local-preface.xml \
dynxml-local-programs-admin-util.xml \
dynxml-local-programs-client.xml \
dynxml-local-programs-server.xml \
@@ -6991,6 +7007,7 @@
introduction.xml \
language-structure-core.xml \
legalnotice.en.xml \
+ licenses-third-party-core.xml \
manual-index-cfunc-core.xml \
manual-index-command-core.xml \
manual-index-core.xml \
@@ -7135,7 +7152,7 @@
optimization.xml \
partitioning.xml \
precision-math.xml \
- preface-core.xml \
+ preface.xml \
programs-admin-util-core.xml \
programs-client-core.xml \
programs-development.xml \
@@ -7478,6 +7495,7 @@
../common/metadata/license-spring-framework.idmap \
../common/metadata/license-stringtemplate.idmap \
../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
../common/metadata/license-zlib.idmap \
../innodb-plugin-1.0/metadata/innodb-changes.idmap \
../innodb-plugin-1.0/metadata/innodb-information-schema.idmap \
@@ -7624,6 +7642,7 @@
metadata/introduction.idmap \
metadata/language-structure-core.idmap \
metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap \
metadata/mysql-cluster-configuration-core.idmap \
metadata/mysql-cluster-management.idmap \
metadata/mysql-cluster-multi-computer.idmap \
@@ -7637,7 +7656,7 @@
metadata/optimization.idmap \
metadata/partitioning.idmap \
metadata/precision-math.idmap \
- metadata/preface-core.idmap \
+ metadata/preface.idmap \
metadata/programs-admin-util-core.idmap \
metadata/programs-client-core.idmap \
metadata/programs-development.idmap \
@@ -8752,19 +8771,31 @@
precision-math-manprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
precision-math-remprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
-preface_core_INCLUDES =
-preface_core_IMAGES =
-preface_core_SOURCES = preface-core.xml $(preface_core_INCLUDES)
-preface_core_IDMAPS =
-preface-core.validpure: $(preface_core_SOURCES)
-preface-core.titles: $(preface_core_SOURCES)
-preface-core.useless: $(preface_core_SOURCES)
-preface-core.valid: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core.validwarn: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-prepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-helpprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-manprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-remprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
+preface_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../innodb-plugin-1.0/innodb-entities.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ versions.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS = \
+ metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-helpprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
programs_admin_util_core_INCLUDES =
programs_admin_util_core_IMAGES =
Modified: trunk/refman-5.5/Makefile.depends
===================================================================
--- trunk/refman-5.5/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/refman-5.5/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 11, Lines Added: 143, Lines Deleted: 113; 16218 bytes
@@ -1812,6 +1812,104 @@
dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure.xml: $(dynxml_local_language_structure_IDMAPS) $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_licenses_third_party_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/licenses/products.xml \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
+ ../common/license-apache-commons-digester.xml \
+ ../common/license-apache-commons-fileupload.xml \
+ ../common/license-apache-commons-io.xml \
+ ../common/license-apache-commons-lang.xml \
+ ../common/license-apache-commons-logging.xml \
+ ../common/license-apache-commons-pool.xml \
+ ../common/license-apache-commons-validator.xml \
+ ../common/license-asm.xml \
+ ../common/license-boost.xml \
+ ../common/license-dbug.xml \
+ ../common/license-findgtest-cmake.xml \
+ ../common/license-jdom.xml \
+ ../common/license-jquery.xml \
+ ../common/license-jqueryui.xml \
+ ../common/license-libcurl.xml \
+ ../common/license-libedit.xml \
+ ../common/license-libevent.xml \
+ ../common/license-libstring.xml \
+ ../common/license-log4j-1-2-9.xml \
+ ../common/license-log4j.xml \
+ ../common/license-lpeg.xml \
+ ../common/license-luafilesystem.xml \
+ ../common/license-md5.xml \
+ ../common/license-netlib.xml \
+ ../common/license-nt-servc.xml \
+ ../common/license-openssl-0.9.8o.xml \
+ ../common/license-regex.xml \
+ ../common/license-sha1-in-c.xml \
+ ../common/license-spring-framework.xml \
+ ../common/license-stringtemplate.xml \
+ ../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
+ ../common/license-zlib.xml \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ licenses-third-party-core.xml \
+ versions.ent
+dynxml_local_licenses_third_party_IMAGES =
+dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
+dynxml_local_licenses_third_party_IDMAPS = \
+ ../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
+ ../common/metadata/license-apache-commons-digester.idmap \
+ ../common/metadata/license-apache-commons-fileupload.idmap \
+ ../common/metadata/license-apache-commons-io.idmap \
+ ../common/metadata/license-apache-commons-lang.idmap \
+ ../common/metadata/license-apache-commons-logging.idmap \
+ ../common/metadata/license-apache-commons-pool.idmap \
+ ../common/metadata/license-apache-commons-validator.idmap \
+ ../common/metadata/license-asm.idmap \
+ ../common/metadata/license-boost.idmap \
+ ../common/metadata/license-dbug.idmap \
+ ../common/metadata/license-findgtest-cmake.idmap \
+ ../common/metadata/license-jdom.idmap \
+ ../common/metadata/license-jquery.idmap \
+ ../common/metadata/license-jqueryui.idmap \
+ ../common/metadata/license-libcurl.idmap \
+ ../common/metadata/license-libedit.idmap \
+ ../common/metadata/license-libevent.idmap \
+ ../common/metadata/license-libstring.idmap \
+ ../common/metadata/license-log4j-1-2-9.idmap \
+ ../common/metadata/license-log4j.idmap \
+ ../common/metadata/license-lpeg.idmap \
+ ../common/metadata/license-luafilesystem.idmap \
+ ../common/metadata/license-md5.idmap \
+ ../common/metadata/license-netlib.idmap \
+ ../common/metadata/license-nt-servc.idmap \
+ ../common/metadata/license-openssl-0.9.8o.idmap \
+ ../common/metadata/license-regex.idmap \
+ ../common/metadata/license-sha1-in-c.idmap \
+ ../common/metadata/license-spring-framework.idmap \
+ ../common/metadata/license-stringtemplate.idmap \
+ ../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
+ ../common/metadata/license-zlib.idmap
+dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.valid: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.validwarn: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-prepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-helpprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-manprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-remprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.xml: $(dynxml_local_licenses_third_party_IDMAPS) $(dynxml_local_licenses_third_party_INCLUDES)
dynxml_local_manual_index_cfunc_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -4039,103 +4137,6 @@
dynxml-local-performance-schema-manprepped.xml: $(dynxml_local_performance_schema_SOURCES) $(dynxml_local_performance_schema_IDMAPS)
dynxml-local-performance-schema-remprepped.xml: $(dynxml_local_performance_schema_SOURCES) $(dynxml_local_performance_schema_IDMAPS)
dynxml-local-performance-schema.xml: $(dynxml_local_performance_schema_IDMAPS) $(dynxml_local_performance_schema_INCLUDES)
-dynxml_local_preface_INCLUDES = \
- ../../mysqldoc/dynamic-docs/licenses/products.xml \
- ../common/all-entities.ent \
- ../common/fixedchars.ent \
- ../common/license-apache-2-0.xml \
- ../common/license-apache-commons-collections.xml \
- ../common/license-apache-commons-dbcp.xml \
- ../common/license-apache-commons-digester.xml \
- ../common/license-apache-commons-fileupload.xml \
- ../common/license-apache-commons-io.xml \
- ../common/license-apache-commons-lang.xml \
- ../common/license-apache-commons-logging.xml \
- ../common/license-apache-commons-pool.xml \
- ../common/license-apache-commons-validator.xml \
- ../common/license-asm.xml \
- ../common/license-boost.xml \
- ../common/license-dbug.xml \
- ../common/license-findgtest-cmake.xml \
- ../common/license-jdom.xml \
- ../common/license-jquery.xml \
- ../common/license-jqueryui.xml \
- ../common/license-libcurl.xml \
- ../common/license-libedit.xml \
- ../common/license-libevent.xml \
- ../common/license-libstring.xml \
- ../common/license-log4j-1-2-9.xml \
- ../common/license-log4j.xml \
- ../common/license-lpeg.xml \
- ../common/license-luafilesystem.xml \
- ../common/license-md5.xml \
- ../common/license-netlib.xml \
- ../common/license-nt-servc.xml \
- ../common/license-openssl-0.9.8o.xml \
- ../common/license-regex.xml \
- ../common/license-sha1-in-c.xml \
- ../common/license-spring-framework.xml \
- ../common/license-stringtemplate.xml \
- ../common/license-tomcat.xml \
- ../common/license-zlib.xml \
- ../common/phrases.ent \
- ../common/product-versions.ent \
- ../mysql-monitor-2.0/version.ent \
- ../mysql-monitor-common/enterprise.ent \
- ../refman-common/urls.ent \
- ../workbench/workbench.ent \
- all-entities.ent \
- preface-core.xml \
- versions.ent
-dynxml_local_preface_IMAGES =
-dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
-dynxml_local_preface_IDMAPS = \
- ../common/metadata/license-apache-2-0.idmap \
- ../common/metadata/license-apache-commons-collections.idmap \
- ../common/metadata/license-apache-commons-dbcp.idmap \
- ../common/metadata/license-apache-commons-digester.idmap \
- ../common/metadata/license-apache-commons-fileupload.idmap \
- ../common/metadata/license-apache-commons-io.idmap \
- ../common/metadata/license-apache-commons-lang.idmap \
- ../common/metadata/license-apache-commons-logging.idmap \
- ../common/metadata/license-apache-commons-pool.idmap \
- ../common/metadata/license-apache-commons-validator.idmap \
- ../common/metadata/license-asm.idmap \
- ../common/metadata/license-boost.idmap \
- ../common/metadata/license-dbug.idmap \
- ../common/metadata/license-findgtest-cmake.idmap \
- ../common/metadata/license-jdom.idmap \
- ../common/metadata/license-jquery.idmap \
- ../common/metadata/license-jqueryui.idmap \
- ../common/metadata/license-libcurl.idmap \
- ../common/metadata/license-libedit.idmap \
- ../common/metadata/license-libevent.idmap \
- ../common/metadata/license-libstring.idmap \
- ../common/metadata/license-log4j-1-2-9.idmap \
- ../common/metadata/license-log4j.idmap \
- ../common/metadata/license-lpeg.idmap \
- ../common/metadata/license-luafilesystem.idmap \
- ../common/metadata/license-md5.idmap \
- ../common/metadata/license-netlib.idmap \
- ../common/metadata/license-nt-servc.idmap \
- ../common/metadata/license-openssl-0.9.8o.idmap \
- ../common/metadata/license-regex.idmap \
- ../common/metadata/license-sha1-in-c.idmap \
- ../common/metadata/license-spring-framework.idmap \
- ../common/metadata/license-stringtemplate.idmap \
- ../common/metadata/license-tomcat.idmap \
- ../common/metadata/license-zlib.idmap \
- metadata/legalnotice.en.idmap
-dynxml-local-preface.validpure: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.titles: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.useless: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.valid: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.validwarn: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-prepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-helpprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-manprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-remprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.xml: $(dynxml_local_preface_IDMAPS) $(dynxml_local_preface_INCLUDES)
dynxml_local_programs_admin_util_INCLUDES = \
../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
@@ -5835,6 +5836,20 @@
legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+licenses_third_party_core_INCLUDES =
+licenses_third_party_core_IMAGES =
+licenses_third_party_core_SOURCES = licenses-third-party-core.xml $(licenses_third_party_core_INCLUDES)
+licenses_third_party_core_IDMAPS =
+licenses-third-party-core.validpure: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.titles: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.useless: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.valid: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core.validwarn: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-prepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-helpprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-manprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-remprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+
manual_index_cfunc_core_INCLUDES =
manual_index_cfunc_core_IMAGES =
manual_index_cfunc_core_SOURCES = manual-index-cfunc-core.xml $(manual_index_cfunc_core_INCLUDES)
@@ -6183,6 +6198,7 @@
../common/license-spring-framework.xml \
../common/license-stringtemplate.xml \
../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
../common/license-zlib.xml \
../common/oracle-notice-pre-ga.en.xml \
../common/phrases.ent \
@@ -6573,6 +6589,7 @@
dynxml-local-functions.xml \
dynxml-local-installing-source.xml \
dynxml-local-language-structure.xml \
+ dynxml-local-licenses-third-party.xml \
dynxml-local-manual-index-cfunc.xml \
dynxml-local-manual-index-command.xml \
dynxml-local-manual-index-function.xml \
@@ -6589,7 +6606,6 @@
dynxml-local-manual-index.xml \
dynxml-local-news-5.5.xml \
dynxml-local-performance-schema.xml \
- dynxml-local-preface.xml \
dynxml-local-programs-admin-util.xml \
dynxml-local-programs-client.xml \
dynxml-local-programs-server.xml \
@@ -6656,6 +6672,7 @@
introduction.xml \
language-structure-core.xml \
legalnotice.en.xml \
+ licenses-third-party-core.xml \
manual-index-cfunc-core.xml \
manual-index-command-core.xml \
manual-index-core.xml \
@@ -6787,7 +6804,7 @@
partitioning.xml \
performance-schema-core.xml \
precision-math.xml \
- preface-core.xml \
+ preface.xml \
programs-admin-util-core.xml \
programs-client-core.xml \
programs-development.xml \
@@ -7109,6 +7126,7 @@
../common/metadata/license-spring-framework.idmap \
../common/metadata/license-stringtemplate.idmap \
../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
../common/metadata/license-zlib.idmap \
../innodb-plugin-1.0/metadata/innodb-plugin.idmap \
../innodb-plugin-1.1/metadata/glossary-core.idmap \
@@ -7251,13 +7269,14 @@
metadata/introduction.idmap \
metadata/language-structure-core.idmap \
metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap \
metadata/news-5.5-core.idmap \
metadata/news.idmap \
metadata/optimization.idmap \
metadata/partitioning.idmap \
metadata/performance-schema-core.idmap \
metadata/precision-math.idmap \
- metadata/preface-core.idmap \
+ metadata/preface.idmap \
metadata/programs-admin-util-core.idmap \
metadata/programs-client-core.idmap \
metadata/programs-development.idmap \
@@ -8027,19 +8046,30 @@
precision-math-manprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
precision-math-remprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
-preface_core_INCLUDES =
-preface_core_IMAGES =
-preface_core_SOURCES = preface-core.xml $(preface_core_INCLUDES)
-preface_core_IDMAPS =
-preface-core.validpure: $(preface_core_SOURCES)
-preface-core.titles: $(preface_core_SOURCES)
-preface-core.useless: $(preface_core_SOURCES)
-preface-core.valid: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core.validwarn: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-prepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-helpprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-manprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-remprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
+preface_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ versions.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS = \
+ metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-helpprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
programs_admin_util_core_INCLUDES =
programs_admin_util_core_IMAGES =
Modified: trunk/refman-5.6/Makefile.depends
===================================================================
--- trunk/refman-5.6/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/refman-5.6/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 12, Lines Added: 143, Lines Deleted: 127; 17589 bytes
@@ -1763,6 +1763,104 @@
dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure.xml: $(dynxml_local_language_structure_IDMAPS) $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_licenses_third_party_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/licenses/products.xml \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
+ ../common/license-apache-commons-digester.xml \
+ ../common/license-apache-commons-fileupload.xml \
+ ../common/license-apache-commons-io.xml \
+ ../common/license-apache-commons-lang.xml \
+ ../common/license-apache-commons-logging.xml \
+ ../common/license-apache-commons-pool.xml \
+ ../common/license-apache-commons-validator.xml \
+ ../common/license-asm.xml \
+ ../common/license-boost.xml \
+ ../common/license-dbug.xml \
+ ../common/license-findgtest-cmake.xml \
+ ../common/license-jdom.xml \
+ ../common/license-jquery.xml \
+ ../common/license-jqueryui.xml \
+ ../common/license-libcurl.xml \
+ ../common/license-libedit.xml \
+ ../common/license-libevent.xml \
+ ../common/license-libstring.xml \
+ ../common/license-log4j-1-2-9.xml \
+ ../common/license-log4j.xml \
+ ../common/license-lpeg.xml \
+ ../common/license-luafilesystem.xml \
+ ../common/license-md5.xml \
+ ../common/license-netlib.xml \
+ ../common/license-nt-servc.xml \
+ ../common/license-openssl-0.9.8o.xml \
+ ../common/license-regex.xml \
+ ../common/license-sha1-in-c.xml \
+ ../common/license-spring-framework.xml \
+ ../common/license-stringtemplate.xml \
+ ../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
+ ../common/license-zlib.xml \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ licenses-third-party-core.xml \
+ versions.ent
+dynxml_local_licenses_third_party_IMAGES =
+dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
+dynxml_local_licenses_third_party_IDMAPS = \
+ ../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
+ ../common/metadata/license-apache-commons-digester.idmap \
+ ../common/metadata/license-apache-commons-fileupload.idmap \
+ ../common/metadata/license-apache-commons-io.idmap \
+ ../common/metadata/license-apache-commons-lang.idmap \
+ ../common/metadata/license-apache-commons-logging.idmap \
+ ../common/metadata/license-apache-commons-pool.idmap \
+ ../common/metadata/license-apache-commons-validator.idmap \
+ ../common/metadata/license-asm.idmap \
+ ../common/metadata/license-boost.idmap \
+ ../common/metadata/license-dbug.idmap \
+ ../common/metadata/license-findgtest-cmake.idmap \
+ ../common/metadata/license-jdom.idmap \
+ ../common/metadata/license-jquery.idmap \
+ ../common/metadata/license-jqueryui.idmap \
+ ../common/metadata/license-libcurl.idmap \
+ ../common/metadata/license-libedit.idmap \
+ ../common/metadata/license-libevent.idmap \
+ ../common/metadata/license-libstring.idmap \
+ ../common/metadata/license-log4j-1-2-9.idmap \
+ ../common/metadata/license-log4j.idmap \
+ ../common/metadata/license-lpeg.idmap \
+ ../common/metadata/license-luafilesystem.idmap \
+ ../common/metadata/license-md5.idmap \
+ ../common/metadata/license-netlib.idmap \
+ ../common/metadata/license-nt-servc.idmap \
+ ../common/metadata/license-openssl-0.9.8o.idmap \
+ ../common/metadata/license-regex.idmap \
+ ../common/metadata/license-sha1-in-c.idmap \
+ ../common/metadata/license-spring-framework.idmap \
+ ../common/metadata/license-stringtemplate.idmap \
+ ../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
+ ../common/metadata/license-zlib.idmap
+dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.valid: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.validwarn: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-prepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-helpprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-manprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-remprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.xml: $(dynxml_local_licenses_third_party_IDMAPS) $(dynxml_local_licenses_third_party_INCLUDES)
dynxml_local_manual_index_cfunc_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -3967,103 +4065,6 @@
dynxml-local-performance-schema-manprepped.xml: $(dynxml_local_performance_schema_SOURCES) $(dynxml_local_performance_schema_IDMAPS)
dynxml-local-performance-schema-remprepped.xml: $(dynxml_local_performance_schema_SOURCES) $(dynxml_local_performance_schema_IDMAPS)
dynxml-local-performance-schema.xml: $(dynxml_local_performance_schema_IDMAPS) $(dynxml_local_performance_schema_INCLUDES)
-dynxml_local_preface_INCLUDES = \
- ../../mysqldoc/dynamic-docs/licenses/products.xml \
- ../common/all-entities.ent \
- ../common/fixedchars.ent \
- ../common/license-apache-2-0.xml \
- ../common/license-apache-commons-collections.xml \
- ../common/license-apache-commons-dbcp.xml \
- ../common/license-apache-commons-digester.xml \
- ../common/license-apache-commons-fileupload.xml \
- ../common/license-apache-commons-io.xml \
- ../common/license-apache-commons-lang.xml \
- ../common/license-apache-commons-logging.xml \
- ../common/license-apache-commons-pool.xml \
- ../common/license-apache-commons-validator.xml \
- ../common/license-asm.xml \
- ../common/license-boost.xml \
- ../common/license-dbug.xml \
- ../common/license-findgtest-cmake.xml \
- ../common/license-jdom.xml \
- ../common/license-jquery.xml \
- ../common/license-jqueryui.xml \
- ../common/license-libcurl.xml \
- ../common/license-libedit.xml \
- ../common/license-libevent.xml \
- ../common/license-libstring.xml \
- ../common/license-log4j-1-2-9.xml \
- ../common/license-log4j.xml \
- ../common/license-lpeg.xml \
- ../common/license-luafilesystem.xml \
- ../common/license-md5.xml \
- ../common/license-netlib.xml \
- ../common/license-nt-servc.xml \
- ../common/license-openssl-0.9.8o.xml \
- ../common/license-regex.xml \
- ../common/license-sha1-in-c.xml \
- ../common/license-spring-framework.xml \
- ../common/license-stringtemplate.xml \
- ../common/license-tomcat.xml \
- ../common/license-zlib.xml \
- ../common/phrases.ent \
- ../common/product-versions.ent \
- ../mysql-monitor-2.0/version.ent \
- ../mysql-monitor-common/enterprise.ent \
- ../refman-common/urls.ent \
- ../workbench/workbench.ent \
- all-entities.ent \
- preface-core.xml \
- versions.ent
-dynxml_local_preface_IMAGES =
-dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
-dynxml_local_preface_IDMAPS = \
- ../common/metadata/license-apache-2-0.idmap \
- ../common/metadata/license-apache-commons-collections.idmap \
- ../common/metadata/license-apache-commons-dbcp.idmap \
- ../common/metadata/license-apache-commons-digester.idmap \
- ../common/metadata/license-apache-commons-fileupload.idmap \
- ../common/metadata/license-apache-commons-io.idmap \
- ../common/metadata/license-apache-commons-lang.idmap \
- ../common/metadata/license-apache-commons-logging.idmap \
- ../common/metadata/license-apache-commons-pool.idmap \
- ../common/metadata/license-apache-commons-validator.idmap \
- ../common/metadata/license-asm.idmap \
- ../common/metadata/license-boost.idmap \
- ../common/metadata/license-dbug.idmap \
- ../common/metadata/license-findgtest-cmake.idmap \
- ../common/metadata/license-jdom.idmap \
- ../common/metadata/license-jquery.idmap \
- ../common/metadata/license-jqueryui.idmap \
- ../common/metadata/license-libcurl.idmap \
- ../common/metadata/license-libedit.idmap \
- ../common/metadata/license-libevent.idmap \
- ../common/metadata/license-libstring.idmap \
- ../common/metadata/license-log4j-1-2-9.idmap \
- ../common/metadata/license-log4j.idmap \
- ../common/metadata/license-lpeg.idmap \
- ../common/metadata/license-luafilesystem.idmap \
- ../common/metadata/license-md5.idmap \
- ../common/metadata/license-netlib.idmap \
- ../common/metadata/license-nt-servc.idmap \
- ../common/metadata/license-openssl-0.9.8o.idmap \
- ../common/metadata/license-regex.idmap \
- ../common/metadata/license-sha1-in-c.idmap \
- ../common/metadata/license-spring-framework.idmap \
- ../common/metadata/license-stringtemplate.idmap \
- ../common/metadata/license-tomcat.idmap \
- ../common/metadata/license-zlib.idmap \
- metadata/legalnotice.en.idmap
-dynxml-local-preface.validpure: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.titles: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.useless: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.valid: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.validwarn: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-prepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-helpprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-manprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-remprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.xml: $(dynxml_local_preface_IDMAPS) $(dynxml_local_preface_INCLUDES)
dynxml_local_programs_admin_util_INCLUDES = \
../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
@@ -5757,6 +5758,20 @@
legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+licenses_third_party_core_INCLUDES =
+licenses_third_party_core_IMAGES =
+licenses_third_party_core_SOURCES = licenses-third-party-core.xml $(licenses_third_party_core_INCLUDES)
+licenses_third_party_core_IDMAPS =
+licenses-third-party-core.validpure: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.titles: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.useless: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.valid: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core.validwarn: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-prepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-helpprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-manprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-remprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+
manual_index_cfunc_core_INCLUDES =
manual_index_cfunc_core_IMAGES =
manual_index_cfunc_core_SOURCES = manual-index-cfunc-core.xml $(manual_index_cfunc_core_INCLUDES)
@@ -6057,6 +6072,7 @@
../common/license-spring-framework.xml \
../common/license-stringtemplate.xml \
../common/license-tomcat.xml \
+ ../common/license-us-secure-hash.xml \
../common/license-zlib.xml \
../common/oracle-notice-pre-ga.en.xml \
../common/phrases.ent \
@@ -6447,6 +6463,7 @@
dynxml-local-functions.xml \
dynxml-local-installing-source.xml \
dynxml-local-language-structure.xml \
+ dynxml-local-licenses-third-party.xml \
dynxml-local-manual-index-cfunc.xml \
dynxml-local-manual-index-command.xml \
dynxml-local-manual-index-function.xml \
@@ -6463,7 +6480,6 @@
dynxml-local-manual-index.xml \
dynxml-local-news-5.6.xml \
dynxml-local-performance-schema.xml \
- dynxml-local-preface.xml \
dynxml-local-programs-admin-util.xml \
dynxml-local-programs-client.xml \
dynxml-local-programs-server.xml \
@@ -6530,6 +6546,7 @@
introduction.xml \
language-structure-core.xml \
legalnotice.en.xml \
+ licenses-third-party-core.xml \
manual-index-cfunc-core.xml \
manual-index-command-core.xml \
manual-index-core.xml \
@@ -6661,7 +6678,7 @@
partitioning.xml \
performance-schema-core.xml \
precision-math.xml \
- preface-core.xml \
+ preface.xml \
programs-admin-util-core.xml \
programs-client-core.xml \
programs-development.xml \
@@ -6983,6 +7000,7 @@
../common/metadata/license-spring-framework.idmap \
../common/metadata/license-stringtemplate.idmap \
../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
../common/metadata/license-zlib.idmap \
../innodb-plugin-1.1/metadata/glossary-core.idmap \
../innodb-plugin-1.1/metadata/innodb-compression.idmap \
@@ -7124,13 +7142,14 @@
metadata/introduction.idmap \
metadata/language-structure-core.idmap \
metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap \
metadata/news-5.6-core.idmap \
metadata/news.idmap \
metadata/optimization.idmap \
metadata/partitioning.idmap \
metadata/performance-schema-core.idmap \
metadata/precision-math.idmap \
- metadata/preface-core.idmap \
+ metadata/preface.idmap \
metadata/programs-admin-util-core.idmap \
metadata/programs-client-core.idmap \
metadata/programs-development.idmap \
@@ -7898,19 +7917,30 @@
precision-math-manprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
precision-math-remprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
-preface_core_INCLUDES =
-preface_core_IMAGES =
-preface_core_SOURCES = preface-core.xml $(preface_core_INCLUDES)
-preface_core_IDMAPS =
-preface-core.validpure: $(preface_core_SOURCES)
-preface-core.titles: $(preface_core_SOURCES)
-preface-core.useless: $(preface_core_SOURCES)
-preface-core.valid: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core.validwarn: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-prepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-helpprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-manprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-remprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
+preface_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ versions.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS = \
+ metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-helpprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
programs_admin_util_core_INCLUDES =
programs_admin_util_core_IMAGES =
@@ -8289,20 +8319,6 @@
replication-notes-manprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
replication-notes-remprepped.xml: $(replication_notes_SOURCES) $(replication_notes_IDMAPS)
-replication_options_core_INCLUDES =
-replication_options_core_IMAGES =
-replication_options_core_SOURCES = replication-options-core.xml $(replication_options_core_INCLUDES)
-replication_options_core_IDMAPS =
-replication-options-core.validpure: $(replication_options_core_SOURCES)
-replication-options-core.titles: $(replication_options_core_SOURCES)
-replication-options-core.useless: $(replication_options_core_SOURCES)
-replication-options-core.valid: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core.validwarn: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-prepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-helpprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-manprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-replication-options-core-remprepped.xml: $(replication_options_core_SOURCES) $(replication_options_core_IDMAPS)
-
replication_solutions_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
Modified: trunk/refman-6.0/Makefile.depends
===================================================================
--- trunk/refman-6.0/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/refman-6.0/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 13, Lines Added: 145, Lines Deleted: 116; 16627 bytes
@@ -1791,6 +1791,106 @@
dynxml-local-language-structure-manprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure-remprepped.xml: $(dynxml_local_language_structure_SOURCES) $(dynxml_local_language_structure_IDMAPS)
dynxml-local-language-structure.xml: $(dynxml_local_language_structure_IDMAPS) $(dynxml_local_language_structure_INCLUDES)
+dynxml_local_licenses_third_party_INCLUDES = \
+ ../../mysqldoc/dynamic-docs/licenses/products.xml \
+ ../common/all-entities.ent \
+ ../common/fixedchars.ent \
+ ../common/license-apache-2-0.xml \
+ ../common/license-apache-commons-collections.xml \
+ ../common/license-apache-commons-dbcp.xml \
+ ../common/license-apache-commons-digester.xml \
+ ../common/license-apache-commons-fileupload.xml \
+ ../common/license-apache-commons-io.xml \
+ ../common/license-apache-commons-lang.xml \
+ ../common/license-apache-commons-logging.xml \
+ ../common/license-apache-commons-pool.xml \
+ ../common/license-apache-commons-validator.xml \
+ ../common/license-asm.xml \
+ ../common/license-boost.xml \
+ ../common/license-dbug.xml \
+ ../common/license-findgtest-cmake.xml \
+ ../common/license-jdom.xml \
+ ../common/license-jquery.xml \
+ ../common/license-jqueryui.xml \
+ ../common/license-libcurl.xml \
+ ../common/license-libedit.xml \
+ ../common/license-libevent.xml \
+ ../common/license-libstring.xml \
+ ../common/license-log4j-1-2-9.xml \
+ ../common/license-log4j.xml \
+ ../common/license-lpeg.xml \
+ ../common/license-luafilesystem.xml \
+ ../common/license-md5.xml \
+ ../common/license-netlib.xml \
+ ../common/license-nt-servc.xml \
+ ../common/license-openssl-0.9.8o.xml \
+ ../common/license-regex.xml \
+ ../common/license-sha1-in-c.xml \
+ ../common/license-spring-framework.xml \
+ ../common/license-stringtemplate.xml \
+ ../common/license-tomcat.xml \
+ ../common/license-unicode.xml \
+ ../common/license-us-secure-hash.xml \
+ ../common/license-zlib.xml \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ licenses-third-party-core.xml \
+ versions.ent
+dynxml_local_licenses_third_party_IMAGES =
+dynxml_local_licenses_third_party_SOURCES = dynxml-local-licenses-third-party.xml $(dynxml_local_licenses_third_party_INCLUDES)
+dynxml_local_licenses_third_party_IDMAPS = \
+ ../common/metadata/license-apache-2-0.idmap \
+ ../common/metadata/license-apache-commons-collections.idmap \
+ ../common/metadata/license-apache-commons-dbcp.idmap \
+ ../common/metadata/license-apache-commons-digester.idmap \
+ ../common/metadata/license-apache-commons-fileupload.idmap \
+ ../common/metadata/license-apache-commons-io.idmap \
+ ../common/metadata/license-apache-commons-lang.idmap \
+ ../common/metadata/license-apache-commons-logging.idmap \
+ ../common/metadata/license-apache-commons-pool.idmap \
+ ../common/metadata/license-apache-commons-validator.idmap \
+ ../common/metadata/license-asm.idmap \
+ ../common/metadata/license-boost.idmap \
+ ../common/metadata/license-dbug.idmap \
+ ../common/metadata/license-findgtest-cmake.idmap \
+ ../common/metadata/license-jdom.idmap \
+ ../common/metadata/license-jquery.idmap \
+ ../common/metadata/license-jqueryui.idmap \
+ ../common/metadata/license-libcurl.idmap \
+ ../common/metadata/license-libedit.idmap \
+ ../common/metadata/license-libevent.idmap \
+ ../common/metadata/license-libstring.idmap \
+ ../common/metadata/license-log4j-1-2-9.idmap \
+ ../common/metadata/license-log4j.idmap \
+ ../common/metadata/license-lpeg.idmap \
+ ../common/metadata/license-luafilesystem.idmap \
+ ../common/metadata/license-md5.idmap \
+ ../common/metadata/license-netlib.idmap \
+ ../common/metadata/license-nt-servc.idmap \
+ ../common/metadata/license-openssl-0.9.8o.idmap \
+ ../common/metadata/license-regex.idmap \
+ ../common/metadata/license-sha1-in-c.idmap \
+ ../common/metadata/license-spring-framework.idmap \
+ ../common/metadata/license-stringtemplate.idmap \
+ ../common/metadata/license-tomcat.idmap \
+ ../common/metadata/license-unicode.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
+ ../common/metadata/license-zlib.idmap
+dynxml-local-licenses-third-party.validpure: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.titles: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.useless: $(dynxml_local_licenses_third_party_SOURCES)
+dynxml-local-licenses-third-party.valid: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.validwarn: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-prepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-helpprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-manprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party-remprepped.xml: $(dynxml_local_licenses_third_party_SOURCES) $(dynxml_local_licenses_third_party_IDMAPS)
+dynxml-local-licenses-third-party.xml: $(dynxml_local_licenses_third_party_IDMAPS) $(dynxml_local_licenses_third_party_INCLUDES)
dynxml_local_manual_index_cfunc_INCLUDES = \
../common/fixedchars.ent \
../common/phrases.ent \
@@ -2686,7 +2786,6 @@
metadata/optimization.idmap \
metadata/partitioning.idmap \
metadata/performance-schema-core.idmap \
- metadata/programs-admin-util-core.idmap \
metadata/replication-options-core.idmap \
metadata/restrictions.idmap \
metadata/sql-syntax-compound-statements.idmap \
@@ -3890,105 +3989,6 @@
dynxml-local-performance-schema-manprepped.xml: $(dynxml_local_performance_schema_SOURCES) $(dynxml_local_performance_schema_IDMAPS)
dynxml-local-performance-schema-remprepped.xml: $(dynxml_local_performance_schema_SOURCES) $(dynxml_local_performance_schema_IDMAPS)
dynxml-local-performance-schema.xml: $(dynxml_local_performance_schema_IDMAPS) $(dynxml_local_performance_schema_INCLUDES)
-dynxml_local_preface_INCLUDES = \
- ../../mysqldoc/dynamic-docs/licenses/products.xml \
- ../common/all-entities.ent \
- ../common/fixedchars.ent \
- ../common/license-apache-2-0.xml \
- ../common/license-apache-commons-collections.xml \
- ../common/license-apache-commons-dbcp.xml \
- ../common/license-apache-commons-digester.xml \
- ../common/license-apache-commons-fileupload.xml \
- ../common/license-apache-commons-io.xml \
- ../common/license-apache-commons-lang.xml \
- ../common/license-apache-commons-logging.xml \
- ../common/license-apache-commons-pool.xml \
- ../common/license-apache-commons-validator.xml \
- ../common/license-asm.xml \
- ../common/license-boost.xml \
- ../common/license-dbug.xml \
- ../common/license-findgtest-cmake.xml \
- ../common/license-jdom.xml \
- ../common/license-jquery.xml \
- ../common/license-jqueryui.xml \
- ../common/license-libcurl.xml \
- ../common/license-libedit.xml \
- ../common/license-libevent.xml \
- ../common/license-libstring.xml \
- ../common/license-log4j-1-2-9.xml \
- ../common/license-log4j.xml \
- ../common/license-lpeg.xml \
- ../common/license-luafilesystem.xml \
- ../common/license-md5.xml \
- ../common/license-netlib.xml \
- ../common/license-nt-servc.xml \
- ../common/license-openssl-0.9.8o.xml \
- ../common/license-regex.xml \
- ../common/license-sha1-in-c.xml \
- ../common/license-spring-framework.xml \
- ../common/license-stringtemplate.xml \
- ../common/license-tomcat.xml \
- ../common/license-unicode.xml \
- ../common/license-zlib.xml \
- ../common/phrases.ent \
- ../common/product-versions.ent \
- ../mysql-monitor-2.0/version.ent \
- ../mysql-monitor-common/enterprise.ent \
- ../refman-common/urls.ent \
- ../workbench/workbench.ent \
- all-entities.ent \
- preface-core.xml \
- versions.ent
-dynxml_local_preface_IMAGES =
-dynxml_local_preface_SOURCES = dynxml-local-preface.xml $(dynxml_local_preface_INCLUDES)
-dynxml_local_preface_IDMAPS = \
- ../common/metadata/license-apache-2-0.idmap \
- ../common/metadata/license-apache-commons-collections.idmap \
- ../common/metadata/license-apache-commons-dbcp.idmap \
- ../common/metadata/license-apache-commons-digester.idmap \
- ../common/metadata/license-apache-commons-fileupload.idmap \
- ../common/metadata/license-apache-commons-io.idmap \
- ../common/metadata/license-apache-commons-lang.idmap \
- ../common/metadata/license-apache-commons-logging.idmap \
- ../common/metadata/license-apache-commons-pool.idmap \
- ../common/metadata/license-apache-commons-validator.idmap \
- ../common/metadata/license-asm.idmap \
- ../common/metadata/license-boost.idmap \
- ../common/metadata/license-dbug.idmap \
- ../common/metadata/license-findgtest-cmake.idmap \
- ../common/metadata/license-jdom.idmap \
- ../common/metadata/license-jquery.idmap \
- ../common/metadata/license-jqueryui.idmap \
- ../common/metadata/license-libcurl.idmap \
- ../common/metadata/license-libedit.idmap \
- ../common/metadata/license-libevent.idmap \
- ../common/metadata/license-libstring.idmap \
- ../common/metadata/license-log4j-1-2-9.idmap \
- ../common/metadata/license-log4j.idmap \
- ../common/metadata/license-lpeg.idmap \
- ../common/metadata/license-luafilesystem.idmap \
- ../common/metadata/license-md5.idmap \
- ../common/metadata/license-netlib.idmap \
- ../common/metadata/license-nt-servc.idmap \
- ../common/metadata/license-openssl-0.9.8o.idmap \
- ../common/metadata/license-regex.idmap \
- ../common/metadata/license-sha1-in-c.idmap \
- ../common/metadata/license-spring-framework.idmap \
- ../common/metadata/license-stringtemplate.idmap \
- ../common/metadata/license-tomcat.idmap \
- ../common/metadata/license-unicode.idmap \
- ../common/metadata/license-zlib.idmap \
- metadata/legalnotice.en.idmap
-dynxml-local-preface.validpure: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.titles: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.useless: $(dynxml_local_preface_SOURCES)
-dynxml-local-preface.valid: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.validwarn: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-prepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-helpprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-manprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface-remprepped.xml: $(dynxml_local_preface_SOURCES) $(dynxml_local_preface_IDMAPS)
-dynxml-local-preface.xml: $(dynxml_local_preface_IDMAPS) $(dynxml_local_preface_INCLUDES)
dynxml_local_programs_admin_util_INCLUDES = \
../../mysqldoc/dynamic-docs/command-optvars/myisamchk.xml \
../../mysqldoc/dynamic-docs/command-optvars/mysqlaccess.xml \
@@ -5009,6 +5009,20 @@
legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) $(legalnotice_en_IDMAPS)
+licenses_third_party_core_INCLUDES =
+licenses_third_party_core_IMAGES =
+licenses_third_party_core_SOURCES = licenses-third-party-core.xml $(licenses_third_party_core_INCLUDES)
+licenses_third_party_core_IDMAPS =
+licenses-third-party-core.validpure: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.titles: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.useless: $(licenses_third_party_core_SOURCES)
+licenses-third-party-core.valid: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core.validwarn: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-prepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-helpprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-manprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+licenses-third-party-core-remprepped.xml: $(licenses_third_party_core_SOURCES) $(licenses_third_party_core_IDMAPS)
+
manual_index_cfunc_core_INCLUDES =
manual_index_cfunc_core_IMAGES =
manual_index_cfunc_core_SOURCES = manual-index-cfunc-core.xml $(manual_index_cfunc_core_INCLUDES)
@@ -5302,6 +5316,7 @@
../common/license-stringtemplate.xml \
../common/license-tomcat.xml \
../common/license-unicode.xml \
+ ../common/license-us-secure-hash.xml \
../common/license-zlib.xml \
../common/oracle-notice-pre-ga.en.xml \
../common/phrases.ent \
@@ -5681,6 +5696,7 @@
dynxml-local-functions.xml \
dynxml-local-installing.xml \
dynxml-local-language-structure.xml \
+ dynxml-local-licenses-third-party.xml \
dynxml-local-manual-index-cfunc.xml \
dynxml-local-manual-index-command.xml \
dynxml-local-manual-index-function.xml \
@@ -5698,7 +5714,6 @@
dynxml-local-news-5.2.xml \
dynxml-local-news-6.0.xml \
dynxml-local-performance-schema.xml \
- dynxml-local-preface.xml \
dynxml-local-programs-admin-util.xml \
dynxml-local-programs-client.xml \
dynxml-local-programs-server.xml \
@@ -5728,6 +5743,7 @@
internationalization.xml \
introduction.xml \
legalnotice.en.xml \
+ licenses-third-party-core.xml \
manual-index-cfunc-core.xml \
manual-index-command-core.xml \
manual-index-core.xml \
@@ -5850,7 +5866,7 @@
partitioning.xml \
performance-schema-core.xml \
precision-math.xml \
- preface-core.xml \
+ preface.xml \
programs-admin-util-core.xml \
programs-client-core.xml \
programs-development.xml \
@@ -6179,6 +6195,7 @@
../common/metadata/license-stringtemplate.idmap \
../common/metadata/license-tomcat.idmap \
../common/metadata/license-unicode.idmap \
+ ../common/metadata/license-us-secure-hash.idmap \
../common/metadata/license-zlib.idmap \
../mysql-backup/metadata/backup.idmap \
../mysql-backup/metadata/syntax.idmap \
@@ -6286,6 +6303,7 @@
metadata/introduction.idmap \
metadata/language-structure-core.idmap \
metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap \
metadata/news-5.2-core.idmap \
metadata/news-6.0-core.idmap \
metadata/news.idmap \
@@ -6293,7 +6311,7 @@
metadata/partitioning.idmap \
metadata/performance-schema-core.idmap \
metadata/precision-math.idmap \
- metadata/preface-core.idmap \
+ metadata/preface.idmap \
metadata/programs-admin-util-core.idmap \
metadata/programs-client-core.idmap \
metadata/programs-development.idmap \
@@ -7076,19 +7094,30 @@
precision-math-manprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
precision-math-remprepped.xml: $(precision_math_SOURCES) $(precision_math_IDMAPS)
-preface_core_INCLUDES =
-preface_core_IMAGES =
-preface_core_SOURCES = preface-core.xml $(preface_core_INCLUDES)
-preface_core_IDMAPS =
-preface-core.validpure: $(preface_core_SOURCES)
-preface-core.titles: $(preface_core_SOURCES)
-preface-core.useless: $(preface_core_SOURCES)
-preface-core.valid: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core.validwarn: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-prepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-helpprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-manprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
-preface-core-remprepped.xml: $(preface_core_SOURCES) $(preface_core_IDMAPS)
+preface_INCLUDES = \
+ ../common/fixedchars.ent \
+ ../common/phrases.ent \
+ ../common/product-versions.ent \
+ ../mysql-monitor-2.0/version.ent \
+ ../mysql-monitor-common/enterprise.ent \
+ ../refman-common/urls.ent \
+ ../workbench/workbench.ent \
+ all-entities.ent \
+ versions.ent
+preface_IMAGES =
+preface_SOURCES = preface.xml $(preface_INCLUDES)
+preface_IDMAPS = \
+ metadata/legalnotice.en.idmap \
+ metadata/licenses-third-party-core.idmap
+preface.validpure: $(preface_SOURCES)
+preface.titles: $(preface_SOURCES)
+preface.useless: $(preface_SOURCES)
+preface.valid: $(preface_SOURCES) $(preface_IDMAPS)
+preface.validwarn: $(preface_SOURCES) $(preface_IDMAPS)
+preface-prepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-helpprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-manprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
+preface-remprepped.xml: $(preface_SOURCES) $(preface_IDMAPS)
programs_admin_util_core_INCLUDES =
programs_admin_util_core_IMAGES =
Modified: trunk/topic-guides/topics-5.6/Makefile.depends
===================================================================
--- trunk/topic-guides/topics-5.6/Makefile.depends 2010-10-26 18:43:19 UTC (rev 23399)
+++ trunk/topic-guides/topics-5.6/Makefile.depends 2010-10-26 18:43:26 UTC (rev 23400)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 4961 bytes
@@ -1889,7 +1889,7 @@
# This rules sets the rebuild for fragments of an arby file when a source file has changed
-mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.6/versions.ent ../../refman-5.6/metadata/replication.idmap ../../refman-5.6/metadata/replication-implementation.idmap ../../refman-5.6/replication-options-core.xml ../../refman-5.6/../workbench/workbench.ent ../../refman-5.6/../common/phrases.ent ../../refman-5.6/../refman-common/images/published/redundancy-after.png ../../refman-5.6/../refman-common/images/published/scaleout.png ../../refman-5.6/../common/fixedchars.ent ../../refman-5.6/replication-configuration.xml ../../refman-5.6/replication-solutions.xml ../../refman-5.6/metadata/replication-options-core.idmap ../../refman-5.6/../refman-comm!
on/urls.ent ../../refman-5.6/replication-implementation.xml ../../refman-5.6/metadata/replication-notes.idmap all-entities.ent ../../refman-5.6/all-entities.ent ../../refman-5.6/../refman-common/images/published/submaster-performance.png ../../common/phrases.ent ../../refman-5.6/../refman-common/images/published/replication-filtering-tbl-rules.png ../../refman-5.6/../mysql-monitor-2.0/version.ent ../../refman-5.6/metadata/replication-configuration.idmap ../../refman-5.6/../refman-common/images/published/redundancy-before.png mysql-replication-excerpt-aspec.xml ../../refman-common/urls.ent ../../refman-5.6/../refman-common/images/published/multi-db.png ../../refman-5.6/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.6/../common/product-versions.ent ../../refman-5.6/../mysql-monitor-common/enterprise.ent ../../refman-5.6/replication.xml ../../common/fixedchars.ent ../../refman-5.6/../refman-common/images/published/replication-filtering-db-rules.png ../../ref!
man-5.6/dynxml-local-replication-options.xml ../../refman-5.6/!
../../my
sqldoc/dynamic-docs/command-optvars/mysqld.xml ../../refman-5.6/metadata/replication-solutions.idmap mysql-replication-excerpt-base.xml ../../refman-5.6/replication-notes.xml
+mysql-replication-excerpt-aspec.xml.replication.all.preface.xml mysql-replication-excerpt-aspec.xml.replication-implementation.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-configuration.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-solutions.none.chapter.xml mysql-replication-excerpt-aspec.xml.replication-notes.none.chapter.xml: ../../refman-5.6/versions.ent ../../refman-5.6/metadata/replication.idmap ../../refman-5.6/metadata/replication-implementation.idmap ../../refman-5.6/../workbench/workbench.ent ../../refman-5.6/../common/phrases.ent ../../refman-5.6/../refman-common/images/published/redundancy-after.png ../../refman-5.6/../refman-common/images/published/scaleout.png ../../refman-5.6/../common/fixedchars.ent ../../refman-5.6/replication-configuration.xml ../../refman-5.6/replication-solutions.xml ../../refman-5.6/../refman-common/urls.ent ../../refman-5.6/replication-implementation.xml ../../refman-5.6/metadata/replication-notes!
.idmap all-entities.ent ../../refman-5.6/all-entities.ent ../../refman-5.6/../refman-common/images/published/submaster-performance.png ../../common/phrases.ent ../../refman-5.6/../refman-common/images/published/replication-filtering-tbl-rules.png ../../refman-5.6/../mysql-monitor-2.0/version.ent ../../refman-5.6/metadata/replication-configuration.idmap ../../refman-5.6/../refman-common/images/published/redundancy-before.png mysql-replication-excerpt-aspec.xml ../../refman-5.6/../refman-5.6/replication-options-core.xml ../../refman-common/urls.ent ../../refman-5.6/../refman-common/images/published/multi-db.png ../../refman-5.6/../../mysqldoc/dynamic-docs/metadata-titles.en.xml ../../refman-5.6/../common/product-versions.ent ../../refman-5.6/../mysql-monitor-common/enterprise.ent ../../refman-5.6/replication.xml ../../common/fixedchars.ent ../../refman-5.6/../refman-common/images/published/replication-filtering-db-rules.png ../../refman-5.6/dynxml-local-replication-options.xm!
l ../../refman-5.6/../../mysqldoc/dynamic-docs/command-optvars!
/mysqld.
xml ../../refman-5.6/metadata/replication-solutions.idmap mysql-replication-excerpt-base.xml ../../refman-5.6/replication-notes.xml
$(MAKE) mysql-replication-excerpt.arbitraryforce
# This rules sets the fragments of a final arby file to be dependent for the -arbitrary (true) target
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r23400 - in trunk: . innodb-plugin-1.0 innodb-plugin-1.1 refman-4.1 refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-... | paul.dubois | 26 Oct |
