| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | May 12 2007 6:05am |
| Subject: | svn commit - mysqldoc@docsrva: r6432 - in trunk: . administrator administrator-ro dynamic-docs falcon gui-common gui-common-cy gui-common-ro guibook i... | ||
| View as plain text | |||
Author: paul Date: 2007-05-12 06:05:28 +0200 (Sat, 12 May 2007) New Revision: 6432 Log: r24891@polar: paul | 2007-05-11 22:44:32 -0500 Simplify/unify mechanism for including rules to build .idmap files in other directories. Removed: trunk/administrator-ro/Makefile.ext trunk/administrator/Makefile.ext trunk/falcon/Makefile.ext trunk/gui-common-cy/Makefile.ext trunk/gui-common-ro/Makefile.ext trunk/gui-common/Makefile.ext trunk/internals/Makefile.ext trunk/migration-toolkit/Makefile.ext trunk/query-browser-cy/Makefile.ext trunk/query-browser/Makefile.ext trunk/refman-5.0/Makefile.ext trunk/refman-5.1/Makefile.ext trunk/refman-common/Makefile.ext trunk/workbench/Makefile.ext Modified: trunk/administrator-ro/Makefile trunk/administrator-ro/Makefile.depends trunk/administrator/Makefile trunk/dynamic-docs/Makefile trunk/dynamic-docs/Makefile.depends trunk/falcon/Makefile trunk/guibook/Makefile trunk/internals/Makefile trunk/migration-toolkit/Makefile trunk/mysqlqb/Makefile trunk/mysqltest/Makefile trunk/query-browser-cy/Makefile trunk/query-browser-cy/Makefile.depends trunk/query-browser/Makefile trunk/refman-4.1/Makefile trunk/refman-5.0/Makefile trunk/refman-5.1/Makefile trunk/workbench/Makefile Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24883 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20299 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229 + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24891 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20299 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229 Modified: trunk/administrator/Makefile =================================================================== --- trunk/administrator/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/administrator/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 365 bytes @@ -61,4 +61,4 @@ # Import directory specific extensions -include ../gui-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/administrator-ro/Makefile =================================================================== --- trunk/administrator-ro/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/administrator-ro/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 374 bytes @@ -61,4 +61,4 @@ # Import directory specific extensions -include ../gui-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/administrator-ro/Makefile.depends =================================================================== --- trunk/administrator-ro/Makefile.depends 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/administrator-ro/Makefile.depends 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 18, Lines Added: 174, Lines Deleted: 20; 15177 bytes @@ -81,10 +81,49 @@ images/user-accounts.png \ images/user-information.png administrator_SOURCES = administrator.xml $(administrator_INCLUDES) -administrator.xml: $(administrator_INCLUDES) +administrator_IDMAP_SOURCES = \ + administrator.xml \ + ../gui-common/appendix-common-files.xml \ + ../gui-common/appendix-connection-storage.xml \ + ../gui-common/appendix-source-install.xml \ + ../gui-common/appendix-third-party.xml \ + ../gui-common/appendix-translator-notes.xml \ + ../gui-common/appendix-troubleshooting.xml \ + ../gui-common/chapter-options-connections.xml \ + ../gui-common/chapter-options-editors.xml \ + ../gui-common/chapter-options-general.xml \ + ../gui-common/chapter-options-introduction.xml \ + ../gui-common/chapter-table-editor.xml \ + ../gui-common/chapter-uninstall-all.xml \ + ../gui-common/installation-all.xml \ + ../gui-common/starting-all.xml \ + backup.xml \ + catalogs.xml \ + chapter-options-administrator.xml \ + connection-dialog.xml \ + copyright.xml \ + health.xml \ + introduction.xml \ + legalnotice.en.xml \ + main-window.xml \ + replication-status.xml \ + restore.xml \ + server-connections.xml \ + server-information.xml \ + server-logs.xml \ + service-control.xml \ + startup-variables.xml \ + tray-monitor.xml \ + user-administration.xml \ + xml-files.xml +administrator.valid: $(administrator_SOURCES) +administrator.validwarn: $(administrator_SOURCES) +administrator.validpure: $(administrator_SOURCES) administrator-prepped.xml: $(administrator_SOURCES) administrator-manprepped.xml: $(administrator_SOURCES) administrator-remprepped.xml: $(administrator_SOURCES) +administrator.titles: $(administrator_SOURCES) +administrator.useless: $(administrator_SOURCES) backup_INCLUDES = \ ../common/fixedchars.ent \ @@ -92,10 +131,16 @@ all-entities.ent backup_IMAGES = backup_SOURCES = backup.xml $(backup_INCLUDES) -backup.xml: $(backup_INCLUDES) +backup_IDMAP_SOURCES = \ + backup.xml +backup.valid: $(backup_SOURCES) +backup.validwarn: $(backup_SOURCES) +backup.validpure: $(backup_SOURCES) backup-prepped.xml: $(backup_SOURCES) backup-manprepped.xml: $(backup_SOURCES) backup-remprepped.xml: $(backup_SOURCES) +backup.titles: $(backup_SOURCES) +backup.useless: $(backup_SOURCES) catalogs_INCLUDES = \ ../common/fixedchars.ent \ @@ -103,10 +148,16 @@ all-entities.ent catalogs_IMAGES = catalogs_SOURCES = catalogs.xml $(catalogs_INCLUDES) -catalogs.xml: $(catalogs_INCLUDES) +catalogs_IDMAP_SOURCES = \ + catalogs.xml +catalogs.valid: $(catalogs_SOURCES) +catalogs.validwarn: $(catalogs_SOURCES) +catalogs.validpure: $(catalogs_SOURCES) catalogs-prepped.xml: $(catalogs_SOURCES) catalogs-manprepped.xml: $(catalogs_SOURCES) catalogs-remprepped.xml: $(catalogs_SOURCES) +catalogs.titles: $(catalogs_SOURCES) +catalogs.useless: $(catalogs_SOURCES) chapter_options_administrator_INCLUDES = \ ../common/fixedchars.ent \ @@ -114,10 +165,16 @@ all-entities.ent chapter_options_administrator_IMAGES = chapter_options_administrator_SOURCES = chapter-options-administrator.xml $(chapter_options_administrator_INCLUDES) -chapter-options-administrator.xml: $(chapter_options_administrator_INCLUDES) +chapter_options_administrator_IDMAP_SOURCES = \ + chapter-options-administrator.xml +chapter-options-administrator.valid: $(chapter_options_administrator_SOURCES) +chapter-options-administrator.validwarn: $(chapter_options_administrator_SOURCES) +chapter-options-administrator.validpure: $(chapter_options_administrator_SOURCES) chapter-options-administrator-prepped.xml: $(chapter_options_administrator_SOURCES) chapter-options-administrator-manprepped.xml: $(chapter_options_administrator_SOURCES) chapter-options-administrator-remprepped.xml: $(chapter_options_administrator_SOURCES) +chapter-options-administrator.titles: $(chapter_options_administrator_SOURCES) +chapter-options-administrator.useless: $(chapter_options_administrator_SOURCES) connection_dialog_INCLUDES = \ ../common/fixedchars.ent \ @@ -131,18 +188,30 @@ images/configure-service-mode-window.png \ images/connection.png connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES) -connection-dialog.xml: $(connection_dialog_INCLUDES) +connection_dialog_IDMAP_SOURCES = \ + connection-dialog.xml +connection-dialog.valid: $(connection_dialog_SOURCES) +connection-dialog.validwarn: $(connection_dialog_SOURCES) +connection-dialog.validpure: $(connection_dialog_SOURCES) connection-dialog-prepped.xml: $(connection_dialog_SOURCES) connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) +connection-dialog.titles: $(connection_dialog_SOURCES) +connection-dialog.useless: $(connection_dialog_SOURCES) copyright_INCLUDES = copyright_IMAGES = copyright_SOURCES = copyright.xml $(copyright_INCLUDES) -copyright.xml: $(copyright_INCLUDES) +copyright_IDMAP_SOURCES = \ + copyright.xml +copyright.valid: $(copyright_SOURCES) +copyright.validwarn: $(copyright_SOURCES) +copyright.validpure: $(copyright_SOURCES) copyright-prepped.xml: $(copyright_SOURCES) copyright-manprepped.xml: $(copyright_SOURCES) copyright-remprepped.xml: $(copyright_SOURCES) +copyright.titles: $(copyright_SOURCES) +copyright.useless: $(copyright_SOURCES) health_INCLUDES = \ ../common/fixedchars.ent \ @@ -152,10 +221,16 @@ health_IMAGES = \ images/graph-settings.png health_SOURCES = health.xml $(health_INCLUDES) -health.xml: $(health_INCLUDES) +health_IDMAP_SOURCES = \ + health.xml +health.valid: $(health_SOURCES) +health.validwarn: $(health_SOURCES) +health.validpure: $(health_SOURCES) health-prepped.xml: $(health_SOURCES) health-manprepped.xml: $(health_SOURCES) health-remprepped.xml: $(health_SOURCES) +health.titles: $(health_SOURCES) +health.useless: $(health_SOURCES) introduction_INCLUDES = \ ../common/fixedchars.ent \ @@ -163,19 +238,32 @@ all-entities.ent introduction_IMAGES = introduction_SOURCES = introduction.xml $(introduction_INCLUDES) -introduction.xml: $(introduction_INCLUDES) +introduction_IDMAP_SOURCES = \ + introduction.xml +introduction.valid: $(introduction_SOURCES) +introduction.validwarn: $(introduction_SOURCES) +introduction.validpure: $(introduction_SOURCES) introduction-prepped.xml: $(introduction_SOURCES) introduction-manprepped.xml: $(introduction_SOURCES) introduction-remprepped.xml: $(introduction_SOURCES) +introduction.titles: $(introduction_SOURCES) +introduction.useless: $(introduction_SOURCES) legalnotice_en_INCLUDES = \ copyright.xml legalnotice_en_IMAGES = legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES) -legalnotice.en.xml: $(legalnotice_en_INCLUDES) +legalnotice_en_IDMAP_SOURCES = \ + legalnotice.en.xml \ + copyright.xml +legalnotice.en.valid: $(legalnotice_en_SOURCES) +legalnotice.en.validwarn: $(legalnotice_en_SOURCES) +legalnotice.en.validpure: $(legalnotice_en_SOURCES) legalnotice.en-prepped.xml: $(legalnotice_en_SOURCES) legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) +legalnotice.en.titles: $(legalnotice_en_SOURCES) +legalnotice.en.useless: $(legalnotice_en_SOURCES) main_window_INCLUDES = \ ../common/fixedchars.ent \ @@ -187,10 +275,16 @@ images/mainwindow.png \ images/marked-area.png main_window_SOURCES = main-window.xml $(main_window_INCLUDES) -main-window.xml: $(main_window_INCLUDES) +main_window_IDMAP_SOURCES = \ + main-window.xml +main-window.valid: $(main_window_SOURCES) +main-window.validwarn: $(main_window_SOURCES) +main-window.validpure: $(main_window_SOURCES) main-window-prepped.xml: $(main_window_SOURCES) main-window-manprepped.xml: $(main_window_SOURCES) main-window-remprepped.xml: $(main_window_SOURCES) +main-window.titles: $(main_window_SOURCES) +main-window.useless: $(main_window_SOURCES) replication_status_INCLUDES = \ ../common/fixedchars.ent \ @@ -200,10 +294,16 @@ replication_status_IMAGES = \ images/replication.png replication_status_SOURCES = replication-status.xml $(replication_status_INCLUDES) -replication-status.xml: $(replication_status_INCLUDES) +replication_status_IDMAP_SOURCES = \ + replication-status.xml +replication-status.valid: $(replication_status_SOURCES) +replication-status.validwarn: $(replication_status_SOURCES) +replication-status.validpure: $(replication_status_SOURCES) replication-status-prepped.xml: $(replication_status_SOURCES) replication-status-manprepped.xml: $(replication_status_SOURCES) replication-status-remprepped.xml: $(replication_status_SOURCES) +replication-status.titles: $(replication_status_SOURCES) +replication-status.useless: $(replication_status_SOURCES) restore_INCLUDES = \ ../common/fixedchars.ent \ @@ -213,10 +313,16 @@ restore_IMAGES = \ images/restore-content.png restore_SOURCES = restore.xml $(restore_INCLUDES) -restore.xml: $(restore_INCLUDES) +restore_IDMAP_SOURCES = \ + restore.xml +restore.valid: $(restore_SOURCES) +restore.validwarn: $(restore_SOURCES) +restore.validpure: $(restore_SOURCES) restore-prepped.xml: $(restore_SOURCES) restore-manprepped.xml: $(restore_SOURCES) restore-remprepped.xml: $(restore_SOURCES) +restore.titles: $(restore_SOURCES) +restore.useless: $(restore_SOURCES) server_connections_INCLUDES = \ ../common/fixedchars.ent \ @@ -224,10 +330,16 @@ all-entities.ent server_connections_IMAGES = server_connections_SOURCES = server-connections.xml $(server_connections_INCLUDES) -server-connections.xml: $(server_connections_INCLUDES) +server_connections_IDMAP_SOURCES = \ + server-connections.xml +server-connections.valid: $(server_connections_SOURCES) +server-connections.validwarn: $(server_connections_SOURCES) +server-connections.validpure: $(server_connections_SOURCES) server-connections-prepped.xml: $(server_connections_SOURCES) server-connections-manprepped.xml: $(server_connections_SOURCES) server-connections-remprepped.xml: $(server_connections_SOURCES) +server-connections.titles: $(server_connections_SOURCES) +server-connections.useless: $(server_connections_SOURCES) server_information_INCLUDES = \ ../common/fixedchars.ent \ @@ -235,10 +347,16 @@ all-entities.ent server_information_IMAGES = server_information_SOURCES = server-information.xml $(server_information_INCLUDES) -server-information.xml: $(server_information_INCLUDES) +server_information_IDMAP_SOURCES = \ + server-information.xml +server-information.valid: $(server_information_SOURCES) +server-information.validwarn: $(server_information_SOURCES) +server-information.validpure: $(server_information_SOURCES) server-information-prepped.xml: $(server_information_SOURCES) server-information-manprepped.xml: $(server_information_SOURCES) server-information-remprepped.xml: $(server_information_SOURCES) +server-information.titles: $(server_information_SOURCES) +server-information.useless: $(server_information_SOURCES) server_logs_INCLUDES = \ ../common/fixedchars.ent \ @@ -248,10 +366,16 @@ server_logs_IMAGES = \ images/server-logs-general-log.png server_logs_SOURCES = server-logs.xml $(server_logs_INCLUDES) -server-logs.xml: $(server_logs_INCLUDES) +server_logs_IDMAP_SOURCES = \ + server-logs.xml +server-logs.valid: $(server_logs_SOURCES) +server-logs.validwarn: $(server_logs_SOURCES) +server-logs.validpure: $(server_logs_SOURCES) server-logs-prepped.xml: $(server_logs_SOURCES) server-logs-manprepped.xml: $(server_logs_SOURCES) server-logs-remprepped.xml: $(server_logs_SOURCES) +server-logs.titles: $(server_logs_SOURCES) +server-logs.useless: $(server_logs_SOURCES) service_control_INCLUDES = \ ../common/fixedchars.ent \ @@ -259,10 +383,16 @@ all-entities.ent service_control_IMAGES = service_control_SOURCES = service-control.xml $(service_control_INCLUDES) -service-control.xml: $(service_control_INCLUDES) +service_control_IDMAP_SOURCES = \ + service-control.xml +service-control.valid: $(service_control_SOURCES) +service-control.validwarn: $(service_control_SOURCES) +service-control.validpure: $(service_control_SOURCES) service-control-prepped.xml: $(service_control_SOURCES) service-control-manprepped.xml: $(service_control_SOURCES) service-control-remprepped.xml: $(service_control_SOURCES) +service-control.titles: $(service_control_SOURCES) +service-control.useless: $(service_control_SOURCES) startup_variables_INCLUDES = \ ../common/fixedchars.ent \ @@ -270,10 +400,16 @@ all-entities.ent startup_variables_IMAGES = startup_variables_SOURCES = startup-variables.xml $(startup_variables_INCLUDES) -startup-variables.xml: $(startup_variables_INCLUDES) +startup_variables_IDMAP_SOURCES = \ + startup-variables.xml +startup-variables.valid: $(startup_variables_SOURCES) +startup-variables.validwarn: $(startup_variables_SOURCES) +startup-variables.validpure: $(startup_variables_SOURCES) startup-variables-prepped.xml: $(startup_variables_SOURCES) startup-variables-manprepped.xml: $(startup_variables_SOURCES) startup-variables-remprepped.xml: $(startup_variables_SOURCES) +startup-variables.titles: $(startup_variables_SOURCES) +startup-variables.useless: $(startup_variables_SOURCES) tray_monitor_INCLUDES = \ ../common/fixedchars.ent \ @@ -283,10 +419,16 @@ tray_monitor_IMAGES = \ images/system-tray.png tray_monitor_SOURCES = tray-monitor.xml $(tray_monitor_INCLUDES) -tray-monitor.xml: $(tray_monitor_INCLUDES) +tray_monitor_IDMAP_SOURCES = \ + tray-monitor.xml +tray-monitor.valid: $(tray_monitor_SOURCES) +tray-monitor.validwarn: $(tray_monitor_SOURCES) +tray-monitor.validpure: $(tray_monitor_SOURCES) tray-monitor-prepped.xml: $(tray_monitor_SOURCES) tray-monitor-manprepped.xml: $(tray_monitor_SOURCES) tray-monitor-remprepped.xml: $(tray_monitor_SOURCES) +tray-monitor.titles: $(tray_monitor_SOURCES) +tray-monitor.useless: $(tray_monitor_SOURCES) user_administration_INCLUDES = \ ../common/fixedchars.ent \ @@ -298,10 +440,16 @@ images/user-accounts.png \ images/user-information.png user_administration_SOURCES = user-administration.xml $(user_administration_INCLUDES) -user-administration.xml: $(user_administration_INCLUDES) +user_administration_IDMAP_SOURCES = \ + user-administration.xml +user-administration.valid: $(user_administration_SOURCES) +user-administration.validwarn: $(user_administration_SOURCES) +user-administration.validpure: $(user_administration_SOURCES) user-administration-prepped.xml: $(user_administration_SOURCES) user-administration-manprepped.xml: $(user_administration_SOURCES) user-administration-remprepped.xml: $(user_administration_SOURCES) +user-administration.titles: $(user_administration_SOURCES) +user-administration.useless: $(user_administration_SOURCES) xml_files_INCLUDES = \ ../common/fixedchars.ent \ @@ -309,8 +457,14 @@ all-entities.ent xml_files_IMAGES = xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES) -xml-files.xml: $(xml_files_INCLUDES) +xml_files_IDMAP_SOURCES = \ + xml-files.xml +xml-files.valid: $(xml_files_SOURCES) +xml-files.validwarn: $(xml_files_SOURCES) +xml-files.validpure: $(xml_files_SOURCES) xml-files-prepped.xml: $(xml_files_SOURCES) xml-files-manprepped.xml: $(xml_files_SOURCES) xml-files-remprepped.xml: $(xml_files_SOURCES) +xml-files.titles: $(xml_files_SOURCES) +xml-files.useless: $(xml_files_SOURCES) Modified: trunk/dynamic-docs/Makefile =================================================================== --- trunk/dynamic-docs/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/dynamic-docs/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 365 bytes @@ -80,4 +80,4 @@ # Import directory specific extensions -include ../refman-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/dynamic-docs/Makefile.depends =================================================================== --- trunk/dynamic-docs/Makefile.depends 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/dynamic-docs/Makefile.depends 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 2, Lines Added: 17, Lines Deleted: 2; 2077 bytes @@ -5,10 +5,16 @@ all-entities.ent dynxml_generated_mysqld_optvar_vs_IMAGES = dynxml_generated_mysqld_optvar_vs_SOURCES = dynxml-generated-mysqld-optvar-vs.xml $(dynxml_generated_mysqld_optvar_vs_INCLUDES) -dynxml-generated-mysqld-optvar-vs.xml: $(dynxml_generated_mysqld_optvar_vs_INCLUDES) +dynxml_generated_mysqld_optvar_vs_IDMAP_SOURCES = \ + dynxml-generated-mysqld-optvar-vs.xml +dynxml-generated-mysqld-optvar-vs.valid: $(dynxml_generated_mysqld_optvar_vs_SOURCES) +dynxml-generated-mysqld-optvar-vs.validwarn: $(dynxml_generated_mysqld_optvar_vs_SOURCES) +dynxml-generated-mysqld-optvar-vs.validpure: $(dynxml_generated_mysqld_optvar_vs_SOURCES) dynxml-generated-mysqld-optvar-vs-prepped.xml: $(dynxml_generated_mysqld_optvar_vs_SOURCES) dynxml-generated-mysqld-optvar-vs-manprepped.xml: $(dynxml_generated_mysqld_optvar_vs_SOURCES) dynxml-generated-mysqld-optvar-vs-remprepped.xml: $(dynxml_generated_mysqld_optvar_vs_SOURCES) +dynxml-generated-mysqld-optvar-vs.titles: $(dynxml_generated_mysqld_optvar_vs_SOURCES) +dynxml-generated-mysqld-optvar-vs.useless: $(dynxml_generated_mysqld_optvar_vs_SOURCES) mysqld_vs_INCLUDES = \ ../common/fixedchars.ent \ @@ -20,8 +26,17 @@ dynxml-generated-mysqld-optvar-vs.xml mysqld_vs_IMAGES = mysqld_vs_SOURCES = mysqld-vs.xml $(mysqld_vs_INCLUDES) -mysqld-vs.xml: $(mysqld_vs_INCLUDES) +mysqld_vs_IDMAP_SOURCES = \ + mysqld-vs.xml \ + ../refman-5.1/copyright.xml \ + ../refman-5.1/legalnotice.en.xml \ + dynxml-generated-mysqld-optvar-vs.xml +mysqld-vs.valid: $(mysqld_vs_SOURCES) +mysqld-vs.validwarn: $(mysqld_vs_SOURCES) +mysqld-vs.validpure: $(mysqld_vs_SOURCES) mysqld-vs-prepped.xml: $(mysqld_vs_SOURCES) mysqld-vs-manprepped.xml: $(mysqld_vs_SOURCES) mysqld-vs-remprepped.xml: $(mysqld_vs_SOURCES) +mysqld-vs.titles: $(mysqld_vs_SOURCES) +mysqld-vs.useless: $(mysqld_vs_SOURCES) Modified: trunk/falcon/Makefile =================================================================== --- trunk/falcon/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/falcon/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 347 bytes @@ -69,4 +69,4 @@ # Import directory specific extensions -include ../refman-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/guibook/Makefile =================================================================== --- trunk/guibook/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/guibook/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 5; 499 bytes @@ -63,8 +63,4 @@ # Import directory specific extensions -include ../administrator/Makefile.ext -include ../gui-common/Makefile.ext -include ../migration-toolkit/Makefile.ext -include ../query-browser/Makefile.ext -include ../workbench/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/internals/Makefile =================================================================== --- trunk/internals/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/internals/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 0, Lines Deleted: 5; 446 bytes @@ -61,8 +61,3 @@ include $(MAKE_DIR)/xml-txt include $(MAKE_DIR)/xml-info include $(MAKE_DIR)/xml-depend - -# Import directory specific extensions - -include ../refman-common/Makefile.ext -include ../refman-5.1/Makefile.ext Modified: trunk/migration-toolkit/Makefile =================================================================== --- trunk/migration-toolkit/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/migration-toolkit/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 377 bytes @@ -61,4 +61,4 @@ # Import directory specific extensions -include ../gui-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/mysqlqb/Makefile =================================================================== --- trunk/mysqlqb/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/mysqlqb/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 387 bytes @@ -102,5 +102,4 @@ # Import directory specific extensions -include ../refman-common/Makefile.ext -include ../refman-5.0/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/mysqltest/Makefile =================================================================== --- trunk/mysqltest/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/mysqltest/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 363 bytes @@ -82,4 +82,4 @@ # Import directory specific extensions -include $(REPO_ROOT)/refman-5.1/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/query-browser/Makefile =================================================================== --- trunk/query-browser/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/query-browser/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 365 bytes @@ -61,4 +61,4 @@ # Import directory specific extensions -include ../gui-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/query-browser-cy/Makefile =================================================================== --- trunk/query-browser-cy/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/query-browser-cy/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 374 bytes @@ -61,4 +61,4 @@ # Import directory specific extensions -include ../gui-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/query-browser-cy/Makefile.depends =================================================================== --- trunk/query-browser-cy/Makefile.depends 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/query-browser-cy/Makefile.depends 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 8, Lines Added: 102, Lines Deleted: 10; 7934 bytes @@ -6,10 +6,16 @@ chapter_options_query_browser_IMAGES = \ images/qb-options.png chapter_options_query_browser_SOURCES = chapter-options-query-browser.xml $(chapter_options_query_browser_INCLUDES) -chapter-options-query-browser.xml: $(chapter_options_query_browser_INCLUDES) +chapter_options_query_browser_IDMAP_SOURCES = \ + chapter-options-query-browser.xml +chapter-options-query-browser.valid: $(chapter_options_query_browser_SOURCES) +chapter-options-query-browser.validwarn: $(chapter_options_query_browser_SOURCES) +chapter-options-query-browser.validpure: $(chapter_options_query_browser_SOURCES) chapter-options-query-browser-prepped.xml: $(chapter_options_query_browser_SOURCES) chapter-options-query-browser-manprepped.xml: $(chapter_options_query_browser_SOURCES) chapter-options-query-browser-remprepped.xml: $(chapter_options_query_browser_SOURCES) +chapter-options-query-browser.titles: $(chapter_options_query_browser_SOURCES) +chapter-options-query-browser.useless: $(chapter_options_query_browser_SOURCES) connection_dialog_INCLUDES = \ ../common/fixedchars.ent \ @@ -19,18 +25,30 @@ connection_dialog_IMAGES = \ images/connection.png connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES) -connection-dialog.xml: $(connection_dialog_INCLUDES) +connection_dialog_IDMAP_SOURCES = \ + connection-dialog.xml +connection-dialog.valid: $(connection_dialog_SOURCES) +connection-dialog.validwarn: $(connection_dialog_SOURCES) +connection-dialog.validpure: $(connection_dialog_SOURCES) connection-dialog-prepped.xml: $(connection_dialog_SOURCES) connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) +connection-dialog.titles: $(connection_dialog_SOURCES) +connection-dialog.useless: $(connection_dialog_SOURCES) copyright_INCLUDES = copyright_IMAGES = copyright_SOURCES = copyright.xml $(copyright_INCLUDES) -copyright.xml: $(copyright_INCLUDES) +copyright_IDMAP_SOURCES = \ + copyright.xml +copyright.valid: $(copyright_SOURCES) +copyright.validwarn: $(copyright_SOURCES) +copyright.validpure: $(copyright_SOURCES) copyright-prepped.xml: $(copyright_SOURCES) copyright-manprepped.xml: $(copyright_SOURCES) copyright-remprepped.xml: $(copyright_SOURCES) +copyright.titles: $(copyright_SOURCES) +copyright.useless: $(copyright_SOURCES) introduction_INCLUDES = \ ../common/fixedchars.ent \ @@ -38,19 +56,32 @@ all-entities.ent introduction_IMAGES = introduction_SOURCES = introduction.xml $(introduction_INCLUDES) -introduction.xml: $(introduction_INCLUDES) +introduction_IDMAP_SOURCES = \ + introduction.xml +introduction.valid: $(introduction_SOURCES) +introduction.validwarn: $(introduction_SOURCES) +introduction.validpure: $(introduction_SOURCES) introduction-prepped.xml: $(introduction_SOURCES) introduction-manprepped.xml: $(introduction_SOURCES) introduction-remprepped.xml: $(introduction_SOURCES) +introduction.titles: $(introduction_SOURCES) +introduction.useless: $(introduction_SOURCES) legalnotice_en_INCLUDES = \ copyright.xml legalnotice_en_IMAGES = legalnotice_en_SOURCES = legalnotice.en.xml $(legalnotice_en_INCLUDES) -legalnotice.en.xml: $(legalnotice_en_INCLUDES) +legalnotice_en_IDMAP_SOURCES = \ + legalnotice.en.xml \ + copyright.xml +legalnotice.en.valid: $(legalnotice_en_SOURCES) +legalnotice.en.validwarn: $(legalnotice_en_SOURCES) +legalnotice.en.validpure: $(legalnotice_en_SOURCES) legalnotice.en-prepped.xml: $(legalnotice_en_SOURCES) legalnotice.en-manprepped.xml: $(legalnotice_en_SOURCES) legalnotice.en-remprepped.xml: $(legalnotice_en_SOURCES) +legalnotice.en.titles: $(legalnotice_en_SOURCES) +legalnotice.en.useless: $(legalnotice_en_SOURCES) options_INCLUDES = \ ../common/fixedchars.ent \ @@ -75,10 +106,21 @@ ../gui-common/images/ssl-params.png \ images/qb-options.png options_SOURCES = options.xml $(options_INCLUDES) -options.xml: $(options_INCLUDES) +options_IDMAP_SOURCES = \ + options.xml \ + ../gui-common/chapter-options-connections.xml \ + ../gui-common/chapter-options-editors.xml \ + ../gui-common/chapter-options-general.xml \ + ../gui-common/chapter-options-introduction.xml \ + chapter-options-query-browser.xml +options.valid: $(options_SOURCES) +options.validwarn: $(options_SOURCES) +options.validpure: $(options_SOURCES) options-prepped.xml: $(options_SOURCES) options-manprepped.xml: $(options_SOURCES) options-remprepped.xml: $(options_SOURCES) +options.titles: $(options_SOURCES) +options.useless: $(options_SOURCES) query_browser_INCLUDES = \ ../common/fixedchars.ent \ @@ -163,10 +205,42 @@ images/tabletool.png \ images/twosakilas.png query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES) -query-browser.xml: $(query_browser_INCLUDES) +query_browser_IDMAP_SOURCES = \ + query-browser.xml \ + ../gui-common-cy/appendix-common-files.xml \ + ../gui-common-cy/appendix-connection-storage.xml \ + ../gui-common-cy/appendix-source-install.xml \ + ../gui-common-cy/appendix-third-party.xml \ + ../gui-common-cy/appendix-translator-notes.xml \ + ../gui-common-cy/appendix-troubleshooting.xml \ + ../gui-common-cy/chapter-table-editor.xml \ + ../gui-common-cy/chapter-uninstall-all.xml \ + ../gui-common-cy/chapter-upgrade-all.xml \ + ../gui-common-cy/installation-all.xml \ + ../gui-common-cy/mysql-enterprise.xml \ + ../gui-common-cy/starting-all.xml \ + ../gui-common/chapter-options-connections.xml \ + ../gui-common/chapter-options-editors.xml \ + ../gui-common/chapter-options-general.xml \ + ../gui-common/chapter-options-introduction.xml \ + ../userguide/excel-mysql.xml \ + chapter-options-query-browser.xml \ + connection-dialog.xml \ + copyright.xml \ + introduction.xml \ + legalnotice.en.xml \ + options.xml \ + tour.xml \ + using.xml \ + xml-files.xml +query-browser.valid: $(query_browser_SOURCES) +query-browser.validwarn: $(query_browser_SOURCES) +query-browser.validpure: $(query_browser_SOURCES) query-browser-prepped.xml: $(query_browser_SOURCES) query-browser-manprepped.xml: $(query_browser_SOURCES) query-browser-remprepped.xml: $(query_browser_SOURCES) +query-browser.titles: $(query_browser_SOURCES) +query-browser.useless: $(query_browser_SOURCES) tour_INCLUDES = \ ../common/fixedchars.ent \ @@ -188,10 +262,16 @@ images/script-editor.png \ images/twosakilas.png tour_SOURCES = tour.xml $(tour_INCLUDES) -tour.xml: $(tour_INCLUDES) +tour_IDMAP_SOURCES = \ + tour.xml +tour.valid: $(tour_SOURCES) +tour.validwarn: $(tour_SOURCES) +tour.validpure: $(tour_SOURCES) tour-prepped.xml: $(tour_SOURCES) tour-manprepped.xml: $(tour_SOURCES) tour-remprepped.xml: $(tour_SOURCES) +tour.titles: $(tour_SOURCES) +tour.useless: $(tour_SOURCES) using_INCLUDES = \ ../common/fixedchars.ent \ @@ -205,10 +285,16 @@ images/stored-procedure-database-browser.png \ images/tabletool.png using_SOURCES = using.xml $(using_INCLUDES) -using.xml: $(using_INCLUDES) +using_IDMAP_SOURCES = \ + using.xml +using.valid: $(using_SOURCES) +using.validwarn: $(using_SOURCES) +using.validpure: $(using_SOURCES) using-prepped.xml: $(using_SOURCES) using-manprepped.xml: $(using_SOURCES) using-remprepped.xml: $(using_SOURCES) +using.titles: $(using_SOURCES) +using.useless: $(using_SOURCES) xml_files_INCLUDES = \ ../common/fixedchars.ent \ @@ -216,8 +302,14 @@ all-entities.ent xml_files_IMAGES = xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES) -xml-files.xml: $(xml_files_INCLUDES) +xml_files_IDMAP_SOURCES = \ + xml-files.xml +xml-files.valid: $(xml_files_SOURCES) +xml-files.validwarn: $(xml_files_SOURCES) +xml-files.validpure: $(xml_files_SOURCES) xml-files-prepped.xml: $(xml_files_SOURCES) xml-files-manprepped.xml: $(xml_files_SOURCES) xml-files-remprepped.xml: $(xml_files_SOURCES) +xml-files.titles: $(xml_files_SOURCES) +xml-files.useless: $(xml_files_SOURCES) Modified: trunk/refman-4.1/Makefile =================================================================== --- trunk/refman-4.1/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/refman-4.1/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 362 bytes @@ -112,5 +112,4 @@ # Import directory specific extensions -include ../refman-common/Makefile.ext - +include $(MAKE_DIR)/Makefile.ext Modified: trunk/refman-5.0/Makefile =================================================================== --- trunk/refman-5.0/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/refman-5.0/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 361 bytes @@ -115,4 +115,4 @@ # Import directory specific extensions -include ../refman-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/refman-5.1/Makefile =================================================================== --- trunk/refman-5.1/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/refman-5.1/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 361 bytes @@ -115,4 +115,4 @@ # Import directory specific extensions -include ../refman-common/Makefile.ext +include $(MAKE_DIR)/Makefile.ext Modified: trunk/workbench/Makefile =================================================================== --- trunk/workbench/Makefile 2007-05-11 19:41:11 UTC (rev 6431) +++ trunk/workbench/Makefile 2007-05-12 04:05:28 UTC (rev 6432) Changed blocks: 1, Lines Added: 1, Lines Deleted: 2; 354 bytes @@ -64,5 +64,4 @@ # Import directory specific extensions -include ../gui-common/Makefile.ext - +include $(MAKE_DIR)/Makefile.ext
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r6432 - in trunk: . administrator administrator-ro dynamic-docs falcon gui-common gui-common-cy gui-common-ro guibook i... | paul | 12 May |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 0.810 sec. using MySQL 5.1.14-beta-log