| List: | Commits | « Previous MessageNext Message » | |
| From: | paul | Date: | April 18 2007 3:02am |
| Subject: | svn commit - mysqldoc@docsrva: r5940 - in trunk: . administrator administrator-ro falcon guibook internals make.d migration-toolkit mysqlqb mysqltest ... | ||
| View as plain text | |||
Author: paul Date: 2007-04-18 03:02:40 +0200 (Wed, 18 Apr 2007) New Revision: 5940 Log: r23612@polar: paul | 2007-04-17 20:01:36 -0500 Take the plunge. Rip out all the old document dependency-generation stuff. Replace it with a newer method that picks up entity files and generates more complete information. Dependencies now are written to Makefile.depends, not directly into the main Makefile. Added: trunk/administrator-ro/Makefile.depends trunk/administrator/Makefile.depends trunk/falcon/Makefile.depends trunk/guibook/Makefile.depends trunk/internals/Makefile.depends trunk/migration-toolkit/Makefile.depends trunk/mysqlqb/Makefile.depends trunk/mysqltest/Makefile.depends trunk/ndbapi/Makefile.depends trunk/proto-doc/Makefile.depends trunk/query-browser-cy/Makefile.depends trunk/query-browser/Makefile.depends trunk/refman-4.1/Makefile.depends trunk/refman-5.0/Makefile.depends trunk/refman-5.1/Makefile.depends trunk/refman-common/Makefile.depends trunk/sample-data/sakila/Makefile.depends trunk/sample-data/world/Makefile.depends trunk/tools/xmldepend-post.pl trunk/tools/xmldepend.pl trunk/userguide/Makefile.depends trunk/workbench/Makefile.depends Modified: trunk/administrator-ro/Makefile trunk/administrator/Makefile trunk/falcon/Makefile trunk/guibook/Makefile trunk/internals/Makefile trunk/make.d/vars-docbook trunk/make.d/xml-chm trunk/make.d/xml-depend trunk/make.d/xml-guihelp trunk/make.d/xml-html-chapter trunk/make.d/xml-html-dir trunk/make.d/xml-html-section trunk/make.d/xml-html-web trunk/make.d/xml-html-web-single trunk/make.d/xml-xhtml-chapter trunk/make.d/xml-xhtml-dir trunk/make.d/xml-xhtml-section trunk/migration-toolkit/Makefile trunk/mysqlqb/Makefile trunk/mysqlqb/mysqlqb.xml trunk/mysqltest/Makefile trunk/ndbapi/Makefile trunk/proto-doc/Makefile trunk/query-browser-cy/Makefile trunk/query-browser/Makefile trunk/refman-4.1/Makefile trunk/refman-5.0/Makefile trunk/refman-5.1/Makefile trunk/refman-common/Makefile trunk/sample-data/sakila/Makefile trunk/sample-data/world/Makefile trunk/tools/de-title-entityize.pl trunk/userguide/Makefile trunk/workbench/Makefile Property changes on: trunk ___________________________________________________________________ Name: svk:merge - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23589 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19201 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593 + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:23612 7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:19201 b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218 bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593 Property changes on: trunk/tools/xmldepend-post.pl ___________________________________________________________________ Name: svn:executable + * Property changes on: trunk/tools/xmldepend.pl ___________________________________________________________________ Name: svn:executable + * Modified: trunk/administrator/Makefile =================================================================== --- trunk/administrator/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/administrator/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 8, Lines Deleted: 11; 2925 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common -IDMAP_SRCS = $(ADMINISTRATOR_SRCS) +IDMAP_SRCS = $(administrator_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = administrator.xml -depend:: administrator.depend +# TODO: FIX +administrator-prepped.xml: $(IDMAP_OBJS) -ADMINISTRATOR_SRCS_EXTRA = ../common/fixedchars.ent ../gui-common/gui-common.ent - -ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml backup.xml catalogs.xml chapter-options-administrator.xml connection-dialog.xml copyright.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/chapter-upgrade-all.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/indexeditor.png ../gui-common/images/options-connection.png ../gui-common/images/options.png ../gui-common/images/ssl-params.png ../gui-com! mon/images/tableeditor.png ../gui-common/installation-all.xml ../gui-common/mysql-enterprise.xml ../gui-common/starting-all.xml health.xml images/configure-service-mode-connection.png images/configure-service-mode-window.png images/connection.png images/graph-settings.png images/mainwindow.png images/marked-area.png images/replication.png images/restore-content.png images/server-logs-general-log.png images/system-tray.png images/user-accounts.png images/user-information.png 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-prepped.xml: $(ADMINISTRATOR_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -65,3 +59,6 @@ include ../gui-common/Makefile.ext +# Import document dependency specifications + +include Makefile.depends Added: trunk/administrator/Makefile.depends =================================================================== --- trunk/administrator/Makefile.depends (rev 0) +++ trunk/administrator/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 260, Lines Deleted: 0; 9729 bytes @@ -0,0 +1,260 @@ +administrator_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../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/chapter-upgrade-all.xml\ + ../gui-common/gui-common.ent\ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + ../gui-common/installation-all.xml\ + ../gui-common/mysql-enterprise.xml\ + ../gui-common/starting-all.xml\ + backup.xml\ + catalogs.xml\ + chapter-options-administrator.xml\ + connection-dialog.xml\ + copyright.xml\ + health.xml\ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png\ + images/graph-settings.png\ + images/mainwindow.png\ + images/marked-area.png\ + images/replication.png\ + images/restore-content.png\ + images/server-logs-general-log.png\ + images/system-tray.png\ + images/user-accounts.png\ + images/user-information.png\ + 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_IMAGES = \ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png\ + images/graph-settings.png\ + images/mainwindow.png\ + images/marked-area.png\ + images/replication.png\ + images/restore-content.png\ + images/server-logs-general-log.png\ + images/system-tray.png\ + images/user-accounts.png\ + images/user-information.png +administrator_SOURCES = administrator.xml $(administrator_INCLUDES) +administrator-prepped.xml: $(administrator_SOURCES) +administrator-manprepped.xml: $(administrator_SOURCES) +administrator-remprepped.xml: $(administrator_SOURCES) + +backup_INCLUDES = \ + ../common/fixedchars.ent +backup_IMAGES = +backup_SOURCES = backup.xml $(backup_INCLUDES) +backup-prepped.xml: $(backup_SOURCES) +backup-manprepped.xml: $(backup_SOURCES) +backup-remprepped.xml: $(backup_SOURCES) + +catalogs_INCLUDES = \ + ../common/fixedchars.ent +catalogs_IMAGES = +catalogs_SOURCES = catalogs.xml $(catalogs_INCLUDES) +catalogs-prepped.xml: $(catalogs_SOURCES) +catalogs-manprepped.xml: $(catalogs_SOURCES) +catalogs-remprepped.xml: $(catalogs_SOURCES) + +chapter_options_administrator_INCLUDES = \ + ../common/fixedchars.ent +chapter_options_administrator_IMAGES = +chapter_options_administrator_SOURCES = chapter-options-administrator.xml $(chapter_options_administrator_INCLUDES) +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) + +connection_dialog_INCLUDES = \ + ../common/fixedchars.ent\ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png +connection_dialog_IMAGES = \ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png +connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES) +connection-dialog-prepped.xml: $(connection_dialog_SOURCES) +connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) +connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +health_INCLUDES = \ + ../common/fixedchars.ent\ + images/graph-settings.png +health_IMAGES = \ + images/graph-settings.png +health_SOURCES = health.xml $(health_INCLUDES) +health-prepped.xml: $(health_SOURCES) +health-manprepped.xml: $(health_SOURCES) +health-remprepped.xml: $(health_SOURCES) + +introduction_INCLUDES = \ + ../gui-common/gui-common.ent +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +main_window_INCLUDES = \ + ../common/fixedchars.ent\ + images/mainwindow.png\ + images/marked-area.png +main_window_IMAGES = \ + images/mainwindow.png\ + images/marked-area.png +main_window_SOURCES = main-window.xml $(main_window_INCLUDES) +main-window-prepped.xml: $(main_window_SOURCES) +main-window-manprepped.xml: $(main_window_SOURCES) +main-window-remprepped.xml: $(main_window_SOURCES) + +replication_status_INCLUDES = \ + ../common/fixedchars.ent\ + images/replication.png +replication_status_IMAGES = \ + images/replication.png +replication_status_SOURCES = replication-status.xml $(replication_status_INCLUDES) +replication-status-prepped.xml: $(replication_status_SOURCES) +replication-status-manprepped.xml: $(replication_status_SOURCES) +replication-status-remprepped.xml: $(replication_status_SOURCES) + +restore_INCLUDES = \ + ../common/fixedchars.ent\ + images/restore-content.png +restore_IMAGES = \ + images/restore-content.png +restore_SOURCES = restore.xml $(restore_INCLUDES) +restore-prepped.xml: $(restore_SOURCES) +restore-manprepped.xml: $(restore_SOURCES) +restore-remprepped.xml: $(restore_SOURCES) + +server_connections_INCLUDES = \ + ../common/fixedchars.ent +server_connections_IMAGES = +server_connections_SOURCES = server-connections.xml $(server_connections_INCLUDES) +server-connections-prepped.xml: $(server_connections_SOURCES) +server-connections-manprepped.xml: $(server_connections_SOURCES) +server-connections-remprepped.xml: $(server_connections_SOURCES) + +server_information_INCLUDES = \ + ../common/fixedchars.ent +server_information_IMAGES = +server_information_SOURCES = server-information.xml $(server_information_INCLUDES) +server-information-prepped.xml: $(server_information_SOURCES) +server-information-manprepped.xml: $(server_information_SOURCES) +server-information-remprepped.xml: $(server_information_SOURCES) + +server_logs_INCLUDES = \ + ../common/fixedchars.ent\ + images/server-logs-general-log.png +server_logs_IMAGES = \ + images/server-logs-general-log.png +server_logs_SOURCES = server-logs.xml $(server_logs_INCLUDES) +server-logs-prepped.xml: $(server_logs_SOURCES) +server-logs-manprepped.xml: $(server_logs_SOURCES) +server-logs-remprepped.xml: $(server_logs_SOURCES) + +service_control_INCLUDES = \ + ../common/fixedchars.ent +service_control_IMAGES = +service_control_SOURCES = service-control.xml $(service_control_INCLUDES) +service-control-prepped.xml: $(service_control_SOURCES) +service-control-manprepped.xml: $(service_control_SOURCES) +service-control-remprepped.xml: $(service_control_SOURCES) + +startup_variables_INCLUDES = \ + ../common/fixedchars.ent +startup_variables_IMAGES = +startup_variables_SOURCES = startup-variables.xml $(startup_variables_INCLUDES) +startup-variables-prepped.xml: $(startup_variables_SOURCES) +startup-variables-manprepped.xml: $(startup_variables_SOURCES) +startup-variables-remprepped.xml: $(startup_variables_SOURCES) + +tray_monitor_INCLUDES = \ + ../common/fixedchars.ent\ + images/system-tray.png +tray_monitor_IMAGES = \ + images/system-tray.png +tray_monitor_SOURCES = tray-monitor.xml $(tray_monitor_INCLUDES) +tray-monitor-prepped.xml: $(tray_monitor_SOURCES) +tray-monitor-manprepped.xml: $(tray_monitor_SOURCES) +tray-monitor-remprepped.xml: $(tray_monitor_SOURCES) + +user_administration_INCLUDES = \ + ../common/fixedchars.ent\ + images/user-accounts.png\ + images/user-information.png +user_administration_IMAGES = \ + images/user-accounts.png\ + images/user-information.png +user_administration_SOURCES = user-administration.xml $(user_administration_INCLUDES) +user-administration-prepped.xml: $(user_administration_SOURCES) +user-administration-manprepped.xml: $(user_administration_SOURCES) +user-administration-remprepped.xml: $(user_administration_SOURCES) + +xml_files_INCLUDES = \ + ../common/fixedchars.ent +xml_files_IMAGES = +xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES) +xml-files-prepped.xml: $(xml_files_SOURCES) +xml-files-manprepped.xml: $(xml_files_SOURCES) +xml-files-remprepped.xml: $(xml_files_SOURCES) + Modified: trunk/administrator-ro/Makefile =================================================================== --- trunk/administrator-ro/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/administrator-ro/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 8, Lines Deleted: 11; 2825 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common -IDMAP_SRCS = $(ADMINISTRATOR_SRCS) +IDMAP_SRCS = $(administrator_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = administrator.xml -depend:: administrator.depend +# TODO: FIX +administrator-prepped.xml: $(IDMAP_OBJS) -ADMINISTRATOR_SRCS_EXTRA = ../common/fixedchars.ent ../gui-common/gui-common.ent - -ADMINISTRATOR_SRCS = $(ADMINISTRATOR_SRCS_EXTRA) administrator.xml ../gui-common/appendix-common-files.xml ../gui-common/appendix-connection-storage.xml ../gui-common/appendix-source-install.xml ../gui-common/appendix-third-party.xml ../gui-common/appendix-translator-notes.xml ../gui-common/appendix-troubleshooting.xml ../gui-common/chapter-options-connections.xml ../gui-common/chapter-options-editors.xml ../gui-common/chapter-options-general.xml ../gui-common/chapter-options-introduction.xml ../gui-common/chapter-table-editor.xml ../gui-common/chapter-uninstall-all.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/indexeditor.png ../gui-common/images/options-connection.png ../gui-common/images/options.png ../gui-common/images/tableeditor.png ../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 images/configure-service-mode-connection.png images/configure-service-mode-window.png images/connection.png images/graph-settings.png images/mainwindow.png images/marked-area.png images/replication.png images/restore-content.png images/server-logs-general-log.png images/system-tray.png images/user-accounts.png images/user-information.png 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-prepped.xml: $(ADMINISTRATOR_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -65,3 +59,6 @@ include ../gui-common/Makefile.ext +# Import document dependency specifications + +include Makefile.depends Added: trunk/administrator-ro/Makefile.depends =================================================================== --- trunk/administrator-ro/Makefile.depends (rev 0) +++ trunk/administrator-ro/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 258, Lines Deleted: 0; 9661 bytes @@ -0,0 +1,258 @@ +administrator_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../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/gui-common.ent\ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + ../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\ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png\ + images/graph-settings.png\ + images/mainwindow.png\ + images/marked-area.png\ + images/replication.png\ + images/restore-content.png\ + images/server-logs-general-log.png\ + images/system-tray.png\ + images/user-accounts.png\ + images/user-information.png\ + 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_IMAGES = \ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png\ + images/graph-settings.png\ + images/mainwindow.png\ + images/marked-area.png\ + images/replication.png\ + images/restore-content.png\ + images/server-logs-general-log.png\ + images/system-tray.png\ + images/user-accounts.png\ + images/user-information.png +administrator_SOURCES = administrator.xml $(administrator_INCLUDES) +administrator-prepped.xml: $(administrator_SOURCES) +administrator-manprepped.xml: $(administrator_SOURCES) +administrator-remprepped.xml: $(administrator_SOURCES) + +backup_INCLUDES = \ + ../common/fixedchars.ent +backup_IMAGES = +backup_SOURCES = backup.xml $(backup_INCLUDES) +backup-prepped.xml: $(backup_SOURCES) +backup-manprepped.xml: $(backup_SOURCES) +backup-remprepped.xml: $(backup_SOURCES) + +catalogs_INCLUDES = \ + ../common/fixedchars.ent +catalogs_IMAGES = +catalogs_SOURCES = catalogs.xml $(catalogs_INCLUDES) +catalogs-prepped.xml: $(catalogs_SOURCES) +catalogs-manprepped.xml: $(catalogs_SOURCES) +catalogs-remprepped.xml: $(catalogs_SOURCES) + +chapter_options_administrator_INCLUDES = \ + ../common/fixedchars.ent +chapter_options_administrator_IMAGES = +chapter_options_administrator_SOURCES = chapter-options-administrator.xml $(chapter_options_administrator_INCLUDES) +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) + +connection_dialog_INCLUDES = \ + ../common/fixedchars.ent\ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png +connection_dialog_IMAGES = \ + images/configure-service-mode-connection.png\ + images/configure-service-mode-window.png\ + images/connection.png +connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES) +connection-dialog-prepped.xml: $(connection_dialog_SOURCES) +connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) +connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +health_INCLUDES = \ + ../common/fixedchars.ent\ + images/graph-settings.png +health_IMAGES = \ + images/graph-settings.png +health_SOURCES = health.xml $(health_INCLUDES) +health-prepped.xml: $(health_SOURCES) +health-manprepped.xml: $(health_SOURCES) +health-remprepped.xml: $(health_SOURCES) + +introduction_INCLUDES = \ + ../gui-common/gui-common.ent +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +main_window_INCLUDES = \ + ../common/fixedchars.ent\ + images/mainwindow.png\ + images/marked-area.png +main_window_IMAGES = \ + images/mainwindow.png\ + images/marked-area.png +main_window_SOURCES = main-window.xml $(main_window_INCLUDES) +main-window-prepped.xml: $(main_window_SOURCES) +main-window-manprepped.xml: $(main_window_SOURCES) +main-window-remprepped.xml: $(main_window_SOURCES) + +replication_status_INCLUDES = \ + ../common/fixedchars.ent\ + images/replication.png +replication_status_IMAGES = \ + images/replication.png +replication_status_SOURCES = replication-status.xml $(replication_status_INCLUDES) +replication-status-prepped.xml: $(replication_status_SOURCES) +replication-status-manprepped.xml: $(replication_status_SOURCES) +replication-status-remprepped.xml: $(replication_status_SOURCES) + +restore_INCLUDES = \ + ../common/fixedchars.ent\ + images/restore-content.png +restore_IMAGES = \ + images/restore-content.png +restore_SOURCES = restore.xml $(restore_INCLUDES) +restore-prepped.xml: $(restore_SOURCES) +restore-manprepped.xml: $(restore_SOURCES) +restore-remprepped.xml: $(restore_SOURCES) + +server_connections_INCLUDES = \ + ../common/fixedchars.ent +server_connections_IMAGES = +server_connections_SOURCES = server-connections.xml $(server_connections_INCLUDES) +server-connections-prepped.xml: $(server_connections_SOURCES) +server-connections-manprepped.xml: $(server_connections_SOURCES) +server-connections-remprepped.xml: $(server_connections_SOURCES) + +server_information_INCLUDES = \ + ../common/fixedchars.ent +server_information_IMAGES = +server_information_SOURCES = server-information.xml $(server_information_INCLUDES) +server-information-prepped.xml: $(server_information_SOURCES) +server-information-manprepped.xml: $(server_information_SOURCES) +server-information-remprepped.xml: $(server_information_SOURCES) + +server_logs_INCLUDES = \ + ../common/fixedchars.ent\ + images/server-logs-general-log.png +server_logs_IMAGES = \ + images/server-logs-general-log.png +server_logs_SOURCES = server-logs.xml $(server_logs_INCLUDES) +server-logs-prepped.xml: $(server_logs_SOURCES) +server-logs-manprepped.xml: $(server_logs_SOURCES) +server-logs-remprepped.xml: $(server_logs_SOURCES) + +service_control_INCLUDES = \ + ../common/fixedchars.ent +service_control_IMAGES = +service_control_SOURCES = service-control.xml $(service_control_INCLUDES) +service-control-prepped.xml: $(service_control_SOURCES) +service-control-manprepped.xml: $(service_control_SOURCES) +service-control-remprepped.xml: $(service_control_SOURCES) + +startup_variables_INCLUDES = \ + ../common/fixedchars.ent +startup_variables_IMAGES = +startup_variables_SOURCES = startup-variables.xml $(startup_variables_INCLUDES) +startup-variables-prepped.xml: $(startup_variables_SOURCES) +startup-variables-manprepped.xml: $(startup_variables_SOURCES) +startup-variables-remprepped.xml: $(startup_variables_SOURCES) + +tray_monitor_INCLUDES = \ + ../common/fixedchars.ent\ + images/system-tray.png +tray_monitor_IMAGES = \ + images/system-tray.png +tray_monitor_SOURCES = tray-monitor.xml $(tray_monitor_INCLUDES) +tray-monitor-prepped.xml: $(tray_monitor_SOURCES) +tray-monitor-manprepped.xml: $(tray_monitor_SOURCES) +tray-monitor-remprepped.xml: $(tray_monitor_SOURCES) + +user_administration_INCLUDES = \ + ../common/fixedchars.ent\ + images/user-accounts.png\ + images/user-information.png +user_administration_IMAGES = \ + images/user-accounts.png\ + images/user-information.png +user_administration_SOURCES = user-administration.xml $(user_administration_INCLUDES) +user-administration-prepped.xml: $(user_administration_SOURCES) +user-administration-manprepped.xml: $(user_administration_SOURCES) +user-administration-remprepped.xml: $(user_administration_SOURCES) + +xml_files_INCLUDES = \ + ../common/fixedchars.ent +xml_files_IMAGES = +xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES) +xml-files-prepped.xml: $(xml_files_SOURCES) +xml-files-manprepped.xml: $(xml_files_SOURCES) +xml-files-remprepped.xml: $(xml_files_SOURCES) + Modified: trunk/falcon/Makefile =================================================================== --- trunk/falcon/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/falcon/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1450 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-common ../refman-5.1 ../query-browser -IDMAP_SRCS = $(FALCON_SRCS) +IDMAP_SRCS = $(falcon_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = falcon.xml -depend:: falcon.depend +# TODO: FIX +falcon-prepped.xml: $(IDMAP_OBJS) -FALCON_SRCS_EXTRA = ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent - -FALCON_SRCS = $(FALCON_SRCS_EXTRA) falcon.xml ../refman-5.1/copyright.xml ../refman-5.1/legalnotice.en.xml falcon-installation.xml falcon-overview.xml falcon-roadmap.xml news-falcon.xml se-falcon.xml - -falcon-prepped.xml: $(FALCON_SRCS) $(IDMAP_OBJS) - # Import standard target rules # Need xml-html-dir for formatting the manual itself into a subdir, @@ -75,3 +69,7 @@ # Import directory specific extensions include ../refman-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/falcon/Makefile.depends =================================================================== --- trunk/falcon/Makefile.depends (rev 0) +++ trunk/falcon/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 55, Lines Deleted: 0; 2218 bytes @@ -0,0 +1,55 @@ +falcon_installation_INCLUDES = \ + ../common/fixedchars.ent +falcon_installation_IMAGES = +falcon_installation_SOURCES = falcon-installation.xml $(falcon_installation_INCLUDES) +falcon-installation-prepped.xml: $(falcon_installation_SOURCES) +falcon-installation-manprepped.xml: $(falcon_installation_SOURCES) +falcon-installation-remprepped.xml: $(falcon_installation_SOURCES) + +falcon_overview_INCLUDES = \ + ../common/fixedchars.ent +falcon_overview_IMAGES = +falcon_overview_SOURCES = falcon-overview.xml $(falcon_overview_INCLUDES) +falcon-overview-prepped.xml: $(falcon_overview_SOURCES) +falcon-overview-manprepped.xml: $(falcon_overview_SOURCES) +falcon-overview-remprepped.xml: $(falcon_overview_SOURCES) + +falcon_roadmap_INCLUDES = \ + ../common/fixedchars.ent +falcon_roadmap_IMAGES = +falcon_roadmap_SOURCES = falcon-roadmap.xml $(falcon_roadmap_INCLUDES) +falcon-roadmap-prepped.xml: $(falcon_roadmap_SOURCES) +falcon-roadmap-manprepped.xml: $(falcon_roadmap_SOURCES) +falcon-roadmap-remprepped.xml: $(falcon_roadmap_SOURCES) + +falcon_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-5.1/copyright.xml\ + ../refman-5.1/legalnotice.en.xml\ + falcon-installation.xml\ + falcon-overview.xml\ + falcon-roadmap.xml\ + news-falcon.xml\ + se-falcon.xml +falcon_IMAGES = +falcon_SOURCES = falcon.xml $(falcon_INCLUDES) +falcon-prepped.xml: $(falcon_SOURCES) +falcon-manprepped.xml: $(falcon_SOURCES) +falcon-remprepped.xml: $(falcon_SOURCES) + +news_falcon_INCLUDES = \ + ../common/fixedchars.ent +news_falcon_IMAGES = +news_falcon_SOURCES = news-falcon.xml $(news_falcon_INCLUDES) +news-falcon-prepped.xml: $(news_falcon_SOURCES) +news-falcon-manprepped.xml: $(news_falcon_SOURCES) +news-falcon-remprepped.xml: $(news_falcon_SOURCES) + +se_falcon_INCLUDES = \ + ../common/fixedchars.ent +se_falcon_IMAGES = +se_falcon_SOURCES = se-falcon.xml $(se_falcon_INCLUDES) +se-falcon-prepped.xml: $(se_falcon_SOURCES) +se-falcon-manprepped.xml: $(se_falcon_SOURCES) +se-falcon-remprepped.xml: $(se_falcon_SOURCES) + Modified: trunk/guibook/Makefile =================================================================== --- trunk/guibook/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/guibook/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 6014 bytes @@ -17,7 +17,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../gui-common ../workbench ../query-browser ../administrator ../migration-toolkit ../userguide ../refman-5.1 ../refman-common -IDMAP_SRCS = $(GUIBOOK_SRCS) +IDMAP_SRCS = $(guibook_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -30,18 +30,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = guibook.xml -depend:: guibook.depend +# TODO: FIX +guibook-prepped.xml: $(IDMAP_OBJS) -GUIBOOK_SRCS_EXTRA = ../common/fixedchars.ent ../gui-common/gui-common.ent - -GUIBOOK_SRCS = $(GUIBOOK_SRCS_EXTRA) guibook.xml ../administrator/backup.xml ../administrator/catalogs.xml ../administrator/chapter-options-administrator.xml ../administrator/connection-dialog.xml ../administrator/health.xml ../administrator/images/configure-service-mode-connection.png ../administrator/images/configure-service-mode-window.png ../administrator/images/connection.png ../administrator/images/graph-settings.png ../administrator/images/mainwindow.png ../administrator/images/marked-area.png ../administrator/images/replication.png ../administrator/images/restore-content.png ../administrator/images/server-logs-general-log.png ../administrator/images/system-tray.png ../administrator/images/user-accounts.png ../administrator/images/user-information.png ../administrator/introduction.xml ../administrator/main-window.xml ../administrator/replication-status.xml ../administrator/restore.xml ../administrator/server-connections.xml ../administrator/server-information.xml ../! administrator/server-logs.xml ../administrator/service-control.xml ../administrator/startup-variables.xml ../administrator/tray-monitor.xml ../administrator/user-administration.xml ../administrator/xml-files.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-grt-shell.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/chapter-upgrade-all.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/grt-shell.png ../gui-common/images/indexeditor.png .! ./gui-common/images/options-connection.png ../gui-common/image! s/option s.png ../gui-common/images/ssl-params.png ../gui-common/images/tableeditor.png ../gui-common/installation-all.xml ../gui-common/mysql-enterprise.xml ../gui-common/starting-all.xml ../migration-toolkit/accessprep.xml ../migration-toolkit/extending.xml ../migration-toolkit/images/access-object-permissions.png ../migration-toolkit/images/access-options-show.png ../migration-toolkit/images/access-system-tables.png ../migration-toolkit/images/bulk-transfer.png ../migration-toolkit/images/configuration-type.png ../migration-toolkit/images/connect-servers.png ../migration-toolkit/images/creating-objects.png ../migration-toolkit/images/creation-options.png ../migration-toolkit/images/manual-editing-detail.png ../migration-toolkit/images/manual-editing.png ../migration-toolkit/images/mapping-options.png ../migration-toolkit/images/meta-migration.png ../migration-toolkit/images/migration-plan.png ../migration-toolkit/images/object-mapping.png ../migration-toolkit/images/object-selecti! on-detail.png ../migration-toolkit/images/object-selection-expression.png ../migration-toolkit/images/object-selection.png ../migration-toolkit/images/reverse-engineering.png ../migration-toolkit/images/schema-selection.png ../migration-toolkit/images/source-database-access.png ../migration-toolkit/images/source-database-mssql.png ../migration-toolkit/images/source-database-mysql.png ../migration-toolkit/images/source-database-oracle-nodriver.png ../migration-toolkit/images/source-database-oracle.png ../migration-toolkit/images/summary.png ../migration-toolkit/images/target-database-mysql.png ../migration-toolkit/images/welcome-screen.png ../migration-toolkit/indepth.xml ../migration-toolkit/introduction.xml ../migration-toolkit/overview.xml ../migration-toolkit/scripted-migration.xml ../query-browser/chapter-options-query-browser.xml ../query-browser/images/blob-buttons.png ../query-browser/images/buttonbar.png ../query-browser/images/file-open-script.png ../query-browser/! images/mainscreen.png ../query-browser/images/qb-options.png .! ./query- browser/images/querybar.png ../query-browser/images/schematabrowser.png ../query-browser/images/script-editor.png ../query-browser/images/stored-procedure-database-browser.png ../query-browser/images/tabletool.png ../query-browser/images/twosakilas.png ../query-browser/introduction.xml ../query-browser/tour.xml ../query-browser/using.xml ../query-browser/xml-files.xml ../userguide/excel-mysql.xml ../workbench/copyright.xml ../workbench/getting-started.xml ../workbench/images/workbench-windows.png ../workbench/introduction.xml ../workbench/legalnotice.en.xml ../workbench/overview.xml ../workbench/reverse-engineering.xml ../workbench/using.xml - -guibook-prepped.xml: $(GUIBOOK_SRCS) $(IDMAP_OBJS) - clean:: $(RM) guibook.txt @@ -70,3 +64,7 @@ include ../migration-toolkit/Makefile.ext include ../query-browser/Makefile.ext include ../workbench/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/guibook/Makefile.depends =================================================================== --- trunk/guibook/Makefile.depends (rev 0) +++ trunk/guibook/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 191, Lines Deleted: 0; 8763 bytes @@ -0,0 +1,191 @@ +guibook_INCLUDES = \ + ../administrator/../common/fixedchars.ent\ + ../administrator/../gui-common/gui-common.ent\ + ../administrator/backup.xml\ + ../administrator/catalogs.xml\ + ../administrator/chapter-options-administrator.xml\ + ../administrator/connection-dialog.xml\ + ../administrator/health.xml\ + ../administrator/images/configure-service-mode-connection.png\ + ../administrator/images/configure-service-mode-window.png\ + ../administrator/images/connection.png\ + ../administrator/images/graph-settings.png\ + ../administrator/images/mainwindow.png\ + ../administrator/images/marked-area.png\ + ../administrator/images/replication.png\ + ../administrator/images/restore-content.png\ + ../administrator/images/server-logs-general-log.png\ + ../administrator/images/system-tray.png\ + ../administrator/images/user-accounts.png\ + ../administrator/images/user-information.png\ + ../administrator/introduction.xml\ + ../administrator/main-window.xml\ + ../administrator/replication-status.xml\ + ../administrator/restore.xml\ + ../administrator/server-connections.xml\ + ../administrator/server-information.xml\ + ../administrator/server-logs.xml\ + ../administrator/service-control.xml\ + ../administrator/startup-variables.xml\ + ../administrator/tray-monitor.xml\ + ../administrator/user-administration.xml\ + ../administrator/xml-files.xml\ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../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-grt-shell.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/chapter-upgrade-all.xml\ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/grt-shell.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + ../gui-common/installation-all.xml\ + ../gui-common/mysql-enterprise.xml\ + ../gui-common/starting-all.xml\ + ../migration-toolkit/../common/fixedchars.ent\ + ../migration-toolkit/../gui-common/gui-common.ent\ + ../migration-toolkit/accessprep.xml\ + ../migration-toolkit/extending.xml\ + ../migration-toolkit/images/access-object-permissions.png\ + ../migration-toolkit/images/access-options-show.png\ + ../migration-toolkit/images/access-system-tables.png\ + ../migration-toolkit/images/bulk-transfer.png\ + ../migration-toolkit/images/configuration-type.png\ + ../migration-toolkit/images/connect-servers.png\ + ../migration-toolkit/images/creating-objects.png\ + ../migration-toolkit/images/creation-options.png\ + ../migration-toolkit/images/manual-editing-detail.png\ + ../migration-toolkit/images/manual-editing.png\ + ../migration-toolkit/images/mapping-options.png\ + ../migration-toolkit/images/meta-migration.png\ + ../migration-toolkit/images/migration-plan.png\ + ../migration-toolkit/images/object-mapping.png\ + ../migration-toolkit/images/object-selection-detail.png\ + ../migration-toolkit/images/object-selection-expression.png\ + ../migration-toolkit/images/object-selection.png\ + ../migration-toolkit/images/reverse-engineering.png\ + ../migration-toolkit/images/schema-selection.png\ + ../migration-toolkit/images/source-database-access.png\ + ../migration-toolkit/images/source-database-mssql.png\ + ../migration-toolkit/images/source-database-mysql.png\ + ../migration-toolkit/images/source-database-oracle-nodriver.png\ + ../migration-toolkit/images/source-database-oracle.png\ + ../migration-toolkit/images/summary.png\ + ../migration-toolkit/images/target-database-mysql.png\ + ../migration-toolkit/images/welcome-screen.png\ + ../migration-toolkit/indepth.xml\ + ../migration-toolkit/introduction.xml\ + ../migration-toolkit/overview.xml\ + ../migration-toolkit/scripted-migration.xml\ + ../query-browser/../common/fixedchars.ent\ + ../query-browser/../gui-common/gui-common.ent\ + ../query-browser/chapter-options-query-browser.xml\ + ../query-browser/images/blob-buttons.png\ + ../query-browser/images/buttonbar.png\ + ../query-browser/images/file-open-script.png\ + ../query-browser/images/mainscreen.png\ + ../query-browser/images/qb-options.png\ + ../query-browser/images/querybar.png\ + ../query-browser/images/schematabrowser.png\ + ../query-browser/images/script-editor.png\ + ../query-browser/images/stored-procedure-database-browser.png\ + ../query-browser/images/tabletool.png\ + ../query-browser/images/twosakilas.png\ + ../query-browser/introduction.xml\ + ../query-browser/tour.xml\ + ../query-browser/using.xml\ + ../query-browser/xml-files.xml\ + ../userguide/../common/fixedchars.ent\ + ../userguide/excel-mysql.xml\ + ../workbench/../common/fixedchars.ent\ + ../workbench/../gui-common/gui-common.ent\ + ../workbench/copyright.xml\ + ../workbench/getting-started.xml\ + ../workbench/images/workbench-windows.png\ + ../workbench/introduction.xml\ + ../workbench/legalnotice.en.xml\ + ../workbench/overview.xml\ + ../workbench/reverse-engineering.xml\ + ../workbench/using.xml +guibook_IMAGES = \ + ../administrator/images/configure-service-mode-connection.png\ + ../administrator/images/configure-service-mode-window.png\ + ../administrator/images/connection.png\ + ../administrator/images/graph-settings.png\ + ../administrator/images/mainwindow.png\ + ../administrator/images/marked-area.png\ + ../administrator/images/replication.png\ + ../administrator/images/restore-content.png\ + ../administrator/images/server-logs-general-log.png\ + ../administrator/images/system-tray.png\ + ../administrator/images/user-accounts.png\ + ../administrator/images/user-information.png\ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/grt-shell.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + ../migration-toolkit/images/access-object-permissions.png\ + ../migration-toolkit/images/access-options-show.png\ + ../migration-toolkit/images/access-system-tables.png\ + ../migration-toolkit/images/bulk-transfer.png\ + ../migration-toolkit/images/configuration-type.png\ + ../migration-toolkit/images/connect-servers.png\ + ../migration-toolkit/images/creating-objects.png\ + ../migration-toolkit/images/creation-options.png\ + ../migration-toolkit/images/manual-editing-detail.png\ + ../migration-toolkit/images/manual-editing.png\ + ../migration-toolkit/images/mapping-options.png\ + ../migration-toolkit/images/meta-migration.png\ + ../migration-toolkit/images/migration-plan.png\ + ../migration-toolkit/images/object-mapping.png\ + ../migration-toolkit/images/object-selection-detail.png\ + ../migration-toolkit/images/object-selection-expression.png\ + ../migration-toolkit/images/object-selection.png\ + ../migration-toolkit/images/reverse-engineering.png\ + ../migration-toolkit/images/schema-selection.png\ + ../migration-toolkit/images/source-database-access.png\ + ../migration-toolkit/images/source-database-mssql.png\ + ../migration-toolkit/images/source-database-mysql.png\ + ../migration-toolkit/images/source-database-oracle-nodriver.png\ + ../migration-toolkit/images/source-database-oracle.png\ + ../migration-toolkit/images/summary.png\ + ../migration-toolkit/images/target-database-mysql.png\ + ../migration-toolkit/images/welcome-screen.png\ + ../query-browser/images/blob-buttons.png\ + ../query-browser/images/buttonbar.png\ + ../query-browser/images/file-open-script.png\ + ../query-browser/images/mainscreen.png\ + ../query-browser/images/qb-options.png\ + ../query-browser/images/querybar.png\ + ../query-browser/images/schematabrowser.png\ + ../query-browser/images/script-editor.png\ + ../query-browser/images/stored-procedure-database-browser.png\ + ../query-browser/images/tabletool.png\ + ../query-browser/images/twosakilas.png\ + ../workbench/images/workbench-windows.png +guibook_SOURCES = guibook.xml $(guibook_INCLUDES) +guibook-prepped.xml: $(guibook_SOURCES) +guibook-manprepped.xml: $(guibook_SOURCES) +guibook-remprepped.xml: $(guibook_SOURCES) + Modified: trunk/internals/Makefile =================================================================== --- trunk/internals/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/internals/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1538 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-common ../refman-5.1 -IDMAP_SRCS = $(INTERNALS_SRCS) +IDMAP_SRCS = $(internals_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = internals.xml -depend:: internals.depend +# TODO: FIX +internals-prepped.xml: $(IDMAP_OBJS) -INTERNALS_SRCS_EXTRA = ../common/fixedchars.ent - -INTERNALS_SRCS = $(INTERNALS_SRCS_EXTRA) internals.xml algorithms.xml client-server-protocol.xml coding-guidelines.xml copyright.xml custom-engine.xml error-message.xml fileformats.xml guided-tour.xml images/custom-engine-overview.png innodb-sources.xml innodb.xml legalnotice.en.xml myisam.xml mysql-sources.xml optimizer.xml porting.xml prepared-stored.xml replication.xml selects.xml transformations.xml - -internals-prepped.xml: $(INTERNALS_SRCS) $(IDMAP_OBJS) - clean:: $(RM) internals.txt @@ -68,3 +62,7 @@ include ../refman-common/Makefile.ext include ../refman-5.1/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/internals/Makefile.depends =================================================================== --- trunk/internals/Makefile.depends (rev 0) +++ trunk/internals/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 191, Lines Deleted: 0; 6896 bytes @@ -0,0 +1,191 @@ +algorithms_INCLUDES = \ + ../common/fixedchars.ent +algorithms_IMAGES = +algorithms_SOURCES = algorithms.xml $(algorithms_INCLUDES) +algorithms-prepped.xml: $(algorithms_SOURCES) +algorithms-manprepped.xml: $(algorithms_SOURCES) +algorithms-remprepped.xml: $(algorithms_SOURCES) + +client_server_protocol_INCLUDES = \ + ../common/fixedchars.ent +client_server_protocol_IMAGES = +client_server_protocol_SOURCES = client-server-protocol.xml $(client_server_protocol_INCLUDES) +client-server-protocol-prepped.xml: $(client_server_protocol_SOURCES) +client-server-protocol-manprepped.xml: $(client_server_protocol_SOURCES) +client-server-protocol-remprepped.xml: $(client_server_protocol_SOURCES) + +coding_guidelines_INCLUDES = \ + ../common/fixedchars.ent +coding_guidelines_IMAGES = +coding_guidelines_SOURCES = coding-guidelines.xml $(coding_guidelines_INCLUDES) +coding-guidelines-prepped.xml: $(coding_guidelines_SOURCES) +coding-guidelines-manprepped.xml: $(coding_guidelines_SOURCES) +coding-guidelines-remprepped.xml: $(coding_guidelines_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +custom_engine_INCLUDES = \ + ../common/fixedchars.ent\ + images/custom-engine-overview.png +custom_engine_IMAGES = \ + images/custom-engine-overview.png +custom_engine_SOURCES = custom-engine.xml $(custom_engine_INCLUDES) +custom-engine-prepped.xml: $(custom_engine_SOURCES) +custom-engine-manprepped.xml: $(custom_engine_SOURCES) +custom-engine-remprepped.xml: $(custom_engine_SOURCES) + +error_message_INCLUDES = \ + ../common/fixedchars.ent +error_message_IMAGES = +error_message_SOURCES = error-message.xml $(error_message_INCLUDES) +error-message-prepped.xml: $(error_message_SOURCES) +error-message-manprepped.xml: $(error_message_SOURCES) +error-message-remprepped.xml: $(error_message_SOURCES) + +fileformats_INCLUDES = \ + ../common/fixedchars.ent +fileformats_IMAGES = +fileformats_SOURCES = fileformats.xml $(fileformats_INCLUDES) +fileformats-prepped.xml: $(fileformats_SOURCES) +fileformats-manprepped.xml: $(fileformats_SOURCES) +fileformats-remprepped.xml: $(fileformats_SOURCES) + +guided_tour_INCLUDES = \ + ../common/fixedchars.ent +guided_tour_IMAGES = +guided_tour_SOURCES = guided-tour.xml $(guided_tour_INCLUDES) +guided-tour-prepped.xml: $(guided_tour_SOURCES) +guided-tour-manprepped.xml: $(guided_tour_SOURCES) +guided-tour-remprepped.xml: $(guided_tour_SOURCES) + +innodb_sources_INCLUDES = \ + ../common/fixedchars.ent +innodb_sources_IMAGES = +innodb_sources_SOURCES = innodb-sources.xml $(innodb_sources_INCLUDES) +innodb-sources-prepped.xml: $(innodb_sources_SOURCES) +innodb-sources-manprepped.xml: $(innodb_sources_SOURCES) +innodb-sources-remprepped.xml: $(innodb_sources_SOURCES) + +innodb_INCLUDES = \ + ../common/fixedchars.ent +innodb_IMAGES = +innodb_SOURCES = innodb.xml $(innodb_INCLUDES) +innodb-prepped.xml: $(innodb_SOURCES) +innodb-manprepped.xml: $(innodb_SOURCES) +innodb-remprepped.xml: $(innodb_SOURCES) + +internals_INCLUDES = \ + ../common/fixedchars.ent\ + algorithms.xml\ + client-server-protocol.xml\ + coding-guidelines.xml\ + copyright.xml\ + custom-engine.xml\ + error-message.xml\ + fileformats.xml\ + guided-tour.xml\ + images/custom-engine-overview.png\ + innodb-sources.xml\ + innodb.xml\ + legalnotice.en.xml\ + myisam.xml\ + mysql-sources.xml\ + optimizer.xml\ + porting.xml\ + prepared-stored.xml\ + replication.xml\ + selects.xml\ + stored-program.xml\ + transformations.xml +internals_IMAGES = \ + images/custom-engine-overview.png +internals_SOURCES = internals.xml $(internals_INCLUDES) +internals-prepped.xml: $(internals_SOURCES) +internals-manprepped.xml: $(internals_SOURCES) +internals-remprepped.xml: $(internals_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +myisam_INCLUDES = \ + ../common/fixedchars.ent +myisam_IMAGES = +myisam_SOURCES = myisam.xml $(myisam_INCLUDES) +myisam-prepped.xml: $(myisam_SOURCES) +myisam-manprepped.xml: $(myisam_SOURCES) +myisam-remprepped.xml: $(myisam_SOURCES) + +mysql_sources_INCLUDES = \ + ../common/fixedchars.ent +mysql_sources_IMAGES = +mysql_sources_SOURCES = mysql-sources.xml $(mysql_sources_INCLUDES) +mysql-sources-prepped.xml: $(mysql_sources_SOURCES) +mysql-sources-manprepped.xml: $(mysql_sources_SOURCES) +mysql-sources-remprepped.xml: $(mysql_sources_SOURCES) + +optimizer_INCLUDES = \ + ../common/fixedchars.ent +optimizer_IMAGES = +optimizer_SOURCES = optimizer.xml $(optimizer_INCLUDES) +optimizer-prepped.xml: $(optimizer_SOURCES) +optimizer-manprepped.xml: $(optimizer_SOURCES) +optimizer-remprepped.xml: $(optimizer_SOURCES) + +porting_INCLUDES = \ + ../common/fixedchars.ent +porting_IMAGES = +porting_SOURCES = porting.xml $(porting_INCLUDES) +porting-prepped.xml: $(porting_SOURCES) +porting-manprepped.xml: $(porting_SOURCES) +porting-remprepped.xml: $(porting_SOURCES) + +prepared_stored_INCLUDES = \ + ../common/fixedchars.ent +prepared_stored_IMAGES = +prepared_stored_SOURCES = prepared-stored.xml $(prepared_stored_INCLUDES) +prepared-stored-prepped.xml: $(prepared_stored_SOURCES) +prepared-stored-manprepped.xml: $(prepared_stored_SOURCES) +prepared-stored-remprepped.xml: $(prepared_stored_SOURCES) + +replication_INCLUDES = \ + ../common/fixedchars.ent +replication_IMAGES = +replication_SOURCES = replication.xml $(replication_INCLUDES) +replication-prepped.xml: $(replication_SOURCES) +replication-manprepped.xml: $(replication_SOURCES) +replication-remprepped.xml: $(replication_SOURCES) + +selects_INCLUDES = \ + ../common/fixedchars.ent +selects_IMAGES = +selects_SOURCES = selects.xml $(selects_INCLUDES) +selects-prepped.xml: $(selects_SOURCES) +selects-manprepped.xml: $(selects_SOURCES) +selects-remprepped.xml: $(selects_SOURCES) + +stored_program_INCLUDES = \ + ../common/fixedchars.ent +stored_program_IMAGES = +stored_program_SOURCES = stored-program.xml $(stored_program_INCLUDES) +stored-program-prepped.xml: $(stored_program_SOURCES) +stored-program-manprepped.xml: $(stored_program_SOURCES) +stored-program-remprepped.xml: $(stored_program_SOURCES) + +transformations_INCLUDES = \ + ../common/fixedchars.ent +transformations_IMAGES = +transformations_SOURCES = transformations.xml $(transformations_INCLUDES) +transformations-prepped.xml: $(transformations_SOURCES) +transformations-manprepped.xml: $(transformations_SOURCES) +transformations-remprepped.xml: $(transformations_SOURCES) + Modified: trunk/make.d/vars-docbook =================================================================== --- trunk/make.d/vars-docbook 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/vars-docbook 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 2, Lines Added: 19, Lines Deleted: 16; 2402 bytes @@ -89,6 +89,12 @@ XMLFORMAT = $(TOOLS_DIR)/xmlformat.pl \ --config-file=$(TOOLS_DIR)/xmlformat.conf -i +# Scripts that generate document dependency information and postprocess +# it into Makefile-suitable format + +XMLDEPEND = $(TOOLS_DIR)/xmldepend.pl +XMLDEPEND_POST = $(TOOLS_DIR)/xmldepend-post.pl + # BUG_PREP fixes up "Bug #xxxx" bug references into <ulink> elements # that point to htto://bugs.mysql.com bug reports. @@ -361,26 +367,23 @@ # Make macros # Given a target basename, target_images returns the list of image files -# in the target's dependency list. +# needed for the target. # Let's break this down: -# - $1 is the target basename (for example, manual from manual.html-chapter) -# - The echo|tr shell command converts lowercase to uppercase and dashes to -# underscore -# - To that result, we add _SRCS to get the name of the variable that -# contains the dependency list for the target (for example, MANUAL_SRCS) -# - Taking $() on that result gives us theh value of the dependency list -# variable. -# - filter selects image files from the list (filenames ending in .png, -# .gif, .jpg, .jpeg) +# - $1 is the target basename (for example, connector-odbc from +# connector-odbc.html-chapter). +# - The $subst function call converts dashes to underscore +# (connector-odbc -> connector_odbc). +# - To that result, we add _IMAGES to get the name of the variable that +# contains the images list for the target (connector_odbc_IMAGES). +# - Taking $() on that result gives us the value of the variable. -# Assumptions: -# - The _SRCS variable associated with the target must be set in the Makefile. -# - The filter call names all appropriate extensions to extract image files. -# If we use some other image extension at some point, just update the list. +target_images = $($(subst -,_,$(1))_IMAGES) -target_images = $(filter %.png %.gif %.jpg %.jpeg, \ - $($(shell echo $(1)|tr a-z- A-Z_)_SRCS)) +# Assumption: +# - The _IMAGES variable is set in the Makefile to the proper list of +# image files. This assumption will be satisfied if "make depend" +# has been run to update the dependency lists. # Macros for generating dependencies for ID map operations Modified: trunk/make.d/xml-chm =================================================================== --- trunk/make.d/xml-chm 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-chm 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 522 bytes @@ -6,7 +6,7 @@ # - Input source document (the "prepped" input renamed to source.xml) # - Any required image files -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.chm-input: %-prepped.xml -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-depend =================================================================== --- trunk/make.d/xml-depend 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-depend 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 15, Lines Deleted: 38; 2707 bytes @@ -1,45 +1,22 @@ -# General target for updating the Makefile with the list of dependencies -# for an XML document. For a document named abc-def.xml, it adds a line -# that defines a variable named ABC_DEF_SRCS with a value that names all -# dependencies. Its value includes abc-def.xml and any files referred -# to by abc-def.xml. +# General target for updating Makefile.depends with the dependencies for +# the XML documents named in DEPEND_FILES, which is set in individual +# Makefiles. If it's not set or is empty, Makefile.depends is created +# as an empty file. -# The rule works like this: -# - Determine the basename of the dependency variable name by -# converting the target basename to uppercase and converting hyphens -# to underscores. Add _SRCS to the end to complete the dependency -# variable name. -# - Use the xmldepend.xsl transform to compute the list of files referred -# to by the XML document. Use sort -u to remove duplicates, tr to -# replace newlines with spaces. -# Note: xsltproc must be run without the --xinclude option. -# - Update the Makefile line that defines the dependency variable, -# writing the result to Makefile.new. -# - Rename Makefile.new to Makefile. +# Important setup information: +# - For any Makefile that uses this rule, add a line that says +# this: include Makefile.depends +# - Create an empty Makefile.depends file: touch Makefile.depends -# IMPORTANT: -# BEFORE RUNNING "make depend" the first time, you should put a line -# in the Makefile that defines the _SRCS dependency variable (the value -# can be anything, even empty): -# XXX_SRCS = -# If you do not include this variable line, it cannot be updated. +depend:: + $(XMLDEPEND) $(DEPEND_FILES) \ + | $(XMLDEPEND_POST) \ + --target-list=-prepped.xml,-manprepped.xml,-remprepped.xml \ + > Makefile.depends.new + mv Makefile.depends.new Makefile.depends - -# If there are dependency files that xmldepend.xsl does not detect -# (such as entity files that are processed by the XML parser and -# do not appear at the XSL level), you can define XXX_SRCS_EXTRA -# in the Makefile to list those files. - -%.depend: %.xml - VAR=`echo $* | tr a-z- A-Z_`_SRCS && \ - DEPS=`xsltproc --novalid $(XMLDEPEND_XSL) $<|sort -u|tr '\n' ' '` && \ - sed \ - -e "s|^$${VAR} *=.*|$${VAR} = "'$$'"($${VAR}_EXTRA) $< $$DEPS|" \ - Makefile > Makefile.new - mv Makefile.new Makefile - clean:: - $(RM) Makefile.new + $(RM) Makefile.depends.new help:: @echo "make depend - regenerate document dependencies" Modified: trunk/make.d/xml-guihelp =================================================================== --- trunk/make.d/xml-guihelp 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-guihelp 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 573 bytes @@ -8,7 +8,7 @@ # "fixup" step to rename output files and fix inter-file hyperlinks # per the GUI team's file-naming conventions. -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.guihelp: %-prepped.xml $(MYSQL_GUIHELP_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-html-chapter =================================================================== --- trunk/make.d/xml-html-chapter 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-html-chapter 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 596 bytes @@ -4,7 +4,7 @@ # Use html-section driver file, but set chunk.section.depth to 0, # which causes chunking at the chapter level. -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.html-chapter: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-html-dir =================================================================== --- trunk/make.d/xml-html-dir 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-html-dir 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 498 bytes @@ -3,7 +3,7 @@ # image files. # (Language sensitive) -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.html-dir: %-prepped.xml $(MYSQL_HTML_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-html-section =================================================================== --- trunk/make.d/xml-html-section 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-html-section 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 561 bytes @@ -1,7 +1,7 @@ # Convert DocBook -> HTML, with one file per section. # (Language sensitive) -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.html-section: %-prepped.xml $(MYSQL_HTML_SECTION_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-html-web =================================================================== --- trunk/make.d/xml-html-web 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-html-web 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 576 bytes @@ -9,7 +9,7 @@ # attribute. This is important because that attribute causes many # online manual pages to display incorrectly. -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.html-web: %-prepped.xml $(MYSQL_HTML_WEB_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-html-web-single =================================================================== --- trunk/make.d/xml-html-web-single 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-html-web-single 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 611 bytes @@ -9,7 +9,7 @@ # attribute. This is important because that attribute causes many # online manual pages to display incorrectly. -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.html-web-single: %-prepped.xml $(MYSQL_HTML_WEB_SINGLE_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-xhtml-chapter =================================================================== --- trunk/make.d/xml-xhtml-chapter 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-xhtml-chapter 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 602 bytes @@ -4,7 +4,7 @@ # Use xhtml-section driver file, but set chunk.section.depth to 0, # which causes chunking at the chapter level. -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.xhtml-chapter: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-xhtml-dir =================================================================== --- trunk/make.d/xml-xhtml-dir 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-xhtml-dir 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 503 bytes @@ -3,7 +3,7 @@ # image files. # (Language sensitive) -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.xhtml-dir: %-prepped.xml $(MYSQL_XHTML_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/make.d/xml-xhtml-section =================================================================== --- trunk/make.d/xml-xhtml-section 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/make.d/xml-xhtml-section 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 567 bytes @@ -1,7 +1,7 @@ # Convert DocBook -> XHTML, with one file per section. # (Language sensitive) -# The %_SRCS variable must be set to the list of target dependencies. +# The %_SOURCES variable must be set to the list of target dependencies. %.xhtml-section: %-prepped.xml $(MYSQL_XHTML_SECTION_XSL_DEPS) -$(RM) -r $@ $@-tmp Modified: trunk/migration-toolkit/Makefile =================================================================== --- trunk/migration-toolkit/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/migration-toolkit/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 2539 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-5.1 ../refman-common -IDMAP_SRCS = $(MIGRATION_TOOLKIT_SRCS) +IDMAP_SRCS = $(migration_toolkit_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = migration-toolkit.xml -depend:: migration-toolkit.depend +# TODO: FIX +migration-toolkit-prepped.xml: $(IDMAP_OBJS) -MIGRATION_TOOLKIT_SRCS_EXTRA = ../common/fixedchars.ent - -MIGRATION_TOOLKIT_SRCS = $(MIGRATION_TOOLKIT_SRCS_EXTRA) migration-toolkit.xml accessprep.xml copyright.xml extending.xml features.xml ../gui-common/chapter-grt-shell.xml ../gui-common/chapter-uninstall-all.xml ../gui-common/chapter-upgrade-all.xml ../gui-common/images/grt-shell.png ../gui-common/installation-all.xml ../gui-common/mysql-enterprise.xml ../gui-common/starting-all.xml images/access-object-permissions.png images/access-options-show.png images/access-system-tables.png images/bulk-transfer.png images/configuration-type.png images/connect-servers.png images/creating-objects.png images/creation-options.png images/manual-editing-detail.png images/manual-editing.png images/mapping-options.png images/meta-migration.png images/migration-plan.png images/object-mapping.png images/object-selection-detail.png images/object-selection-expression.png images/object-selection.png images/reverse-engineering.png images/schema-selection.png images/source-database-access.png images! /source-database-mssql.png images/source-database-mysql.png images/source-database-oracle-nodriver.png images/source-database-oracle.png images/summary.png images/target-database-mysql.png images/welcome-screen.png indepth.xml introduction.xml legalnotice.en.xml overview.xml scripted-migration.xml - -migration-toolkit-prepped.xml: $(MIGRATION_TOOLKIT_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -64,3 +58,7 @@ # Import directory specific extensions include ../gui-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/migration-toolkit/Makefile.depends =================================================================== --- trunk/migration-toolkit/Makefile.depends (rev 0) +++ trunk/migration-toolkit/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 206, Lines Deleted: 0; 7162 bytes @@ -0,0 +1,206 @@ +accessprep_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/access-object-permissions.png\ + images/access-options-show.png\ + images/access-system-tables.png +accessprep_IMAGES = \ + images/access-object-permissions.png\ + images/access-options-show.png\ + images/access-system-tables.png +accessprep_SOURCES = accessprep.xml $(accessprep_INCLUDES) +accessprep-prepped.xml: $(accessprep_SOURCES) +accessprep-manprepped.xml: $(accessprep_SOURCES) +accessprep-remprepped.xml: $(accessprep_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +extending_INCLUDES = \ + ../gui-common/gui-common.ent +extending_IMAGES = +extending_SOURCES = extending.xml $(extending_INCLUDES) +extending-prepped.xml: $(extending_SOURCES) +extending-manprepped.xml: $(extending_SOURCES) +extending-remprepped.xml: $(extending_SOURCES) + +features_INCLUDES = \ + ../gui-common/gui-common.ent +features_IMAGES = +features_SOURCES = features.xml $(features_INCLUDES) +features-prepped.xml: $(features_SOURCES) +features-manprepped.xml: $(features_SOURCES) +features-remprepped.xml: $(features_SOURCES) + +indepth_INCLUDES = \ + ../common/fixedchars.ent\ + images/bulk-transfer.png\ + images/configuration-type.png\ + images/connect-servers.png\ + images/creating-objects.png\ + images/creation-options.png\ + images/manual-editing-detail.png\ + images/manual-editing.png\ + images/mapping-options.png\ + images/meta-migration.png\ + images/object-mapping.png\ + images/object-selection-detail.png\ + images/object-selection-expression.png\ + images/object-selection.png\ + images/reverse-engineering.png\ + images/schema-selection.png\ + images/source-database-access.png\ + images/source-database-mssql.png\ + images/source-database-mysql.png\ + images/source-database-oracle-nodriver.png\ + images/source-database-oracle.png\ + images/summary.png\ + images/target-database-mysql.png\ + images/welcome-screen.png +indepth_IMAGES = \ + images/bulk-transfer.png\ + images/configuration-type.png\ + images/connect-servers.png\ + images/creating-objects.png\ + images/creation-options.png\ + images/manual-editing-detail.png\ + images/manual-editing.png\ + images/mapping-options.png\ + images/meta-migration.png\ + images/object-mapping.png\ + images/object-selection-detail.png\ + images/object-selection-expression.png\ + images/object-selection.png\ + images/reverse-engineering.png\ + images/schema-selection.png\ + images/source-database-access.png\ + images/source-database-mssql.png\ + images/source-database-mysql.png\ + images/source-database-oracle-nodriver.png\ + images/source-database-oracle.png\ + images/summary.png\ + images/target-database-mysql.png\ + images/welcome-screen.png +indepth_SOURCES = indepth.xml $(indepth_INCLUDES) +indepth-prepped.xml: $(indepth_SOURCES) +indepth-manprepped.xml: $(indepth_SOURCES) +indepth-remprepped.xml: $(indepth_SOURCES) + +introduction_INCLUDES = \ + ../gui-common/gui-common.ent +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +migration_toolkit_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../gui-common/chapter-grt-shell.xml\ + ../gui-common/chapter-uninstall-all.xml\ + ../gui-common/chapter-upgrade-all.xml\ + ../gui-common/gui-common.ent\ + ../gui-common/images/grt-shell.png\ + ../gui-common/installation-all.xml\ + ../gui-common/mysql-enterprise.xml\ + ../gui-common/starting-all.xml\ + accessprep.xml\ + copyright.xml\ + extending.xml\ + features.xml\ + images/access-object-permissions.png\ + images/access-options-show.png\ + images/access-system-tables.png\ + images/bulk-transfer.png\ + images/configuration-type.png\ + images/connect-servers.png\ + images/creating-objects.png\ + images/creation-options.png\ + images/manual-editing-detail.png\ + images/manual-editing.png\ + images/mapping-options.png\ + images/meta-migration.png\ + images/migration-plan.png\ + images/object-mapping.png\ + images/object-selection-detail.png\ + images/object-selection-expression.png\ + images/object-selection.png\ + images/reverse-engineering.png\ + images/schema-selection.png\ + images/source-database-access.png\ + images/source-database-mssql.png\ + images/source-database-mysql.png\ + images/source-database-oracle-nodriver.png\ + images/source-database-oracle.png\ + images/summary.png\ + images/target-database-mysql.png\ + images/welcome-screen.png\ + indepth.xml\ + introduction.xml\ + legalnotice.en.xml\ + overview.xml\ + scripted-migration.xml +migration_toolkit_IMAGES = \ + ../gui-common/images/grt-shell.png\ + images/access-object-permissions.png\ + images/access-options-show.png\ + images/access-system-tables.png\ + images/bulk-transfer.png\ + images/configuration-type.png\ + images/connect-servers.png\ + images/creating-objects.png\ + images/creation-options.png\ + images/manual-editing-detail.png\ + images/manual-editing.png\ + images/mapping-options.png\ + images/meta-migration.png\ + images/migration-plan.png\ + images/object-mapping.png\ + images/object-selection-detail.png\ + images/object-selection-expression.png\ + images/object-selection.png\ + images/reverse-engineering.png\ + images/schema-selection.png\ + images/source-database-access.png\ + images/source-database-mssql.png\ + images/source-database-mysql.png\ + images/source-database-oracle-nodriver.png\ + images/source-database-oracle.png\ + images/summary.png\ + images/target-database-mysql.png\ + images/welcome-screen.png +migration_toolkit_SOURCES = migration-toolkit.xml $(migration_toolkit_INCLUDES) +migration-toolkit-prepped.xml: $(migration_toolkit_SOURCES) +migration-toolkit-manprepped.xml: $(migration_toolkit_SOURCES) +migration-toolkit-remprepped.xml: $(migration_toolkit_SOURCES) + +overview_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/migration-plan.png +overview_IMAGES = \ + images/migration-plan.png +overview_SOURCES = overview.xml $(overview_INCLUDES) +overview-prepped.xml: $(overview_SOURCES) +overview-manprepped.xml: $(overview_SOURCES) +overview-remprepped.xml: $(overview_SOURCES) + +scripted_migration_INCLUDES = \ + ../common/fixedchars.ent +scripted_migration_IMAGES = +scripted_migration_SOURCES = scripted-migration.xml $(scripted_migration_INCLUDES) +scripted-migration-prepped.xml: $(scripted_migration_SOURCES) +scripted-migration-manprepped.xml: $(scripted_migration_SOURCES) +scripted-migration-remprepped.xml: $(scripted_migration_SOURCES) + Modified: trunk/mysqlqb/Makefile =================================================================== --- trunk/mysqlqb/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/mysqlqb/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 4, Lines Added: 11, Lines Deleted: 18; 2016 bytes @@ -34,7 +34,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-common ../refman-5.0 -IDMAP_SRCS = $(MYSQLQB_SRCS) $(wildcard ../refman-common/*.xml) +IDMAP_SRCS = $(mysqlqb_SOURCES) $(wildcard ../refman-common/*.xml) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -47,24 +47,13 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = mysqlqb.xml -depend:: mysqlqb.depend +# TODO: FIX +mysqlqb-prepped.xml: $(IDMAP_OBJS) +mysqlqb-manprepped.xml: $(IDMAP_OBJS) -MYSQLQB_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent - -MYSQLQB_SRCS = $(MYSQLQB_SRCS_EXTRA) mysqlqb.xml mysqlqb_functions.xml mysqlqb_statements.xml - -mysqlqb-prepped.xml: $(MYSQLQB_SRCS) $(IDMAP_OBJS) -mysqlqb-manprepped.xml: $(MYSQLQB_SRCS) $(IDMAP_OBJS) - -# This is necessary to help along "make depend" because we need some -# files from another directory - -mysqlqb.depend: versions.ent mysqlqb_functions.xml mysqlqb_statements.xml - versions.ent: ../refman-5.0/versions.ent cp $^ $@ mysqlqb_functions.xml: ../refman-5.0/dynxml-generated-functions.xml @@ -75,7 +64,7 @@ ../refman-5.0/dynxml-generated-functions.xml: make -C ../refman-5.0 dynxml-generated-functions.xml -mysqlqb.guihelp-toc: $(MYSQLQB_SRCS) $(XSL_DIR)/mysql-guihelp-toc.xsl +mysqlqb.guihelp-toc: $(mysqlqb_SOURCES) $(XSL_DIR)/mysql-guihelp-toc.xsl -$(RM) -r $@ $@-tmp mkdir $@-tmp $(XSLTPROC) \ @@ -108,3 +97,7 @@ include ../refman-common/Makefile.ext include ../refman-5.0/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/mysqlqb/Makefile.depends =================================================================== --- trunk/mysqlqb/Makefile.depends (rev 0) +++ trunk/mysqlqb/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 29, Lines Deleted: 0; 1325 bytes @@ -0,0 +1,29 @@ +mysqlqb_INCLUDES = \ + ../common/fixedchars.ent\ + ../common/phrases.ent\ + ../refman-common/urls.ent\ + mysqlqb_functions.xml\ + mysqlqb_statements.xml\ + versions.ent +mysqlqb_IMAGES = +mysqlqb_SOURCES = mysqlqb.xml $(mysqlqb_INCLUDES) +mysqlqb-prepped.xml: $(mysqlqb_SOURCES) +mysqlqb-manprepped.xml: $(mysqlqb_SOURCES) +mysqlqb-remprepped.xml: $(mysqlqb_SOURCES) + +mysqlqb_functions_INCLUDES = \ + ../common/fixedchars.ent +mysqlqb_functions_IMAGES = +mysqlqb_functions_SOURCES = mysqlqb_functions.xml $(mysqlqb_functions_INCLUDES) +mysqlqb_functions-prepped.xml: $(mysqlqb_functions_SOURCES) +mysqlqb_functions-manprepped.xml: $(mysqlqb_functions_SOURCES) +mysqlqb_functions-remprepped.xml: $(mysqlqb_functions_SOURCES) + +mysqlqb_statements_INCLUDES = \ + ../common/fixedchars.ent +mysqlqb_statements_IMAGES = +mysqlqb_statements_SOURCES = mysqlqb_statements.xml $(mysqlqb_statements_INCLUDES) +mysqlqb_statements-prepped.xml: $(mysqlqb_statements_SOURCES) +mysqlqb_statements-manprepped.xml: $(mysqlqb_statements_SOURCES) +mysqlqb_statements-remprepped.xml: $(mysqlqb_statements_SOURCES) + Modified: trunk/mysqlqb/mysqlqb.xml =================================================================== --- trunk/mysqlqb/mysqlqb.xml 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/mysqlqb/mysqlqb.xml 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 877 bytes @@ -3,12 +3,12 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ <!ENTITY % fixedchars.entities SYSTEM "../common/fixedchars.ent"> + <!ENTITY % urls.entities SYSTEM "../refman-common/urls.ent"> + <!ENTITY % phrases.entities SYSTEM "../common/phrases.ent"> + <!ENTITY % versions.entities SYSTEM "versions.ent"> %fixedchars.entities; - <!ENTITY % urls.entities SYSTEM "../refman-common/urls.ent"> %urls.entities; - <!ENTITY % phrases.entities SYSTEM "../common/phrases.ent"> %phrases.entities; - <!ENTITY % versions.entities SYSTEM "versions.ent"> %versions.entities; ]> <book id="top" lang="en"> Modified: trunk/mysqltest/Makefile =================================================================== --- trunk/mysqltest/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/mysqltest/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 10, Lines Deleted: 12; 1548 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-5.1 -IDMAP_SRCS = $(MYSQLTEST_SRCS) +IDMAP_SRCS = $(mysqltest_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,19 +31,13 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = mysqltest.xml -depend:: mysqltest.depend +# TODO: FIX +mysqltest-prepped.xml: $(IDMAP_OBJS) +mysqltest-manprepped.xml: $(IDMAP_OBJS) -MYSQLTEST_SRCS_EXTRA = ../common/fixedchars.ent - -MYSQLTEST_SRCS = $(MYSQLTEST_SRCS_EXTRA) mysqltest.xml command-reference.xml components.xml copyright.xml introduction.xml legalnotice.en.xml preface.xml programs.xml tutorial.xml unit-test.xml - -mysqltest-prepped.xml: $(MYSQLTEST_SRCS) $(IDMAP_OBJS) -mysqltest-manprepped.xml: $(MYSQLTEST_SRCS) $(IDMAP_OBJS) - # Manual page generation # mysqltest.man target processes mysqltest.xml and generates a bunch of # xxx.1 files in the current directory. These get copied to the @@ -85,3 +79,7 @@ # Import directory specific extensions include $(REPO_ROOT)/refman-5.1/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/mysqltest/Makefile.depends =================================================================== --- trunk/mysqltest/Makefile.depends (rev 0) +++ trunk/mysqltest/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 88, Lines Deleted: 0; 3152 bytes @@ -0,0 +1,88 @@ +command_reference_INCLUDES = \ + ../common/fixedchars.ent +command_reference_IMAGES = +command_reference_SOURCES = command-reference.xml $(command-reference_INCLUDES) +command-reference-prepped.xml: $(command-reference_SOURCES) +command-reference-manprepped.xml: $(command-reference_SOURCES) +command-reference-remprepped.xml: $(command-reference_SOURCES) + +components_INCLUDES = \ + ../common/fixedchars.ent +components_IMAGES = +components_SOURCES = components.xml $(components_INCLUDES) +components-prepped.xml: $(components_SOURCES) +components-manprepped.xml: $(components_SOURCES) +components-remprepped.xml: $(components_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +introduction_INCLUDES = \ + ../common/fixedchars.ent +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +mysqltest_INCLUDES = \ + ../common/fixedchars.ent\ + command-reference.xml\ + components.xml\ + copyright.xml\ + introduction.xml\ + legalnotice.en.xml\ + preface.xml\ + programs.xml\ + tutorial.xml\ + unit-test.xml +mysqltest_IMAGES = +mysqltest_SOURCES = mysqltest.xml $(mysqltest_INCLUDES) +mysqltest-prepped.xml: $(mysqltest_SOURCES) +mysqltest-manprepped.xml: $(mysqltest_SOURCES) +mysqltest-remprepped.xml: $(mysqltest_SOURCES) + +preface_INCLUDES = \ + ../common/fixedchars.ent +preface_IMAGES = +preface_SOURCES = preface.xml $(preface_INCLUDES) +preface-prepped.xml: $(preface_SOURCES) +preface-manprepped.xml: $(preface_SOURCES) +preface-remprepped.xml: $(preface_SOURCES) + +programs_INCLUDES = \ + ../common/fixedchars.ent +programs_IMAGES = +programs_SOURCES = programs.xml $(programs_INCLUDES) +programs-prepped.xml: $(programs_SOURCES) +programs-manprepped.xml: $(programs_SOURCES) +programs-remprepped.xml: $(programs_SOURCES) + +tutorial_INCLUDES = \ + ../common/fixedchars.ent +tutorial_IMAGES = +tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES) +tutorial-prepped.xml: $(tutorial_SOURCES) +tutorial-manprepped.xml: $(tutorial_SOURCES) +tutorial-remprepped.xml: $(tutorial_SOURCES) + +unit_test_INCLUDES = \ + ../common/fixedchars.ent +unit_test_IMAGES = +unit_test_SOURCES = unit-test.xml $(unit-test_INCLUDES) +unit-test-prepped.xml: $(unit-test_SOURCES) +unit-test-manprepped.xml: $(unit-test_SOURCES) +unit-test-remprepped.xml: $(unit-test_SOURCES) + Modified: trunk/ndbapi/Makefile =================================================================== --- trunk/ndbapi/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/ndbapi/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 2238 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-5.1 ../refman-common -IDMAP_SRCS = $(NDBAPI_SRCS) +IDMAP_SRCS = $(ndbapi_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = ndbapi.xml -depend:: ndbapi.depend +# TODO: FIX +ndbapi-prepped.xml: $(IDMAP_OBJS) -NDBAPI_SRCS_EXTRA = ndb.en.ent - -NDBAPI_SRCS = $(NDBAPI_SRCS_EXTRA) ndbapi.xml copyright.xml errors.xml examples.xml getting-started.xml images/NdbBlob-class.png images/Ndb-class.png images/Ndb-cluster-connection-class.png images/NdbDictionary-AutoGrowSpecification-struct.png images/NdbDictionary-classes.png images/NdbDictionary-Column-class.png images/NdbDictionary-Dictionary-class.png images/NdbDictionary-Object-class.png images/NdbDictionary-Object-Datafile-class.png images/NdbDictionary-Object-Event-class.png images/NdbDictionary-Object-Index-class.png images/NdbDictionary-Object-LogfileGroup-class.png images/NdbDictionary-Object-Table-class.png images/NdbDictionary-Object-Tablespace-class.png images/NdbDictionary-Object-Undofile-class.png images/NdbError-struct.png images/NdbEventOperation-class.png images/NdbIndexOperation-class.png images/NdbIndexScanOperation-class.png images/NdbOperation-class.png images/NdbOperation-subclasses.png images/NdbRecAttr-class.png images/NdbScanFilter-class.png images/! NdbScanOperation-class.png images/NdbTransaction-class.png legalnotice.en.xml mgm-api.xml ndb-classes.xml overview.xml - -ndbapi-prepped.xml: $(NDBAPI_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -61,3 +55,7 @@ include $(MAKE_DIR)/xml-txt #include $(MAKE_DIR)/xml-info include $(MAKE_DIR)/xml-depend + +# Import document dependency specifications + +include Makefile.depends Added: trunk/ndbapi/Makefile.depends =================================================================== --- trunk/ndbapi/Makefile.depends (rev 0) +++ trunk/ndbapi/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 179, Lines Deleted: 0; 6625 bytes @@ -0,0 +1,179 @@ +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +errors_INCLUDES = \ + images/NdbError-struct.png\ + ndb.en.ent +errors_IMAGES = \ + images/NdbError-struct.png +errors_SOURCES = errors.xml $(errors_INCLUDES) +errors-prepped.xml: $(errors_SOURCES) +errors-manprepped.xml: $(errors_SOURCES) +errors-remprepped.xml: $(errors_SOURCES) + +examples_INCLUDES = \ + ndb.en.ent +examples_IMAGES = +examples_SOURCES = examples.xml $(examples_INCLUDES) +examples-prepped.xml: $(examples_SOURCES) +examples-manprepped.xml: $(examples_SOURCES) +examples-remprepped.xml: $(examples_SOURCES) + +getting_started_INCLUDES = \ + ndb.en.ent +getting_started_IMAGES = +getting_started_SOURCES = getting-started.xml $(getting_started_INCLUDES) +getting-started-prepped.xml: $(getting_started_SOURCES) +getting-started-manprepped.xml: $(getting_started_SOURCES) +getting-started-remprepped.xml: $(getting_started_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +mgm_api_INCLUDES = \ + ndb.en.ent +mgm_api_IMAGES = +mgm_api_SOURCES = mgm-api.xml $(mgm_api_INCLUDES) +mgm-api-prepped.xml: $(mgm_api_SOURCES) +mgm-api-manprepped.xml: $(mgm_api_SOURCES) +mgm-api-remprepped.xml: $(mgm_api_SOURCES) + +ndb_classes_INCLUDES = \ + images/Ndb-class.png\ + images/Ndb-cluster-connection-class.png\ + images/NdbBlob-class.png\ + images/NdbDictionary-AutoGrowSpecification-struct.png\ + images/NdbDictionary-Column-class.png\ + images/NdbDictionary-Dictionary-class.png\ + images/NdbDictionary-Object-Datafile-class.png\ + images/NdbDictionary-Object-Event-class.png\ + images/NdbDictionary-Object-Index-class.png\ + images/NdbDictionary-Object-LogfileGroup-class.png\ + images/NdbDictionary-Object-Table-class.png\ + images/NdbDictionary-Object-Tablespace-class.png\ + images/NdbDictionary-Object-Undofile-class.png\ + images/NdbDictionary-Object-class.png\ + images/NdbDictionary-classes.png\ + images/NdbEventOperation-class.png\ + images/NdbIndexOperation-class.png\ + images/NdbIndexScanOperation-class.png\ + images/NdbOperation-class.png\ + images/NdbOperation-subclasses.png\ + images/NdbRecAttr-class.png\ + images/NdbScanFilter-class.png\ + images/NdbScanOperation-class.png\ + images/NdbTransaction-class.png\ + ndb.en.ent +ndb_classes_IMAGES = \ + images/Ndb-class.png\ + images/Ndb-cluster-connection-class.png\ + images/NdbBlob-class.png\ + images/NdbDictionary-AutoGrowSpecification-struct.png\ + images/NdbDictionary-Column-class.png\ + images/NdbDictionary-Dictionary-class.png\ + images/NdbDictionary-Object-Datafile-class.png\ + images/NdbDictionary-Object-Event-class.png\ + images/NdbDictionary-Object-Index-class.png\ + images/NdbDictionary-Object-LogfileGroup-class.png\ + images/NdbDictionary-Object-Table-class.png\ + images/NdbDictionary-Object-Tablespace-class.png\ + images/NdbDictionary-Object-Undofile-class.png\ + images/NdbDictionary-Object-class.png\ + images/NdbDictionary-classes.png\ + images/NdbEventOperation-class.png\ + images/NdbIndexOperation-class.png\ + images/NdbIndexScanOperation-class.png\ + images/NdbOperation-class.png\ + images/NdbOperation-subclasses.png\ + images/NdbRecAttr-class.png\ + images/NdbScanFilter-class.png\ + images/NdbScanOperation-class.png\ + images/NdbTransaction-class.png +ndb_classes_SOURCES = ndb-classes.xml $(ndb_classes_INCLUDES) +ndb-classes-prepped.xml: $(ndb_classes_SOURCES) +ndb-classes-manprepped.xml: $(ndb_classes_SOURCES) +ndb-classes-remprepped.xml: $(ndb_classes_SOURCES) + +ndbapi_INCLUDES = \ + copyright.xml\ + errors.xml\ + examples.xml\ + getting-started.xml\ + images/Ndb-class.png\ + images/Ndb-cluster-connection-class.png\ + images/NdbBlob-class.png\ + images/NdbDictionary-AutoGrowSpecification-struct.png\ + images/NdbDictionary-Column-class.png\ + images/NdbDictionary-Dictionary-class.png\ + images/NdbDictionary-Object-Datafile-class.png\ + images/NdbDictionary-Object-Event-class.png\ + images/NdbDictionary-Object-Index-class.png\ + images/NdbDictionary-Object-LogfileGroup-class.png\ + images/NdbDictionary-Object-Table-class.png\ + images/NdbDictionary-Object-Tablespace-class.png\ + images/NdbDictionary-Object-Undofile-class.png\ + images/NdbDictionary-Object-class.png\ + images/NdbDictionary-classes.png\ + images/NdbError-struct.png\ + images/NdbEventOperation-class.png\ + images/NdbIndexOperation-class.png\ + images/NdbIndexScanOperation-class.png\ + images/NdbOperation-class.png\ + images/NdbOperation-subclasses.png\ + images/NdbRecAttr-class.png\ + images/NdbScanFilter-class.png\ + images/NdbScanOperation-class.png\ + images/NdbTransaction-class.png\ + legalnotice.en.xml\ + mgm-api.xml\ + ndb-classes.xml\ + ndb.en.ent\ + overview.xml +ndbapi_IMAGES = \ + images/Ndb-class.png\ + images/Ndb-cluster-connection-class.png\ + images/NdbBlob-class.png\ + images/NdbDictionary-AutoGrowSpecification-struct.png\ + images/NdbDictionary-Column-class.png\ + images/NdbDictionary-Dictionary-class.png\ + images/NdbDictionary-Object-Datafile-class.png\ + images/NdbDictionary-Object-Event-class.png\ + images/NdbDictionary-Object-Index-class.png\ + images/NdbDictionary-Object-LogfileGroup-class.png\ + images/NdbDictionary-Object-Table-class.png\ + images/NdbDictionary-Object-Tablespace-class.png\ + images/NdbDictionary-Object-Undofile-class.png\ + images/NdbDictionary-Object-class.png\ + images/NdbDictionary-classes.png\ + images/NdbError-struct.png\ + images/NdbEventOperation-class.png\ + images/NdbIndexOperation-class.png\ + images/NdbIndexScanOperation-class.png\ + images/NdbOperation-class.png\ + images/NdbOperation-subclasses.png\ + images/NdbRecAttr-class.png\ + images/NdbScanFilter-class.png\ + images/NdbScanOperation-class.png\ + images/NdbTransaction-class.png +ndbapi_SOURCES = ndbapi.xml $(ndbapi_INCLUDES) +ndbapi-prepped.xml: $(ndbapi_SOURCES) +ndbapi-manprepped.xml: $(ndbapi_SOURCES) +ndbapi-remprepped.xml: $(ndbapi_SOURCES) + +overview_INCLUDES = \ + ndb.en.ent +overview_IMAGES = +overview_SOURCES = overview.xml $(overview_INCLUDES) +overview-prepped.xml: $(overview_SOURCES) +overview-manprepped.xml: $(overview_SOURCES) +overview-remprepped.xml: $(overview_SOURCES) + Modified: trunk/proto-doc/Makefile =================================================================== --- trunk/proto-doc/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/proto-doc/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 10, Lines Deleted: 12; 1416 bytes @@ -19,7 +19,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG) IDMAP_REFS = . -IDMAP_SRCS = $(PROTO_BOOK_SRCS) +IDMAP_SRCS = $(proto_book_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -32,19 +32,13 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = proto-book.xml -depend:: proto-book.depend +# TODO: FIX +proto-book-prepped.xml: $(IDMAP_OBJS) +proto-book-remprepped.xml: $(IDMAP_OBJS) -PROTO_BOOK_SRCS_EXTRA = ../common/fixedchars.ent - -PROTO_BOOK_SRCS = $(PROTO_BOOK_SRCS_EXTRA) proto-book.xml copyright.xml legalnotice.en.xml - -proto-book-prepped.xml: $(PROTO_BOOK_SRCS) $(IDMAP_OBJS) -proto-book-remprepped.xml: $(PROTO_BOOK_SRCS) $(IDMAP_OBJS) - # ... put any special-case target rules here ... # Include this clean target if you generate plain text output @@ -79,3 +73,7 @@ include $(MAKE_DIR)/xml-remark include $(MAKE_DIR)/xml-depend include $(MAKE_DIR)/xml-useless + +# Import document dependency specifications + +include Makefile.depends Added: trunk/proto-doc/Makefile.depends =================================================================== --- trunk/proto-doc/Makefile.depends (rev 0) +++ trunk/proto-doc/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 25, Lines Deleted: 0; 1114 bytes @@ -0,0 +1,25 @@ +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +proto_book_INCLUDES = \ + ../common/fixedchars.ent\ + copyright.xml\ + legalnotice.en.xml +proto_book_IMAGES = +proto_book_SOURCES = proto-book.xml $(proto_book_INCLUDES) +proto-book-prepped.xml: $(proto_book_SOURCES) +proto-book-manprepped.xml: $(proto_book_SOURCES) +proto-book-remprepped.xml: $(proto_book_SOURCES) + Modified: trunk/query-browser/Makefile =================================================================== --- trunk/query-browser/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/query-browser/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 2740 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../gui-common ../userguide ../refman-5.1 ../refman-common -IDMAP_SRCS = $(QUERY_BROWSER_SRCS) +IDMAP_SRCS = $(query_browser_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = query-browser.xml -depend:: query-browser.depend +# TODO: FIX +query-browser-prepped.xml: $(IDMAP_OBJS) -QUERY_BROWSER_SRCS_EXTRA = ../gui-common/gui-common.ent - -QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml chapter-options-query-browser.xml connection-dialog.xml copyright.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/chapter-upgrade-all.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/indexeditor.png ../gui-common/images/options-connection.png ../gui-common/images/options.png ../gui-common/images/ssl-params.png ../gui-common/images/tableeditor.p! ng ../gui-common/installation-all.xml ../gui-common/mysql-enterprise.xml ../gui-common/starting-all.xml images/blob-buttons.png images/buttonbar.png images/connection.png images/file-open-script.png images/mainscreen.png images/qb-options.png images/querybar.png images/schematabrowser.png images/script-editor.png images/stored-procedure-database-browser.png images/tabletool.png images/twosakilas.png introduction.xml legalnotice.en.xml options.xml tour.xml ../userguide/excel-mysql.xml using.xml xml-files.xml - -query-browser-prepped.xml: $(QUERY_BROWSER_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -64,3 +58,7 @@ # Import directory specific extensions include ../gui-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/query-browser/Makefile.depends =================================================================== --- trunk/query-browser/Makefile.depends (rev 0) +++ trunk/query-browser/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 187, Lines Deleted: 0; 6718 bytes @@ -0,0 +1,187 @@ +chapter_options_query_browser_INCLUDES = \ + ../common/fixedchars.ent\ + images/qb-options.png +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-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) + +connection_dialog_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/connection.png +connection_dialog_IMAGES = \ + images/connection.png +connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES) +connection-dialog-prepped.xml: $(connection_dialog_SOURCES) +connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) +connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +introduction_INCLUDES = \ + ../gui-common/gui-common.ent +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +options_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../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/gui-common.ent\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + chapter-options-query-browser.xml\ + images/qb-options.png +options_IMAGES = \ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + images/qb-options.png +options_SOURCES = options.xml $(options_INCLUDES) +options-prepped.xml: $(options_SOURCES) +options-manprepped.xml: $(options_SOURCES) +options-remprepped.xml: $(options_SOURCES) + +query_browser_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../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/chapter-upgrade-all.xml\ + ../gui-common/gui-common.ent\ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + ../gui-common/installation-all.xml\ + ../gui-common/mysql-enterprise.xml\ + ../gui-common/starting-all.xml\ + ../userguide/../common/fixedchars.ent\ + ../userguide/excel-mysql.xml\ + chapter-options-query-browser.xml\ + connection-dialog.xml\ + copyright.xml\ + images/blob-buttons.png\ + images/buttonbar.png\ + images/connection.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/qb-options.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png\ + images/twosakilas.png\ + introduction.xml\ + legalnotice.en.xml\ + options.xml\ + tour.xml\ + using.xml\ + xml-files.xml +query_browser_IMAGES = \ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/connectionerror.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../gui-common/images/tableeditor.png\ + images/blob-buttons.png\ + images/buttonbar.png\ + images/connection.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/qb-options.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png\ + images/twosakilas.png +query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES) +query-browser-prepped.xml: $(query_browser_SOURCES) +query-browser-manprepped.xml: $(query_browser_SOURCES) +query-browser-remprepped.xml: $(query_browser_SOURCES) + +tour_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/buttonbar.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/twosakilas.png +tour_IMAGES = \ + images/buttonbar.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/twosakilas.png +tour_SOURCES = tour.xml $(tour_INCLUDES) +tour-prepped.xml: $(tour_SOURCES) +tour-manprepped.xml: $(tour_SOURCES) +tour-remprepped.xml: $(tour_SOURCES) + +using_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/blob-buttons.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png +using_IMAGES = \ + images/blob-buttons.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png +using_SOURCES = using.xml $(using_INCLUDES) +using-prepped.xml: $(using_SOURCES) +using-manprepped.xml: $(using_SOURCES) +using-remprepped.xml: $(using_SOURCES) + +xml_files_INCLUDES = \ + ../gui-common/gui-common.ent +xml_files_IMAGES = +xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES) +xml-files-prepped.xml: $(xml_files_SOURCES) +xml-files-manprepped.xml: $(xml_files_SOURCES) +xml-files-remprepped.xml: $(xml_files_SOURCES) + Modified: trunk/query-browser-cy/Makefile =================================================================== --- trunk/query-browser-cy/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/query-browser-cy/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 4, Lines Added: 10, Lines Deleted: 12; 2935 bytes @@ -8,7 +8,7 @@ # Set any variables here that should override imported standard variables -DOC_LANG = en +DOC_LANG = cy MAIN_DOC_BASENAME = query-browser # Set IDMAP and remap variables @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../gui-common ../userguide ../refman-5.1 ../refman-common -IDMAP_SRCS = $(QUERY_BROWSER_SRCS) +IDMAP_SRCS = $(query_browser_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = query-browser.xml -depend:: query-browser.depend +# TODO: FIX +query-browser-prepped.xml: $(IDMAP_OBJS) -QUERY_BROWSER_SRCS_EXTRA = ../gui-common/gui-common.ent - -QUERY_BROWSER_SRCS = $(QUERY_BROWSER_SRCS_EXTRA) query-browser.xml chapter-options-query-browser.xml connection-dialog.xml copyright.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/chapter-upgrade-all.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/connectionerror.png ../gui-common/images/indexeditor.png ../gui-common/images/options-connection.png ../gui-common/images/options.png ../gui-common/images/ssl-params.png ../gui-common/images/tableeditor.p! ng ../gui-common/installation-all.xml ../gui-common/mysql-enterprise.xml ../gui-common/starting-all.xml images/blob-buttons.png images/buttonbar.png images/connection.png images/file-open-script.png images/mainscreen.png images/qb-options.png images/querybar.png images/schematabrowser.png images/script-editor.png images/stored-procedure-database-browser.png images/tabletool.png images/twosakilas.png introduction.xml legalnotice.en.xml options.xml tour.xml ../userguide/excel-mysql.xml using.xml xml-files.xml - -query-browser-prepped.xml: $(QUERY_BROWSER_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -64,3 +58,7 @@ # Import directory specific extensions include ../gui-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/query-browser-cy/Makefile.depends =================================================================== --- trunk/query-browser-cy/Makefile.depends (rev 0) +++ trunk/query-browser-cy/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 189, Lines Deleted: 0; 6871 bytes @@ -0,0 +1,189 @@ +chapter_options_query_browser_INCLUDES = \ + ../common/fixedchars.ent\ + images/qb-options.png +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-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) + +connection_dialog_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/connection.png +connection_dialog_IMAGES = \ + images/connection.png +connection_dialog_SOURCES = connection-dialog.xml $(connection_dialog_INCLUDES) +connection-dialog-prepped.xml: $(connection_dialog_SOURCES) +connection-dialog-manprepped.xml: $(connection_dialog_SOURCES) +connection-dialog-remprepped.xml: $(connection_dialog_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +introduction_INCLUDES = \ + ../gui-common/gui-common.ent +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +options_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../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/gui-common.ent\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + chapter-options-query-browser.xml\ + images/qb-options.png +options_IMAGES = \ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + images/qb-options.png +options_SOURCES = options.xml $(options_INCLUDES) +options-prepped.xml: $(options_SOURCES) +options-manprepped.xml: $(options_SOURCES) +options-remprepped.xml: $(options_SOURCES) + +query_browser_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common-cy/../common/fixedchars.ent\ + ../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/gui-common.ent\ + ../gui-common-cy/images/columneditor.png\ + ../gui-common-cy/images/confirmchanges.png\ + ../gui-common-cy/images/connectionerror.png\ + ../gui-common-cy/images/indexeditor.png\ + ../gui-common-cy/images/tableeditor.png\ + ../gui-common-cy/installation-all.xml\ + ../gui-common-cy/mysql-enterprise.xml\ + ../gui-common-cy/starting-all.xml\ + ../gui-common/../common/fixedchars.ent\ + ../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/gui-common.ent\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + ../userguide/../common/fixedchars.ent\ + ../userguide/excel-mysql.xml\ + chapter-options-query-browser.xml\ + connection-dialog.xml\ + copyright.xml\ + images/blob-buttons.png\ + images/buttonbar.png\ + images/connection.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/qb-options.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png\ + images/twosakilas.png\ + introduction.xml\ + legalnotice.en.xml\ + options.xml\ + tour.xml\ + using.xml\ + xml-files.xml +query_browser_IMAGES = \ + ../gui-common-cy/images/columneditor.png\ + ../gui-common-cy/images/confirmchanges.png\ + ../gui-common-cy/images/connectionerror.png\ + ../gui-common-cy/images/indexeditor.png\ + ../gui-common-cy/images/tableeditor.png\ + ../gui-common/images/options-connection.png\ + ../gui-common/images/options.png\ + ../gui-common/images/ssl-params.png\ + images/blob-buttons.png\ + images/buttonbar.png\ + images/connection.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/qb-options.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png\ + images/twosakilas.png +query_browser_SOURCES = query-browser.xml $(query_browser_INCLUDES) +query-browser-prepped.xml: $(query_browser_SOURCES) +query-browser-manprepped.xml: $(query_browser_SOURCES) +query-browser-remprepped.xml: $(query_browser_SOURCES) + +tour_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/buttonbar.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/twosakilas.png +tour_IMAGES = \ + images/buttonbar.png\ + images/file-open-script.png\ + images/mainscreen.png\ + images/querybar.png\ + images/schematabrowser.png\ + images/script-editor.png\ + images/twosakilas.png +tour_SOURCES = tour.xml $(tour_INCLUDES) +tour-prepped.xml: $(tour_SOURCES) +tour-manprepped.xml: $(tour_SOURCES) +tour-remprepped.xml: $(tour_SOURCES) + +using_INCLUDES = \ + ../gui-common/gui-common.ent\ + images/blob-buttons.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png +using_IMAGES = \ + images/blob-buttons.png\ + images/stored-procedure-database-browser.png\ + images/tabletool.png +using_SOURCES = using.xml $(using_INCLUDES) +using-prepped.xml: $(using_SOURCES) +using-manprepped.xml: $(using_SOURCES) +using-remprepped.xml: $(using_SOURCES) + +xml_files_INCLUDES = \ + ../gui-common/gui-common.ent +xml_files_IMAGES = +xml_files_SOURCES = xml-files.xml $(xml_files_INCLUDES) +xml-files-prepped.xml: $(xml_files_SOURCES) +xml-files-manprepped.xml: $(xml_files_SOURCES) +xml-files-remprepped.xml: $(xml_files_SOURCES) + Modified: trunk/refman-4.1/Makefile =================================================================== --- trunk/refman-4.1/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/refman-4.1/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 4, Lines Added: 11, Lines Deleted: 13; 5774 bytes @@ -21,7 +21,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-common ../refman-5.0 ../refman-5.1 ../internals -IDMAP_SRCS = $(MANUAL_SRCS) +IDMAP_SRCS = $(manual_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -34,18 +34,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = manual.xml -depend:: manual.depend - -MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent - -MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis-c.xml apis.xml charset.xml client-utility-programs.xml connectors.xml copyright.xml data-types.xml dynxml-generated-dba.xml dynxml-generated-functions.xml errmsgs-client.xml errmsgs-server.xml errors-problems.xml extending-mysql.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png installing.xml introduction.xml language-structure.xml legalnotice.en.xml mysql-cluster.xml news-3.23.xml news-4.0.xml news-4.1.xml news.xml optimization.xml preface.xml ../refman-common/bug-reports.xml ../refman-common/connector-j.xml ../refman-common/connector-mxj.xml ../refman-common/connector-net.xml ../refman-common/connector-odbc.xml ../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml ../refman-common/credits.xml ../refman-common! /images/cmxj-overview.png ../refman-common/images/cnet-win-install-step1.png ../refman-common/images/cnet-win-install-step2.png ../refman-common/images/cnet-win-install-step3.png ../refman-common/images/cnet-win-install-step4.png ../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png ../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png ../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png ../refman-common/images/myodbc-crystal-3.png ../refman-common/images/myodbc-crystal-4.png ../refman-common/images/myodbc-crystal-5.png ../refman-common/images/myodbc-crystal-6.png ../refman-common/images/myodbc-excel-step1.png ../refman-common/images/myodbc-excel-step2.png ../refman-common/images/myodbc-excel-step3.png ../refman-common/images/myodbc-excel-step4.png ../refman-common/images/myodbc-excel-step5.png ../refman-common/images/myodbc-link-step1.png ../refman-common/images/myodbc-link-step3.png! ../refman-common/images/myodbc-link-step4.png ../refman-commo! n/images /myodbc-link-step5.png ../refman-common/images/myodbc-macosx-install-step1.png ../refman-common/images/myodbc-macosx-install-step2.png ../refman-common/images/myodbc-macosx-install-step3.png ../refman-common/images/myodbc-macosx-install-step4.png ../refman-common/images/myodbc-macosx-install-step5.png ../refman-common/images/myodbc-macosx-install-step6.png ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/myodbc-macosx-odbcadmin-main.png ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/myodbc-win-install-step1.png ../refman-common/images/myodbc-win-install-step2.png ../refman-common/images/myodbc-win-install-step3.png ../refman-common/images/myodbc-win-install-step4.png ../refman-common/images/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/myodbc-win-odbcadmin-advanced.png ../refman-common/images/myodbc-win-odbcadmin-driverselect.png ../r! efman-common/images/myodbc-win-odbcadmin-main.png ../refman-common/images/myodbc-win-odbcadmin-options.png ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/myodbc-win-tracing.png ../refman-common/images/mysql-vstudioplugin-1.png ../refman-common/images/mysql-vstudioplugin-3.png ../refman-common/images/mysql-vstudioplugin-4.png ../refman-common/information-sources.xml ../refman-common/licenses.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-innodb.xml ../refman-common/news-myodbc.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication.xml reserved-new-4.0.xml reserved-new-4.1.xml reservedwords.xml restrictions.xml se-innodb.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml tutorial.xml using-mysql-programs.xml - -manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS) -manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS) +# TODO: FIX +manual-prepped.xml: $(IDMAP_OBJS) +manual-manprepped.xml: $(IDMAP_OBJS) # Make sure we trigger a rebuild of the dynamic tables # when validating manual.xml or requiring the DBA chapter @@ -85,6 +79,7 @@ # Need xml-html-dir for formatting the manual itself into a subdir, # but also need xml-html for formatting ReadMe.html +include $(MAKE_DIR)/xml-dynxml include $(MAKE_DIR)/xml-valid include $(MAKE_DIR)/xml-format include $(MAKE_DIR)/xml-useless @@ -108,8 +103,11 @@ include $(MAKE_DIR)/fragments include $(MAKE_DIR)/xml-depend include $(MAKE_DIR)/xml-listing -include $(MAKE_DIR)/xml-dynxml # Import directory specific extensions include ../refman-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/refman-4.1/Makefile.depends =================================================================== --- trunk/refman-4.1/Makefile.depends (rev 0) +++ trunk/refman-4.1/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 600, Lines Deleted: 0; 24732 bytes @@ -0,0 +1,600 @@ +apis_c_INCLUDES = \ + ../common/fixedchars.ent +apis_c_IMAGES = +apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES) +apis-c-prepped.xml: $(apis_c_SOURCES) +apis-c-manprepped.xml: $(apis_c_SOURCES) +apis-c-remprepped.xml: $(apis_c_SOURCES) + +apis_INCLUDES = \ + ../common/fixedchars.ent\ + apis-c.xml +apis_IMAGES = +apis_SOURCES = apis.xml $(apis_INCLUDES) +apis-prepped.xml: $(apis_SOURCES) +apis-manprepped.xml: $(apis_SOURCES) +apis-remprepped.xml: $(apis_SOURCES) + +charset_INCLUDES = \ + ../common/fixedchars.ent +charset_IMAGES = +charset_SOURCES = charset.xml $(charset_INCLUDES) +charset-prepped.xml: $(charset_SOURCES) +charset-manprepped.xml: $(charset_SOURCES) +charset-remprepped.xml: $(charset_SOURCES) + +client_utility_programs_INCLUDES = \ + ../common/fixedchars.ent +client_utility_programs_IMAGES = +client_utility_programs_SOURCES = client-utility-programs.xml $(client_utility_programs_INCLUDES) +client-utility-programs-prepped.xml: $(client_utility_programs_SOURCES) +client-utility-programs-manprepped.xml: $(client_utility_programs_SOURCES) +client-utility-programs-remprepped.xml: $(client_utility_programs_SOURCES) + +connectors_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/connector-j.xml\ + ../refman-common/connector-mxj.xml\ + ../refman-common/connector-net.xml\ + ../refman-common/connector-odbc.xml\ + ../refman-common/connector-php.xml\ + ../refman-common/connector-vstudioplugin.xml\ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png +connectors_IMAGES = \ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png +connectors_SOURCES = connectors.xml $(connectors_INCLUDES) +connectors-prepped.xml: $(connectors_SOURCES) +connectors-manprepped.xml: $(connectors_SOURCES) +connectors-remprepped.xml: $(connectors_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +data_types_INCLUDES = \ + ../common/fixedchars.ent +data_types_IMAGES = +data_types_SOURCES = data-types.xml $(data_types_INCLUDES) +data-types-prepped.xml: $(data_types_SOURCES) +data-types-manprepped.xml: $(data_types_SOURCES) +data-types-remprepped.xml: $(data_types_SOURCES) + +dba_optvars_table_INCLUDES = +dba_optvars_table_IMAGES = +dba_optvars_table_SOURCES = dba-optvars-table.xml $(dba_optvars_table_INCLUDES) +dba-optvars-table-prepped.xml: $(dba_optvars_table_SOURCES) +dba-optvars-table-manprepped.xml: $(dba_optvars_table_SOURCES) +dba-optvars-table-remprepped.xml: $(dba_optvars_table_SOURCES) + +dynxml_generated_dba_INCLUDES = \ + ../common/fixedchars.ent\ + dba-optvars-table.xml +dynxml_generated_dba_IMAGES = +dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES) +dynxml-generated-dba-prepped.xml: $(dynxml_generated_dba_SOURCES) +dynxml-generated-dba-manprepped.xml: $(dynxml_generated_dba_SOURCES) +dynxml-generated-dba-remprepped.xml: $(dynxml_generated_dba_SOURCES) + +dynxml_generated_functions_INCLUDES = \ + ../common/fixedchars.ent +dynxml_generated_functions_IMAGES = +dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml $(dynxml_generated_functions_INCLUDES) +dynxml-generated-functions-prepped.xml: $(dynxml_generated_functions_SOURCES) +dynxml-generated-functions-manprepped.xml: $(dynxml_generated_functions_SOURCES) +dynxml-generated-functions-remprepped.xml: $(dynxml_generated_functions_SOURCES) + +errmsgs_client_INCLUDES = +errmsgs_client_IMAGES = +errmsgs_client_SOURCES = errmsgs-client.xml $(errmsgs_client_INCLUDES) +errmsgs-client-prepped.xml: $(errmsgs_client_SOURCES) +errmsgs-client-manprepped.xml: $(errmsgs_client_SOURCES) +errmsgs-client-remprepped.xml: $(errmsgs_client_SOURCES) + +errmsgs_server_INCLUDES = +errmsgs_server_IMAGES = +errmsgs_server_SOURCES = errmsgs-server.xml $(errmsgs_server_INCLUDES) +errmsgs-server-prepped.xml: $(errmsgs_server_SOURCES) +errmsgs-server-manprepped.xml: $(errmsgs_server_SOURCES) +errmsgs-server-remprepped.xml: $(errmsgs_server_SOURCES) + +errors_problems_INCLUDES = \ + ../common/fixedchars.ent\ + errmsgs-client.xml\ + errmsgs-server.xml +errors_problems_IMAGES = +errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES) +errors-problems-prepped.xml: $(errors_problems_SOURCES) +errors-problems-manprepped.xml: $(errors_problems_SOURCES) +errors-problems-remprepped.xml: $(errors_problems_SOURCES) + +extending_mysql_INCLUDES = \ + ../common/fixedchars.ent +extending_mysql_IMAGES = +extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES) +extending-mysql-prepped.xml: $(extending_mysql_SOURCES) +extending-mysql-manprepped.xml: $(extending_mysql_SOURCES) +extending-mysql-remprepped.xml: $(extending_mysql_SOURCES) + +installing_INCLUDES = \ + ../common/fixedchars.ent +installing_IMAGES = +installing_SOURCES = installing.xml $(installing_INCLUDES) +installing-prepped.xml: $(installing_SOURCES) +installing-manprepped.xml: $(installing_SOURCES) +installing-remprepped.xml: $(installing_SOURCES) + +introduction_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/bug-reports.xml\ + ../refman-common/information-sources.xml\ + ../refman-common/manual-conventions.en.xml\ + ../refman-common/maxdb.en.xml\ + ../refman-common/what-is-mysql-ab.en.xml\ + ../refman-common/what-is.en.xml +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +language_structure_INCLUDES = \ + ../common/fixedchars.ent\ + reserved-new-4.0.xml\ + reserved-new-4.1.xml\ + reservedwords.xml +language_structure_IMAGES = +language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES) +language-structure-prepped.xml: $(language_structure_SOURCES) +language-structure-manprepped.xml: $(language_structure_SOURCES) +language-structure-remprepped.xml: $(language_structure_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +manual_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/bug-reports.xml\ + ../refman-common/connector-j.xml\ + ../refman-common/connector-mxj.xml\ + ../refman-common/connector-net.xml\ + ../refman-common/connector-odbc.xml\ + ../refman-common/connector-php.xml\ + ../refman-common/connector-vstudioplugin.xml\ + ../refman-common/credits.xml\ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png\ + ../refman-common/information-sources.xml\ + ../refman-common/licenses.xml\ + ../refman-common/manual-conventions.en.xml\ + ../refman-common/maxdb.en.xml\ + ../refman-common/news-cluster.xml\ + ../refman-common/news-connector-j.xml\ + ../refman-common/news-connector-net.xml\ + ../refman-common/news-innodb.xml\ + ../refman-common/news-myodbc.xml\ + ../refman-common/what-is-mysql-ab.en.xml\ + ../refman-common/what-is.en.xml\ + apis-c.xml\ + apis.xml\ + charset.xml\ + client-utility-programs.xml\ + connectors.xml\ + copyright.xml\ + data-types.xml\ + dba-optvars-table.xml\ + dynxml-generated-dba.xml\ + dynxml-generated-functions.xml\ + errmsgs-client.xml\ + errmsgs-server.xml\ + errors-problems.xml\ + extending-mysql.xml\ + images/blackhole-1.png\ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png\ + installing.xml\ + introduction.xml\ + language-structure.xml\ + legalnotice.en.xml\ + mysql-cluster.xml\ + news-3.23.xml\ + news-4.0.xml\ + news-4.1.xml\ + news.xml\ + optimization.xml\ + preface.xml\ + replication.xml\ + reserved-new-4.0.xml\ + reserved-new-4.1.xml\ + reservedwords.xml\ + restrictions.xml\ + se-innodb.xml\ + spatial-extensions.xml\ + sql-syntax.xml\ + storage-engines.xml\ + tutorial.xml\ + using-mysql-programs.xml +manual_IMAGES = \ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png\ + images/blackhole-1.png\ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +manual_SOURCES = manual.xml $(manual_INCLUDES) +manual-prepped.xml: $(manual_SOURCES) +manual-manprepped.xml: $(manual_SOURCES) +manual-remprepped.xml: $(manual_SOURCES) + +mysql_cluster_INCLUDES = \ + ../common/fixedchars.ent\ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +mysql_cluster_IMAGES = \ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES) +mysql-cluster-prepped.xml: $(mysql_cluster_SOURCES) +mysql-cluster-manprepped.xml: $(mysql_cluster_SOURCES) +mysql-cluster-remprepped.xml: $(mysql_cluster_SOURCES) + +news_3.23_INCLUDES = \ + ../common/fixedchars.ent +news_3.23_IMAGES = +news_3.23_SOURCES = news-3.23.xml $(news_3.23_INCLUDES) +news-3.23-prepped.xml: $(news_3.23_SOURCES) +news-3.23-manprepped.xml: $(news_3.23_SOURCES) +news-3.23-remprepped.xml: $(news_3.23_SOURCES) + +news_4.0_INCLUDES = \ + ../common/fixedchars.ent +news_4.0_IMAGES = +news_4.0_SOURCES = news-4.0.xml $(news_4.0_INCLUDES) +news-4.0-prepped.xml: $(news_4.0_SOURCES) +news-4.0-manprepped.xml: $(news_4.0_SOURCES) +news-4.0-remprepped.xml: $(news_4.0_SOURCES) + +news_4.1_INCLUDES = \ + ../common/fixedchars.ent +news_4.1_IMAGES = +news_4.1_SOURCES = news-4.1.xml $(news_4.1_INCLUDES) +news-4.1-prepped.xml: $(news_4.1_SOURCES) +news-4.1-manprepped.xml: $(news_4.1_SOURCES) +news-4.1-remprepped.xml: $(news_4.1_SOURCES) + +news_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/news-cluster.xml\ + ../refman-common/news-connector-j.xml\ + ../refman-common/news-connector-net.xml\ + ../refman-common/news-innodb.xml\ + ../refman-common/news-myodbc.xml\ + news-3.23.xml\ + news-4.0.xml\ + news-4.1.xml +news_IMAGES = +news_SOURCES = news.xml $(news_INCLUDES) +news-prepped.xml: $(news_SOURCES) +news-manprepped.xml: $(news_SOURCES) +news-remprepped.xml: $(news_SOURCES) + +optimization_INCLUDES = \ + ../common/fixedchars.ent +optimization_IMAGES = +optimization_SOURCES = optimization.xml $(optimization_INCLUDES) +optimization-prepped.xml: $(optimization_SOURCES) +optimization-manprepped.xml: $(optimization_SOURCES) +optimization-remprepped.xml: $(optimization_SOURCES) + +preface_INCLUDES = \ + ../common/fixedchars.ent +preface_IMAGES = +preface_SOURCES = preface.xml $(preface_INCLUDES) +preface-prepped.xml: $(preface_SOURCES) +preface-manprepped.xml: $(preface_SOURCES) +preface-remprepped.xml: $(preface_SOURCES) + +replication_INCLUDES = \ + ../common/fixedchars.ent +replication_IMAGES = +replication_SOURCES = replication.xml $(replication_INCLUDES) +replication-prepped.xml: $(replication_SOURCES) +replication-manprepped.xml: $(replication_SOURCES) +replication-remprepped.xml: $(replication_SOURCES) + +reserved_new_4.0_INCLUDES = +reserved_new_4.0_IMAGES = +reserved_new_4.0_SOURCES = reserved-new-4.0.xml $(reserved_new_4.0_INCLUDES) +reserved-new-4.0-prepped.xml: $(reserved_new_4.0_SOURCES) +reserved-new-4.0-manprepped.xml: $(reserved_new_4.0_SOURCES) +reserved-new-4.0-remprepped.xml: $(reserved_new_4.0_SOURCES) + +reserved_new_4.1_INCLUDES = +reserved_new_4.1_IMAGES = +reserved_new_4.1_SOURCES = reserved-new-4.1.xml $(reserved_new_4.1_INCLUDES) +reserved-new-4.1-prepped.xml: $(reserved_new_4.1_SOURCES) +reserved-new-4.1-manprepped.xml: $(reserved_new_4.1_SOURCES) +reserved-new-4.1-remprepped.xml: $(reserved_new_4.1_SOURCES) + +reservedwords_INCLUDES = +reservedwords_IMAGES = +reservedwords_SOURCES = reservedwords.xml $(reservedwords_INCLUDES) +reservedwords-prepped.xml: $(reservedwords_SOURCES) +reservedwords-manprepped.xml: $(reservedwords_SOURCES) +reservedwords-remprepped.xml: $(reservedwords_SOURCES) + +restrictions_INCLUDES = \ + ../common/fixedchars.ent +restrictions_IMAGES = +restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES) +restrictions-prepped.xml: $(restrictions_SOURCES) +restrictions-manprepped.xml: $(restrictions_SOURCES) +restrictions-remprepped.xml: $(restrictions_SOURCES) + +se_innodb_INCLUDES = \ + ../common/fixedchars.ent +se_innodb_IMAGES = +se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES) +se-innodb-prepped.xml: $(se_innodb_SOURCES) +se-innodb-manprepped.xml: $(se_innodb_SOURCES) +se-innodb-remprepped.xml: $(se_innodb_SOURCES) + +spatial_extensions_INCLUDES = \ + ../common/fixedchars.ent +spatial_extensions_IMAGES = +spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES) +spatial-extensions-prepped.xml: $(spatial_extensions_SOURCES) +spatial-extensions-manprepped.xml: $(spatial_extensions_SOURCES) +spatial-extensions-remprepped.xml: $(spatial_extensions_SOURCES) + +sql_syntax_INCLUDES = \ + ../common/fixedchars.ent +sql_syntax_IMAGES = +sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES) +sql-syntax-prepped.xml: $(sql_syntax_SOURCES) +sql-syntax-manprepped.xml: $(sql_syntax_SOURCES) +sql-syntax-remprepped.xml: $(sql_syntax_SOURCES) + +storage_engines_INCLUDES = \ + ../common/fixedchars.ent\ + images/blackhole-1.png\ + se-innodb.xml +storage_engines_IMAGES = \ + images/blackhole-1.png +storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES) +storage-engines-prepped.xml: $(storage_engines_SOURCES) +storage-engines-manprepped.xml: $(storage_engines_SOURCES) +storage-engines-remprepped.xml: $(storage_engines_SOURCES) + +tutorial_INCLUDES = \ + ../common/fixedchars.ent +tutorial_IMAGES = +tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES) +tutorial-prepped.xml: $(tutorial_SOURCES) +tutorial-manprepped.xml: $(tutorial_SOURCES) +tutorial-remprepped.xml: $(tutorial_SOURCES) + +using_mysql_programs_INCLUDES = \ + ../common/fixedchars.ent +using_mysql_programs_IMAGES = +using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES) +using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) +using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) +using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) + Modified: trunk/refman-5.0/Makefile =================================================================== --- trunk/refman-5.0/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/refman-5.0/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 10, Lines Deleted: 12; 6716 bytes @@ -23,7 +23,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-common ../refman-4.1 ../refman-5.1 ../ndbapi ../internals -IDMAP_SRCS = $(MANUAL_SRCS) $(wildcard ../refman-common/*.xml) +IDMAP_SRCS = $(manual_SOURCES) $(wildcard ../refman-common/*.xml) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -36,18 +36,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = manual.xml -depend:: manual.depend - -MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent - -MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis-c.xml apis.xml charset.xml client-utility-programs.xml config-wizard.xml connectors.xml copyright.xml data-types.xml dba-optvars-table.xml dynxml-generated-dba.xml dynxml-generated-functions.xml errmsgs-client.xml errmsgs-server.xml errors-problems.xml extending-mysql.xml faqs.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png images/mysql-cfg-fig10.png images/mysql-cfg-fig1.png images/mysql-cfg-fig2.png images/mysql-cfg-fig3.png images/mysql-cfg-fig4.png images/mysql-cfg-fig5.png images/mysql-cfg-fig6.png images/mysql-cfg-fig7.png images/mysql-cfg-fig8.png images/mysql-cfg-fig9.png images/mysql-esi-merlin-10.png images/mysql-esi-merlin-11.png images/mysql-esi-merlin-12.png images/mysql-esi-merlin-13.png images/mysql-esi-merlin-1.png images/mysql-esi-merlin-2.png images/mysql-esi-merlin-3.png images/mysql-esi-merlin-4.png images/mysql-esi-merlin-5.pn! g images/mysql-esi-merlin-6.png images/mysql-esi-merlin-7.png images/mysql-esi-merlin-8.png images/mysql-esi-merlin-9.png images/mysql-esi-win32-fig1.png images/mysql-esi-win32-fig2.png images/mysql-esi-win32-fig3.png images/mysql-esi-win32-fig4.png images/mysql-esi-win32-fig6.png images/mysql-esi-win32-fig7.png images/mysql-esi-win32-uninst.png images/ndb-size-pl-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png information-schema.xml installing-cs.xml installing-es.xml installing-version.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml mysql-cluster.xml news-5.0.xml news.xml optimization.xml precision-math.xml preface.xml ../refman-common/bug-reports.xml ../refman-common/connector-j.xml ../refman-common/connector-mxj.xml ../refman-common/connector-net.xml ../refman-common/connector-odbc.xml ../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml ../refman-common/credits.xml ! ../refman-common/images/cmxj-overview.png ../refman-common/ima! ges/cnet -win-install-step1.png ../refman-common/images/cnet-win-install-step2.png ../refman-common/images/cnet-win-install-step3.png ../refman-common/images/cnet-win-install-step4.png ../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png ../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png ../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png ../refman-common/images/myodbc-crystal-3.png ../refman-common/images/myodbc-crystal-4.png ../refman-common/images/myodbc-crystal-5.png ../refman-common/images/myodbc-crystal-6.png ../refman-common/images/myodbc-excel-step1.png ../refman-common/images/myodbc-excel-step2.png ../refman-common/images/myodbc-excel-step3.png ../refman-common/images/myodbc-excel-step4.png ../refman-common/images/myodbc-excel-step5.png ../refman-common/images/myodbc-link-step1.png ../refman-common/images/myodbc-link-step3.png ../refman-common/images/myodbc-link-step4.png ../refma! n-common/images/myodbc-link-step5.png ../refman-common/images/myodbc-macosx-install-step1.png ../refman-common/images/myodbc-macosx-install-step2.png ../refman-common/images/myodbc-macosx-install-step3.png ../refman-common/images/myodbc-macosx-install-step4.png ../refman-common/images/myodbc-macosx-install-step5.png ../refman-common/images/myodbc-macosx-install-step6.png ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/myodbc-macosx-odbcadmin-main.png ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/myodbc-win-install-step1.png ../refman-common/images/myodbc-win-install-step2.png ../refman-common/images/myodbc-win-install-step3.png ../refman-common/images/myodbc-win-install-step4.png ../refman-common/images/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/myodbc-win-odbcadmin-advanced.png ../refman-common/images/myodbc-win-odbcadmin-drive! rselect.png ../refman-common/images/myodbc-win-odbcadmin-main.! png ../r efman-common/images/myodbc-win-odbcadmin-options.png ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/myodbc-win-tracing.png ../refman-common/images/mysql-vstudioplugin-1.png ../refman-common/images/mysql-vstudioplugin-3.png ../refman-common/images/mysql-vstudioplugin-4.png ../refman-common/information-sources.xml ../refman-common/licenses.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/news-cluster.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-common/news-vstudioplugin.xml ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml releasenotes-cs-5.0.xml releasenotes-cs.xml releasenotes-es-5.0.xml releasenotes-es.xml replication.xml reserved-new-5.0.xml reservedwords.xml restrictions.xml se-archive.xml se-bdb.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-innodb.xml se-memory.xml se-m! erge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml - -manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS) -manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS) +# TODO: FIX +manual-prepped.xml: $(IDMAP_OBJS) +manual-manprepped.xml: $(IDMAP_OBJS) # Make sure we trigger a rebuild of the dynamic tables # when validating manual.xml or requiring the DBA chapter @@ -115,3 +109,7 @@ # Import directory specific extensions include ../refman-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/refman-5.0/Makefile.depends =================================================================== --- trunk/refman-5.0/Makefile.depends (rev 0) +++ trunk/refman-5.0/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 996, Lines Deleted: 0; 37584 bytes @@ -0,0 +1,996 @@ +apis_c_INCLUDES = \ + ../common/fixedchars.ent +apis_c_IMAGES = +apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES) +apis-c-prepped.xml: $(apis_c_SOURCES) +apis-c-manprepped.xml: $(apis_c_SOURCES) +apis-c-remprepped.xml: $(apis_c_SOURCES) + +apis_INCLUDES = \ + ../common/fixedchars.ent\ + apis-c.xml +apis_IMAGES = +apis_SOURCES = apis.xml $(apis_INCLUDES) +apis-prepped.xml: $(apis_SOURCES) +apis-manprepped.xml: $(apis_SOURCES) +apis-remprepped.xml: $(apis_SOURCES) + +charset_INCLUDES = \ + ../common/fixedchars.ent +charset_IMAGES = +charset_SOURCES = charset.xml $(charset_INCLUDES) +charset-prepped.xml: $(charset_SOURCES) +charset-manprepped.xml: $(charset_SOURCES) +charset-remprepped.xml: $(charset_SOURCES) + +client_utility_programs_INCLUDES = \ + ../common/fixedchars.ent +client_utility_programs_IMAGES = +client_utility_programs_SOURCES = client-utility-programs.xml $(client_utility_programs_INCLUDES) +client-utility-programs-prepped.xml: $(client_utility_programs_SOURCES) +client-utility-programs-manprepped.xml: $(client_utility_programs_SOURCES) +client-utility-programs-remprepped.xml: $(client_utility_programs_SOURCES) + +config_wizard_INCLUDES = \ + ../common/fixedchars.ent\ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png +config_wizard_IMAGES = \ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png +config_wizard_SOURCES = config-wizard.xml $(config_wizard_INCLUDES) +config-wizard-prepped.xml: $(config_wizard_SOURCES) +config-wizard-manprepped.xml: $(config_wizard_SOURCES) +config-wizard-remprepped.xml: $(config_wizard_SOURCES) + +connectors_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/connector-j.xml\ + ../refman-common/connector-mxj.xml\ + ../refman-common/connector-net.xml\ + ../refman-common/connector-odbc.xml\ + ../refman-common/connector-php.xml\ + ../refman-common/connector-vstudioplugin.xml\ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png +connectors_IMAGES = \ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png +connectors_SOURCES = connectors.xml $(connectors_INCLUDES) +connectors-prepped.xml: $(connectors_SOURCES) +connectors-manprepped.xml: $(connectors_SOURCES) +connectors-remprepped.xml: $(connectors_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +data_types_INCLUDES = \ + ../common/fixedchars.ent +data_types_IMAGES = +data_types_SOURCES = data-types.xml $(data_types_INCLUDES) +data-types-prepped.xml: $(data_types_SOURCES) +data-types-manprepped.xml: $(data_types_SOURCES) +data-types-remprepped.xml: $(data_types_SOURCES) + +dba_optvars_table_INCLUDES = +dba_optvars_table_IMAGES = +dba_optvars_table_SOURCES = dba-optvars-table.xml $(dba_optvars_table_INCLUDES) +dba-optvars-table-prepped.xml: $(dba_optvars_table_SOURCES) +dba-optvars-table-manprepped.xml: $(dba_optvars_table_SOURCES) +dba-optvars-table-remprepped.xml: $(dba_optvars_table_SOURCES) + +dynxml_generated_dba_INCLUDES = \ + ../common/fixedchars.ent\ + dba-optvars-table.xml +dynxml_generated_dba_IMAGES = +dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES) +dynxml-generated-dba-prepped.xml: $(dynxml_generated_dba_SOURCES) +dynxml-generated-dba-manprepped.xml: $(dynxml_generated_dba_SOURCES) +dynxml-generated-dba-remprepped.xml: $(dynxml_generated_dba_SOURCES) + +dynxml_generated_functions_INCLUDES = \ + ../common/fixedchars.ent +dynxml_generated_functions_IMAGES = +dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml $(dynxml_generated_functions_INCLUDES) +dynxml-generated-functions-prepped.xml: $(dynxml_generated_functions_SOURCES) +dynxml-generated-functions-manprepped.xml: $(dynxml_generated_functions_SOURCES) +dynxml-generated-functions-remprepped.xml: $(dynxml_generated_functions_SOURCES) + +errmsgs_client_INCLUDES = +errmsgs_client_IMAGES = +errmsgs_client_SOURCES = errmsgs-client.xml $(errmsgs_client_INCLUDES) +errmsgs-client-prepped.xml: $(errmsgs_client_SOURCES) +errmsgs-client-manprepped.xml: $(errmsgs_client_SOURCES) +errmsgs-client-remprepped.xml: $(errmsgs_client_SOURCES) + +errmsgs_server_INCLUDES = +errmsgs_server_IMAGES = +errmsgs_server_SOURCES = errmsgs-server.xml $(errmsgs_server_INCLUDES) +errmsgs-server-prepped.xml: $(errmsgs_server_SOURCES) +errmsgs-server-manprepped.xml: $(errmsgs_server_SOURCES) +errmsgs-server-remprepped.xml: $(errmsgs_server_SOURCES) + +errors_problems_INCLUDES = \ + ../common/fixedchars.ent\ + errmsgs-client.xml\ + errmsgs-server.xml +errors_problems_IMAGES = +errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES) +errors-problems-prepped.xml: $(errors_problems_SOURCES) +errors-problems-manprepped.xml: $(errors_problems_SOURCES) +errors-problems-remprepped.xml: $(errors_problems_SOURCES) + +extending_mysql_INCLUDES = \ + ../common/fixedchars.ent +extending_mysql_IMAGES = +extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES) +extending-mysql-prepped.xml: $(extending_mysql_SOURCES) +extending-mysql-manprepped.xml: $(extending_mysql_SOURCES) +extending-mysql-remprepped.xml: $(extending_mysql_SOURCES) + +faqs_INCLUDES = \ + ../common/fixedchars.ent +faqs_IMAGES = +faqs_SOURCES = faqs.xml $(faqs_INCLUDES) +faqs-prepped.xml: $(faqs_SOURCES) +faqs-manprepped.xml: $(faqs_SOURCES) +faqs-remprepped.xml: $(faqs_SOURCES) + +information_schema_INCLUDES = \ + ../common/fixedchars.ent +information_schema_IMAGES = +information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES) +information-schema-prepped.xml: $(information_schema_SOURCES) +information-schema-manprepped.xml: $(information_schema_SOURCES) +information-schema-remprepped.xml: $(information_schema_SOURCES) + +installing_cs_INCLUDES = \ + ../common/fixedchars.ent +installing_cs_IMAGES = +installing_cs_SOURCES = installing-cs.xml $(installing_cs_INCLUDES) +installing-cs-prepped.xml: $(installing_cs_SOURCES) +installing-cs-manprepped.xml: $(installing_cs_SOURCES) +installing-cs-remprepped.xml: $(installing_cs_SOURCES) + +installing_es_INCLUDES = \ + ../common/fixedchars.ent\ + config-wizard.xml\ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png\ + images/mysql-esi-merlin-1.png\ + images/mysql-esi-merlin-10.png\ + images/mysql-esi-merlin-11.png\ + images/mysql-esi-merlin-12.png\ + images/mysql-esi-merlin-13.png\ + images/mysql-esi-merlin-2.png\ + images/mysql-esi-merlin-3.png\ + images/mysql-esi-merlin-4.png\ + images/mysql-esi-merlin-5.png\ + images/mysql-esi-merlin-6.png\ + images/mysql-esi-merlin-7.png\ + images/mysql-esi-merlin-8.png\ + images/mysql-esi-merlin-9.png\ + images/mysql-esi-win32-fig1.png\ + images/mysql-esi-win32-fig2.png\ + images/mysql-esi-win32-fig3.png\ + images/mysql-esi-win32-fig4.png\ + images/mysql-esi-win32-fig6.png\ + images/mysql-esi-win32-fig7.png\ + images/mysql-esi-win32-uninst.png +installing_es_IMAGES = \ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png\ + images/mysql-esi-merlin-1.png\ + images/mysql-esi-merlin-10.png\ + images/mysql-esi-merlin-11.png\ + images/mysql-esi-merlin-12.png\ + images/mysql-esi-merlin-13.png\ + images/mysql-esi-merlin-2.png\ + images/mysql-esi-merlin-3.png\ + images/mysql-esi-merlin-4.png\ + images/mysql-esi-merlin-5.png\ + images/mysql-esi-merlin-6.png\ + images/mysql-esi-merlin-7.png\ + images/mysql-esi-merlin-8.png\ + images/mysql-esi-merlin-9.png\ + images/mysql-esi-win32-fig1.png\ + images/mysql-esi-win32-fig2.png\ + images/mysql-esi-win32-fig3.png\ + images/mysql-esi-win32-fig4.png\ + images/mysql-esi-win32-fig6.png\ + images/mysql-esi-win32-fig7.png\ + images/mysql-esi-win32-uninst.png +installing_es_SOURCES = installing-es.xml $(installing_es_INCLUDES) +installing-es-prepped.xml: $(installing_es_SOURCES) +installing-es-manprepped.xml: $(installing_es_SOURCES) +installing-es-remprepped.xml: $(installing_es_SOURCES) + +installing_version_INCLUDES = \ + ../common/fixedchars.ent +installing_version_IMAGES = +installing_version_SOURCES = installing-version.xml $(installing_version_INCLUDES) +installing-version-prepped.xml: $(installing_version_SOURCES) +installing-version-manprepped.xml: $(installing_version_SOURCES) +installing-version-remprepped.xml: $(installing_version_SOURCES) + +installing_INCLUDES = \ + ../common/fixedchars.ent\ + config-wizard.xml\ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png\ + images/mysql-esi-merlin-1.png\ + images/mysql-esi-merlin-10.png\ + images/mysql-esi-merlin-11.png\ + images/mysql-esi-merlin-12.png\ + images/mysql-esi-merlin-13.png\ + images/mysql-esi-merlin-2.png\ + images/mysql-esi-merlin-3.png\ + images/mysql-esi-merlin-4.png\ + images/mysql-esi-merlin-5.png\ + images/mysql-esi-merlin-6.png\ + images/mysql-esi-merlin-7.png\ + images/mysql-esi-merlin-8.png\ + images/mysql-esi-merlin-9.png\ + images/mysql-esi-win32-fig1.png\ + images/mysql-esi-win32-fig2.png\ + images/mysql-esi-win32-fig3.png\ + images/mysql-esi-win32-fig4.png\ + images/mysql-esi-win32-fig6.png\ + images/mysql-esi-win32-fig7.png\ + images/mysql-esi-win32-uninst.png\ + installing-cs.xml\ + installing-es.xml\ + installing-version.xml +installing_IMAGES = \ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png\ + images/mysql-esi-merlin-1.png\ + images/mysql-esi-merlin-10.png\ + images/mysql-esi-merlin-11.png\ + images/mysql-esi-merlin-12.png\ + images/mysql-esi-merlin-13.png\ + images/mysql-esi-merlin-2.png\ + images/mysql-esi-merlin-3.png\ + images/mysql-esi-merlin-4.png\ + images/mysql-esi-merlin-5.png\ + images/mysql-esi-merlin-6.png\ + images/mysql-esi-merlin-7.png\ + images/mysql-esi-merlin-8.png\ + images/mysql-esi-merlin-9.png\ + images/mysql-esi-win32-fig1.png\ + images/mysql-esi-win32-fig2.png\ + images/mysql-esi-win32-fig3.png\ + images/mysql-esi-win32-fig4.png\ + images/mysql-esi-win32-fig6.png\ + images/mysql-esi-win32-fig7.png\ + images/mysql-esi-win32-uninst.png +installing_SOURCES = installing.xml $(installing_INCLUDES) +installing-prepped.xml: $(installing_SOURCES) +installing-manprepped.xml: $(installing_SOURCES) +installing-remprepped.xml: $(installing_SOURCES) + +introduction_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/bug-reports.xml\ + ../refman-common/information-sources.xml\ + ../refman-common/manual-conventions.en.xml\ + ../refman-common/maxdb.en.xml\ + ../refman-common/what-is-mysql-ab.en.xml\ + ../refman-common/what-is.en.xml +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +language_structure_INCLUDES = \ + ../common/fixedchars.ent\ + reserved-new-5.0.xml\ + reservedwords.xml +language_structure_IMAGES = +language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES) +language-structure-prepped.xml: $(language_structure_SOURCES) +language-structure-manprepped.xml: $(language_structure_SOURCES) +language-structure-remprepped.xml: $(language_structure_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +manual_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/bug-reports.xml\ + ../refman-common/connector-j.xml\ + ../refman-common/connector-mxj.xml\ + ../refman-common/connector-net.xml\ + ../refman-common/connector-odbc.xml\ + ../refman-common/connector-php.xml\ + ../refman-common/connector-vstudioplugin.xml\ + ../refman-common/credits.xml\ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png\ + ../refman-common/information-sources.xml\ + ../refman-common/licenses.xml\ + ../refman-common/manual-conventions.en.xml\ + ../refman-common/maxdb.en.xml\ + ../refman-common/news-cluster.xml\ + ../refman-common/news-connector-j.xml\ + ../refman-common/news-connector-net.xml\ + ../refman-common/news-myodbc.xml\ + ../refman-common/news-vstudioplugin.xml\ + ../refman-common/what-is-mysql-ab.en.xml\ + ../refman-common/what-is.en.xml\ + apis-c.xml\ + apis.xml\ + charset.xml\ + client-utility-programs.xml\ + config-wizard.xml\ + connectors.xml\ + copyright.xml\ + data-types.xml\ + dba-optvars-table.xml\ + dynxml-generated-dba.xml\ + dynxml-generated-functions.xml\ + errmsgs-client.xml\ + errmsgs-server.xml\ + errors-problems.xml\ + extending-mysql.xml\ + faqs.xml\ + images/blackhole-1.png\ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png\ + images/mysql-esi-merlin-1.png\ + images/mysql-esi-merlin-10.png\ + images/mysql-esi-merlin-11.png\ + images/mysql-esi-merlin-12.png\ + images/mysql-esi-merlin-13.png\ + images/mysql-esi-merlin-2.png\ + images/mysql-esi-merlin-3.png\ + images/mysql-esi-merlin-4.png\ + images/mysql-esi-merlin-5.png\ + images/mysql-esi-merlin-6.png\ + images/mysql-esi-merlin-7.png\ + images/mysql-esi-merlin-8.png\ + images/mysql-esi-merlin-9.png\ + images/mysql-esi-win32-fig1.png\ + images/mysql-esi-win32-fig2.png\ + images/mysql-esi-win32-fig3.png\ + images/mysql-esi-win32-fig4.png\ + images/mysql-esi-win32-fig6.png\ + images/mysql-esi-win32-fig7.png\ + images/mysql-esi-win32-uninst.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png\ + information-schema.xml\ + installing-cs.xml\ + installing-es.xml\ + installing-version.xml\ + installing.xml\ + introduction.xml\ + language-structure.xml\ + legalnotice.en.xml\ + mysql-cluster.xml\ + news-5.0.xml\ + news.xml\ + optimization.xml\ + precision-math.xml\ + preface.xml\ + releasenotes-cs-5.0.xml\ + releasenotes-cs.xml\ + releasenotes-es-5.0.xml\ + releasenotes-es.xml\ + replication.xml\ + reserved-new-5.0.xml\ + reservedwords.xml\ + restrictions.xml\ + se-archive.xml\ + se-bdb.xml\ + se-blackhole.xml\ + se-csv.xml\ + se-example.xml\ + se-federated.xml\ + se-innodb.xml\ + se-memory.xml\ + se-merge.xml\ + se-myisam.xml\ + spatial-extensions.xml\ + sql-syntax.xml\ + storage-engines.xml\ + stored-procedures.xml\ + triggers.xml\ + tutorial.xml\ + using-mysql-programs.xml\ + views.xml +manual_IMAGES = \ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png\ + images/blackhole-1.png\ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/mysql-cfg-fig1.png\ + images/mysql-cfg-fig10.png\ + images/mysql-cfg-fig2.png\ + images/mysql-cfg-fig3.png\ + images/mysql-cfg-fig4.png\ + images/mysql-cfg-fig5.png\ + images/mysql-cfg-fig6.png\ + images/mysql-cfg-fig7.png\ + images/mysql-cfg-fig8.png\ + images/mysql-cfg-fig9.png\ + images/mysql-esi-merlin-1.png\ + images/mysql-esi-merlin-10.png\ + images/mysql-esi-merlin-11.png\ + images/mysql-esi-merlin-12.png\ + images/mysql-esi-merlin-13.png\ + images/mysql-esi-merlin-2.png\ + images/mysql-esi-merlin-3.png\ + images/mysql-esi-merlin-4.png\ + images/mysql-esi-merlin-5.png\ + images/mysql-esi-merlin-6.png\ + images/mysql-esi-merlin-7.png\ + images/mysql-esi-merlin-8.png\ + images/mysql-esi-merlin-9.png\ + images/mysql-esi-win32-fig1.png\ + images/mysql-esi-win32-fig2.png\ + images/mysql-esi-win32-fig3.png\ + images/mysql-esi-win32-fig4.png\ + images/mysql-esi-win32-fig6.png\ + images/mysql-esi-win32-fig7.png\ + images/mysql-esi-win32-uninst.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +manual_SOURCES = manual.xml $(manual_INCLUDES) +manual-prepped.xml: $(manual_SOURCES) +manual-manprepped.xml: $(manual_SOURCES) +manual-remprepped.xml: $(manual_SOURCES) + +mysql_cluster_INCLUDES = \ + ../common/fixedchars.ent\ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +mysql_cluster_IMAGES = \ + images/cluster-components-1.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES) +mysql-cluster-prepped.xml: $(mysql_cluster_SOURCES) +mysql-cluster-manprepped.xml: $(mysql_cluster_SOURCES) +mysql-cluster-remprepped.xml: $(mysql_cluster_SOURCES) + +news_5.0_INCLUDES = \ + ../common/fixedchars.ent +news_5.0_IMAGES = +news_5.0_SOURCES = news-5.0.xml $(news_5.0_INCLUDES) +news-5.0-prepped.xml: $(news_5.0_SOURCES) +news-5.0-manprepped.xml: $(news_5.0_SOURCES) +news-5.0-remprepped.xml: $(news_5.0_SOURCES) + +news_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/news-cluster.xml\ + ../refman-common/news-connector-j.xml\ + ../refman-common/news-connector-net.xml\ + ../refman-common/news-myodbc.xml\ + ../refman-common/news-vstudioplugin.xml\ + news-5.0.xml +news_IMAGES = +news_SOURCES = news.xml $(news_INCLUDES) +news-prepped.xml: $(news_SOURCES) +news-manprepped.xml: $(news_SOURCES) +news-remprepped.xml: $(news_SOURCES) + +optimization_INCLUDES = \ + ../common/fixedchars.ent +optimization_IMAGES = +optimization_SOURCES = optimization.xml $(optimization_INCLUDES) +optimization-prepped.xml: $(optimization_SOURCES) +optimization-manprepped.xml: $(optimization_SOURCES) +optimization-remprepped.xml: $(optimization_SOURCES) + +precision_math_INCLUDES = \ + ../common/fixedchars.ent +precision_math_IMAGES = +precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES) +precision-math-prepped.xml: $(precision_math_SOURCES) +precision-math-manprepped.xml: $(precision_math_SOURCES) +precision-math-remprepped.xml: $(precision_math_SOURCES) + +preface_INCLUDES = \ + ../common/fixedchars.ent +preface_IMAGES = +preface_SOURCES = preface.xml $(preface_INCLUDES) +preface-prepped.xml: $(preface_SOURCES) +preface-manprepped.xml: $(preface_SOURCES) +preface-remprepped.xml: $(preface_SOURCES) + +releasenotes_cs_5.0_INCLUDES = \ + ../common/fixedchars.ent +releasenotes_cs_5.0_IMAGES = +releasenotes_cs_5.0_SOURCES = releasenotes-cs-5.0.xml $(releasenotes_cs_5.0_INCLUDES) +releasenotes-cs-5.0-prepped.xml: $(releasenotes_cs_5.0_SOURCES) +releasenotes-cs-5.0-manprepped.xml: $(releasenotes_cs_5.0_SOURCES) +releasenotes-cs-5.0-remprepped.xml: $(releasenotes_cs_5.0_SOURCES) + +releasenotes_cs_INCLUDES = \ + ../common/fixedchars.ent\ + releasenotes-cs-5.0.xml +releasenotes_cs_IMAGES = +releasenotes_cs_SOURCES = releasenotes-cs.xml $(releasenotes_cs_INCLUDES) +releasenotes-cs-prepped.xml: $(releasenotes_cs_SOURCES) +releasenotes-cs-manprepped.xml: $(releasenotes_cs_SOURCES) +releasenotes-cs-remprepped.xml: $(releasenotes_cs_SOURCES) + +releasenotes_es_5.0_INCLUDES = \ + ../common/fixedchars.ent +releasenotes_es_5.0_IMAGES = +releasenotes_es_5.0_SOURCES = releasenotes-es-5.0.xml $(releasenotes_es_5.0_INCLUDES) +releasenotes-es-5.0-prepped.xml: $(releasenotes_es_5.0_SOURCES) +releasenotes-es-5.0-manprepped.xml: $(releasenotes_es_5.0_SOURCES) +releasenotes-es-5.0-remprepped.xml: $(releasenotes_es_5.0_SOURCES) + +releasenotes_es_INCLUDES = \ + ../common/fixedchars.ent\ + releasenotes-es-5.0.xml +releasenotes_es_IMAGES = +releasenotes_es_SOURCES = releasenotes-es.xml $(releasenotes_es_INCLUDES) +releasenotes-es-prepped.xml: $(releasenotes_es_SOURCES) +releasenotes-es-manprepped.xml: $(releasenotes_es_SOURCES) +releasenotes-es-remprepped.xml: $(releasenotes_es_SOURCES) + +replication_INCLUDES = \ + ../common/fixedchars.ent +replication_IMAGES = +replication_SOURCES = replication.xml $(replication_INCLUDES) +replication-prepped.xml: $(replication_SOURCES) +replication-manprepped.xml: $(replication_SOURCES) +replication-remprepped.xml: $(replication_SOURCES) + +reserved_new_5.0_INCLUDES = +reserved_new_5.0_IMAGES = +reserved_new_5.0_SOURCES = reserved-new-5.0.xml $(reserved_new_5.0_INCLUDES) +reserved-new-5.0-prepped.xml: $(reserved_new_5.0_SOURCES) +reserved-new-5.0-manprepped.xml: $(reserved_new_5.0_SOURCES) +reserved-new-5.0-remprepped.xml: $(reserved_new_5.0_SOURCES) + +reservedwords_INCLUDES = +reservedwords_IMAGES = +reservedwords_SOURCES = reservedwords.xml $(reservedwords_INCLUDES) +reservedwords-prepped.xml: $(reservedwords_SOURCES) +reservedwords-manprepped.xml: $(reservedwords_SOURCES) +reservedwords-remprepped.xml: $(reservedwords_SOURCES) + +restrictions_INCLUDES = \ + ../common/fixedchars.ent +restrictions_IMAGES = +restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES) +restrictions-prepped.xml: $(restrictions_SOURCES) +restrictions-manprepped.xml: $(restrictions_SOURCES) +restrictions-remprepped.xml: $(restrictions_SOURCES) + +se_archive_INCLUDES = \ + ../common/fixedchars.ent +se_archive_IMAGES = +se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES) +se-archive-prepped.xml: $(se_archive_SOURCES) +se-archive-manprepped.xml: $(se_archive_SOURCES) +se-archive-remprepped.xml: $(se_archive_SOURCES) + +se_bdb_INCLUDES = \ + ../common/fixedchars.ent +se_bdb_IMAGES = +se_bdb_SOURCES = se-bdb.xml $(se_bdb_INCLUDES) +se-bdb-prepped.xml: $(se_bdb_SOURCES) +se-bdb-manprepped.xml: $(se_bdb_SOURCES) +se-bdb-remprepped.xml: $(se_bdb_SOURCES) + +se_blackhole_INCLUDES = \ + ../common/fixedchars.ent\ + images/blackhole-1.png +se_blackhole_IMAGES = \ + images/blackhole-1.png +se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES) +se-blackhole-prepped.xml: $(se_blackhole_SOURCES) +se-blackhole-manprepped.xml: $(se_blackhole_SOURCES) +se-blackhole-remprepped.xml: $(se_blackhole_SOURCES) + +se_csv_INCLUDES = \ + ../common/fixedchars.ent +se_csv_IMAGES = +se_csv_SOURCES = se-csv.xml $(se_csv_INCLUDES) +se-csv-prepped.xml: $(se_csv_SOURCES) +se-csv-manprepped.xml: $(se_csv_SOURCES) +se-csv-remprepped.xml: $(se_csv_SOURCES) + +se_example_INCLUDES = \ + ../common/fixedchars.ent +se_example_IMAGES = +se_example_SOURCES = se-example.xml $(se_example_INCLUDES) +se-example-prepped.xml: $(se_example_SOURCES) +se-example-manprepped.xml: $(se_example_SOURCES) +se-example-remprepped.xml: $(se_example_SOURCES) + +se_federated_INCLUDES = \ + ../common/fixedchars.ent +se_federated_IMAGES = +se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES) +se-federated-prepped.xml: $(se_federated_SOURCES) +se-federated-manprepped.xml: $(se_federated_SOURCES) +se-federated-remprepped.xml: $(se_federated_SOURCES) + +se_innodb_INCLUDES = \ + ../common/fixedchars.ent +se_innodb_IMAGES = +se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES) +se-innodb-prepped.xml: $(se_innodb_SOURCES) +se-innodb-manprepped.xml: $(se_innodb_SOURCES) +se-innodb-remprepped.xml: $(se_innodb_SOURCES) + +se_memory_INCLUDES = \ + ../common/fixedchars.ent +se_memory_IMAGES = +se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES) +se-memory-prepped.xml: $(se_memory_SOURCES) +se-memory-manprepped.xml: $(se_memory_SOURCES) +se-memory-remprepped.xml: $(se_memory_SOURCES) + +se_merge_INCLUDES = \ + ../common/fixedchars.ent +se_merge_IMAGES = +se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES) +se-merge-prepped.xml: $(se_merge_SOURCES) +se-merge-manprepped.xml: $(se_merge_SOURCES) +se-merge-remprepped.xml: $(se_merge_SOURCES) + +se_myisam_INCLUDES = \ + ../common/fixedchars.ent +se_myisam_IMAGES = +se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES) +se-myisam-prepped.xml: $(se_myisam_SOURCES) +se-myisam-manprepped.xml: $(se_myisam_SOURCES) +se-myisam-remprepped.xml: $(se_myisam_SOURCES) + +spatial_extensions_INCLUDES = \ + ../common/fixedchars.ent +spatial_extensions_IMAGES = +spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES) +spatial-extensions-prepped.xml: $(spatial_extensions_SOURCES) +spatial-extensions-manprepped.xml: $(spatial_extensions_SOURCES) +spatial-extensions-remprepped.xml: $(spatial_extensions_SOURCES) + +sql_syntax_INCLUDES = \ + ../common/fixedchars.ent +sql_syntax_IMAGES = +sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES) +sql-syntax-prepped.xml: $(sql_syntax_SOURCES) +sql-syntax-manprepped.xml: $(sql_syntax_SOURCES) +sql-syntax-remprepped.xml: $(sql_syntax_SOURCES) + +storage_engines_INCLUDES = \ + ../common/fixedchars.ent\ + images/blackhole-1.png\ + se-archive.xml\ + se-bdb.xml\ + se-blackhole.xml\ + se-csv.xml\ + se-example.xml\ + se-federated.xml\ + se-innodb.xml\ + se-memory.xml\ + se-merge.xml\ + se-myisam.xml +storage_engines_IMAGES = \ + images/blackhole-1.png +storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES) +storage-engines-prepped.xml: $(storage_engines_SOURCES) +storage-engines-manprepped.xml: $(storage_engines_SOURCES) +storage-engines-remprepped.xml: $(storage_engines_SOURCES) + +stored_procedures_INCLUDES = \ + ../common/fixedchars.ent +stored_procedures_IMAGES = +stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES) +stored-procedures-prepped.xml: $(stored_procedures_SOURCES) +stored-procedures-manprepped.xml: $(stored_procedures_SOURCES) +stored-procedures-remprepped.xml: $(stored_procedures_SOURCES) + +triggers_INCLUDES = \ + ../common/fixedchars.ent +triggers_IMAGES = +triggers_SOURCES = triggers.xml $(triggers_INCLUDES) +triggers-prepped.xml: $(triggers_SOURCES) +triggers-manprepped.xml: $(triggers_SOURCES) +triggers-remprepped.xml: $(triggers_SOURCES) + +tutorial_INCLUDES = \ + ../common/fixedchars.ent +tutorial_IMAGES = +tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES) +tutorial-prepped.xml: $(tutorial_SOURCES) +tutorial-manprepped.xml: $(tutorial_SOURCES) +tutorial-remprepped.xml: $(tutorial_SOURCES) + +using_mysql_programs_INCLUDES = \ + ../common/fixedchars.ent +using_mysql_programs_IMAGES = +using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES) +using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) +using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) +using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) + +views_INCLUDES = \ + ../common/fixedchars.ent +views_IMAGES = +views_SOURCES = views.xml $(views_INCLUDES) +views-prepped.xml: $(views_SOURCES) +views-manprepped.xml: $(views_SOURCES) +views-remprepped.xml: $(views_SOURCES) + Modified: trunk/refman-5.1/Makefile =================================================================== --- trunk/refman-5.1/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/refman-5.1/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 10, Lines Deleted: 12; 6273 bytes @@ -21,7 +21,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_VER)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-common ../refman-4.1 ../refman-5.0 ../internals ../falcon ../ndbapi -IDMAP_SRCS = $(MANUAL_SRCS) +IDMAP_SRCS = $(manual_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -34,18 +34,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = manual.xml -depend:: manual.depend - -MANUAL_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent ../common/phrases.ent - -MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml apis-cplusplus.xml apis-c.xml apis-eiffel.xml apis-libmysqld.xml apis-perl.xml apis-php.xml apis-progutils.xml apis-python.xml apis-tcl.xml apis.xml charset.xml client-utility-programs.xml connectors.xml copyright.xml data-types.xml dba-optvars-table.xml dynxml-generated-dba.xml dynxml-generated-functions.xml errmsgs-client.xml errmsgs-server.xml errors-problems.xml events.xml extending-mysql.xml faqs.xml images/blackhole-1.png images/cluster-components-1.png images/cluster-replication-binlog-injector.png images/cluster-replication-overview.png images/cluster-upgrade-downgrade-table.png images/multi-comp-1.png images/ndb-size-pl-1.png images/PSEArch.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/rolling-restarts.png information-schema.xml installing.xml introduction.xml language-structure.xml legalnotice.en.xml mysql-cluster.xml news-5.1.xml news.xml optimization.xml partitioning.xml precision-math.xml ! preface.xml ../refman-common/bug-reports.xml ../refman-common/connector-j.xml ../refman-common/connector-mxj.xml ../refman-common/connector-net.xml ../refman-common/connector-odbc.xml ../refman-common/connector-php.xml ../refman-common/connector-vstudioplugin.xml ../refman-common/credits.xml ../refman-common/images/cmxj-overview.png ../refman-common/images/cnet-win-install-step1.png ../refman-common/images/cnet-win-install-step2.png ../refman-common/images/cnet-win-install-step3.png ../refman-common/images/cnet-win-install-step4.png ../refman-common/images/myaccess-odbc.png ../refman-common/images/myaccess.png ../refman-common/images/myarchitecture.png ../refman-common/images/myflowchart.png ../refman-common/images/myodbc-crystal-1.png ../refman-common/images/myodbc-crystal-2.png ../refman-common/images/myodbc-crystal-3.png ../refman-common/images/myodbc-crystal-4.png ../refman-common/images/myodbc-crystal-5.png ../refman-common/images/myodbc-crystal-6.png ../refman-common/! images/myodbc-excel-step1.png ../refman-common/images/myodbc-e! xcel-ste p2.png ../refman-common/images/myodbc-excel-step3.png ../refman-common/images/myodbc-excel-step4.png ../refman-common/images/myodbc-excel-step5.png ../refman-common/images/myodbc-link-step1.png ../refman-common/images/myodbc-link-step3.png ../refman-common/images/myodbc-link-step4.png ../refman-common/images/myodbc-link-step5.png ../refman-common/images/myodbc-macosx-install-step1.png ../refman-common/images/myodbc-macosx-install-step2.png ../refman-common/images/myodbc-macosx-install-step3.png ../refman-common/images/myodbc-macosx-install-step4.png ../refman-common/images/myodbc-macosx-install-step5.png ../refman-common/images/myodbc-macosx-install-step6.png ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png ../refman-common/images/myodbc-macosx-odbcadmin-main.png ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png ../refman-common/images/myodbc-win-install-step1.png ../refman-common/images/myodbc! -win-install-step2.png ../refman-common/images/myodbc-win-install-step3.png ../refman-common/images/myodbc-win-install-step4.png ../refman-common/images/myodbc-win-odbcadmin-adddsn.png ../refman-common/images/myodbc-win-odbcadmin-advanced.png ../refman-common/images/myodbc-win-odbcadmin-driverselect.png ../refman-common/images/myodbc-win-odbcadmin-main.png ../refman-common/images/myodbc-win-odbcadmin-options.png ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png ../refman-common/images/myodbc-win-tracing.png ../refman-common/images/mysql-vstudioplugin-1.png ../refman-common/images/mysql-vstudioplugin-3.png ../refman-common/images/mysql-vstudioplugin-4.png ../refman-common/images/se-federated-structure.png ../refman-common/information-sources.xml ../refman-common/licenses.xml ../refman-common/manual-conventions.en.xml ../refman-common/maxdb.en.xml ../refman-common/news-connector-j.xml ../refman-common/news-connector-net.xml ../refman-common/news-myodbc.xml ../refman-! common/news-vstudioplugin.xml ../refman-common/replication-gra! phics/mu lti-db.png ../refman-common/replication-graphics/redundancy-after.png ../refman-common/replication-graphics/redundancy-before.png ../refman-common/replication-graphics/scaleout.png ../refman-common/replication-graphics/submaster-performance.png ../refman-common/what-is.en.xml ../refman-common/what-is-mysql-ab.en.xml replication-configuration.xml replication-implementation.xml replication-notes.xml replication-solutions.xml replication.xml reserved-new-5.1.xml reservedwords.xml restrictions.xml se-archive.xml se-blackhole.xml se-csv.xml se-example.xml se-federated.xml se-innodb.xml se-memory.xml se-merge.xml se-myisam.xml spatial-extensions.xml sql-syntax.xml storage-engines.xml stored-procedures.xml triggers.xml tutorial.xml using-mysql-programs.xml views.xml - -manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS) -manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS) +# TODO: FIX +manual-prepped.xml: $(IDMAP_OBJS) +manual-manprepped.xml: $(IDMAP_OBJS) # Make sure we trigger a rebuild of the dynamic tables # when validating manual.xml or requiring the DBA chapter @@ -116,3 +110,7 @@ # Import directory specific extensions include ../refman-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/refman-5.1/Makefile.depends =================================================================== --- trunk/refman-5.1/Makefile.depends (rev 0) +++ trunk/refman-5.1/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 891, Lines Deleted: 0; 35567 bytes @@ -0,0 +1,891 @@ +apis_c_INCLUDES = \ + ../common/fixedchars.ent +apis_c_IMAGES = +apis_c_SOURCES = apis-c.xml $(apis_c_INCLUDES) +apis-c-prepped.xml: $(apis_c_SOURCES) +apis-c-manprepped.xml: $(apis_c_SOURCES) +apis-c-remprepped.xml: $(apis_c_SOURCES) + +apis_cplusplus_INCLUDES = \ + ../common/fixedchars.ent +apis_cplusplus_IMAGES = +apis_cplusplus_SOURCES = apis-cplusplus.xml $(apis_cplusplus_INCLUDES) +apis-cplusplus-prepped.xml: $(apis_cplusplus_SOURCES) +apis-cplusplus-manprepped.xml: $(apis_cplusplus_SOURCES) +apis-cplusplus-remprepped.xml: $(apis_cplusplus_SOURCES) + +apis_eiffel_INCLUDES = \ + ../common/fixedchars.ent +apis_eiffel_IMAGES = +apis_eiffel_SOURCES = apis-eiffel.xml $(apis_eiffel_INCLUDES) +apis-eiffel-prepped.xml: $(apis_eiffel_SOURCES) +apis-eiffel-manprepped.xml: $(apis_eiffel_SOURCES) +apis-eiffel-remprepped.xml: $(apis_eiffel_SOURCES) + +apis_libmysqld_INCLUDES = \ + ../common/fixedchars.ent +apis_libmysqld_IMAGES = +apis_libmysqld_SOURCES = apis-libmysqld.xml $(apis_libmysqld_INCLUDES) +apis-libmysqld-prepped.xml: $(apis_libmysqld_SOURCES) +apis-libmysqld-manprepped.xml: $(apis_libmysqld_SOURCES) +apis-libmysqld-remprepped.xml: $(apis_libmysqld_SOURCES) + +apis_perl_INCLUDES = \ + ../common/fixedchars.ent +apis_perl_IMAGES = +apis_perl_SOURCES = apis-perl.xml $(apis_perl_INCLUDES) +apis-perl-prepped.xml: $(apis_perl_SOURCES) +apis-perl-manprepped.xml: $(apis_perl_SOURCES) +apis-perl-remprepped.xml: $(apis_perl_SOURCES) + +apis_php_INCLUDES = \ + ../common/fixedchars.ent +apis_php_IMAGES = +apis_php_SOURCES = apis-php.xml $(apis_php_INCLUDES) +apis-php-prepped.xml: $(apis_php_SOURCES) +apis-php-manprepped.xml: $(apis_php_SOURCES) +apis-php-remprepped.xml: $(apis_php_SOURCES) + +apis_progutils_INCLUDES = \ + ../common/fixedchars.ent +apis_progutils_IMAGES = +apis_progutils_SOURCES = apis-progutils.xml $(apis_progutils_INCLUDES) +apis-progutils-prepped.xml: $(apis_progutils_SOURCES) +apis-progutils-manprepped.xml: $(apis_progutils_SOURCES) +apis-progutils-remprepped.xml: $(apis_progutils_SOURCES) + +apis_python_INCLUDES = \ + ../common/fixedchars.ent +apis_python_IMAGES = +apis_python_SOURCES = apis-python.xml $(apis_python_INCLUDES) +apis-python-prepped.xml: $(apis_python_SOURCES) +apis-python-manprepped.xml: $(apis_python_SOURCES) +apis-python-remprepped.xml: $(apis_python_SOURCES) + +apis_tcl_INCLUDES = \ + ../common/fixedchars.ent +apis_tcl_IMAGES = +apis_tcl_SOURCES = apis-tcl.xml $(apis_tcl_INCLUDES) +apis-tcl-prepped.xml: $(apis_tcl_SOURCES) +apis-tcl-manprepped.xml: $(apis_tcl_SOURCES) +apis-tcl-remprepped.xml: $(apis_tcl_SOURCES) + +apis_INCLUDES = \ + ../common/fixedchars.ent\ + apis-c.xml\ + apis-cplusplus.xml\ + apis-eiffel.xml\ + apis-libmysqld.xml\ + apis-perl.xml\ + apis-php.xml\ + apis-progutils.xml\ + apis-python.xml\ + apis-tcl.xml +apis_IMAGES = +apis_SOURCES = apis.xml $(apis_INCLUDES) +apis-prepped.xml: $(apis_SOURCES) +apis-manprepped.xml: $(apis_SOURCES) +apis-remprepped.xml: $(apis_SOURCES) + +charset_INCLUDES = \ + ../common/fixedchars.ent +charset_IMAGES = +charset_SOURCES = charset.xml $(charset_INCLUDES) +charset-prepped.xml: $(charset_SOURCES) +charset-manprepped.xml: $(charset_SOURCES) +charset-remprepped.xml: $(charset_SOURCES) + +client_utility_programs_INCLUDES = \ + ../common/fixedchars.ent +client_utility_programs_IMAGES = +client_utility_programs_SOURCES = client-utility-programs.xml $(client_utility_programs_INCLUDES) +client-utility-programs-prepped.xml: $(client_utility_programs_SOURCES) +client-utility-programs-manprepped.xml: $(client_utility_programs_SOURCES) +client-utility-programs-remprepped.xml: $(client_utility_programs_SOURCES) + +connectors_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/connector-j.xml\ + ../refman-common/connector-mxj.xml\ + ../refman-common/connector-net.xml\ + ../refman-common/connector-odbc.xml\ + ../refman-common/connector-php.xml\ + ../refman-common/connector-vstudioplugin.xml\ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png +connectors_IMAGES = \ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png +connectors_SOURCES = connectors.xml $(connectors_INCLUDES) +connectors-prepped.xml: $(connectors_SOURCES) +connectors-manprepped.xml: $(connectors_SOURCES) +connectors-remprepped.xml: $(connectors_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +data_types_INCLUDES = \ + ../common/fixedchars.ent +data_types_IMAGES = +data_types_SOURCES = data-types.xml $(data_types_INCLUDES) +data-types-prepped.xml: $(data_types_SOURCES) +data-types-manprepped.xml: $(data_types_SOURCES) +data-types-remprepped.xml: $(data_types_SOURCES) + +dba_optvars_table_INCLUDES = +dba_optvars_table_IMAGES = +dba_optvars_table_SOURCES = dba-optvars-table.xml $(dba_optvars_table_INCLUDES) +dba-optvars-table-prepped.xml: $(dba_optvars_table_SOURCES) +dba-optvars-table-manprepped.xml: $(dba_optvars_table_SOURCES) +dba-optvars-table-remprepped.xml: $(dba_optvars_table_SOURCES) + +dynxml_generated_dba_INCLUDES = \ + ../common/fixedchars.ent\ + dba-optvars-table.xml +dynxml_generated_dba_IMAGES = +dynxml_generated_dba_SOURCES = dynxml-generated-dba.xml $(dynxml_generated_dba_INCLUDES) +dynxml-generated-dba-prepped.xml: $(dynxml_generated_dba_SOURCES) +dynxml-generated-dba-manprepped.xml: $(dynxml_generated_dba_SOURCES) +dynxml-generated-dba-remprepped.xml: $(dynxml_generated_dba_SOURCES) + +dynxml_generated_functions_INCLUDES = \ + ../common/fixedchars.ent +dynxml_generated_functions_IMAGES = +dynxml_generated_functions_SOURCES = dynxml-generated-functions.xml $(dynxml_generated_functions_INCLUDES) +dynxml-generated-functions-prepped.xml: $(dynxml_generated_functions_SOURCES) +dynxml-generated-functions-manprepped.xml: $(dynxml_generated_functions_SOURCES) +dynxml-generated-functions-remprepped.xml: $(dynxml_generated_functions_SOURCES) + +errmsgs_client_INCLUDES = +errmsgs_client_IMAGES = +errmsgs_client_SOURCES = errmsgs-client.xml $(errmsgs_client_INCLUDES) +errmsgs-client-prepped.xml: $(errmsgs_client_SOURCES) +errmsgs-client-manprepped.xml: $(errmsgs_client_SOURCES) +errmsgs-client-remprepped.xml: $(errmsgs_client_SOURCES) + +errmsgs_server_INCLUDES = +errmsgs_server_IMAGES = +errmsgs_server_SOURCES = errmsgs-server.xml $(errmsgs_server_INCLUDES) +errmsgs-server-prepped.xml: $(errmsgs_server_SOURCES) +errmsgs-server-manprepped.xml: $(errmsgs_server_SOURCES) +errmsgs-server-remprepped.xml: $(errmsgs_server_SOURCES) + +errors_problems_INCLUDES = \ + ../common/fixedchars.ent\ + errmsgs-client.xml\ + errmsgs-server.xml +errors_problems_IMAGES = +errors_problems_SOURCES = errors-problems.xml $(errors_problems_INCLUDES) +errors-problems-prepped.xml: $(errors_problems_SOURCES) +errors-problems-manprepped.xml: $(errors_problems_SOURCES) +errors-problems-remprepped.xml: $(errors_problems_SOURCES) + +events_INCLUDES = \ + ../common/fixedchars.ent +events_IMAGES = +events_SOURCES = events.xml $(events_INCLUDES) +events-prepped.xml: $(events_SOURCES) +events-manprepped.xml: $(events_SOURCES) +events-remprepped.xml: $(events_SOURCES) + +extending_mysql_INCLUDES = \ + ../common/fixedchars.ent +extending_mysql_IMAGES = +extending_mysql_SOURCES = extending-mysql.xml $(extending_mysql_INCLUDES) +extending-mysql-prepped.xml: $(extending_mysql_SOURCES) +extending-mysql-manprepped.xml: $(extending_mysql_SOURCES) +extending-mysql-remprepped.xml: $(extending_mysql_SOURCES) + +faqs_INCLUDES = \ + ../common/fixedchars.ent +faqs_IMAGES = +faqs_SOURCES = faqs.xml $(faqs_INCLUDES) +faqs-prepped.xml: $(faqs_SOURCES) +faqs-manprepped.xml: $(faqs_SOURCES) +faqs-remprepped.xml: $(faqs_SOURCES) + +information_schema_INCLUDES = \ + ../common/fixedchars.ent +information_schema_IMAGES = +information_schema_SOURCES = information-schema.xml $(information_schema_INCLUDES) +information-schema-prepped.xml: $(information_schema_SOURCES) +information-schema-manprepped.xml: $(information_schema_SOURCES) +information-schema-remprepped.xml: $(information_schema_SOURCES) + +installing_INCLUDES = \ + ../common/fixedchars.ent +installing_IMAGES = +installing_SOURCES = installing.xml $(installing_INCLUDES) +installing-prepped.xml: $(installing_SOURCES) +installing-manprepped.xml: $(installing_SOURCES) +installing-remprepped.xml: $(installing_SOURCES) + +introduction_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/bug-reports.xml\ + ../refman-common/information-sources.xml\ + ../refman-common/manual-conventions.en.xml\ + ../refman-common/maxdb.en.xml\ + ../refman-common/what-is-mysql-ab.en.xml\ + ../refman-common/what-is.en.xml +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +language_structure_INCLUDES = \ + ../common/fixedchars.ent\ + reserved-new-5.1.xml\ + reservedwords.xml +language_structure_IMAGES = +language_structure_SOURCES = language-structure.xml $(language_structure_INCLUDES) +language-structure-prepped.xml: $(language_structure_SOURCES) +language-structure-manprepped.xml: $(language_structure_SOURCES) +language-structure-remprepped.xml: $(language_structure_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +manual_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/bug-reports.xml\ + ../refman-common/connector-j.xml\ + ../refman-common/connector-mxj.xml\ + ../refman-common/connector-net.xml\ + ../refman-common/connector-odbc.xml\ + ../refman-common/connector-php.xml\ + ../refman-common/connector-vstudioplugin.xml\ + ../refman-common/credits.xml\ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png\ + ../refman-common/images/se-federated-structure.png\ + ../refman-common/information-sources.xml\ + ../refman-common/licenses.xml\ + ../refman-common/manual-conventions.en.xml\ + ../refman-common/maxdb.en.xml\ + ../refman-common/news-connector-j.xml\ + ../refman-common/news-connector-net.xml\ + ../refman-common/news-myodbc.xml\ + ../refman-common/news-vstudioplugin.xml\ + ../refman-common/replication-graphics/multi-db.png\ + ../refman-common/replication-graphics/redundancy-after.png\ + ../refman-common/replication-graphics/redundancy-before.png\ + ../refman-common/replication-graphics/scaleout.png\ + ../refman-common/replication-graphics/submaster-performance.png\ + ../refman-common/what-is-mysql-ab.en.xml\ + ../refman-common/what-is.en.xml\ + apis-c.xml\ + apis-cplusplus.xml\ + apis-eiffel.xml\ + apis-libmysqld.xml\ + apis-perl.xml\ + apis-php.xml\ + apis-progutils.xml\ + apis-python.xml\ + apis-tcl.xml\ + apis.xml\ + charset.xml\ + client-utility-programs.xml\ + connectors.xml\ + copyright.xml\ + data-types.xml\ + dba-optvars-table.xml\ + dynxml-generated-dba.xml\ + dynxml-generated-functions.xml\ + errmsgs-client.xml\ + errmsgs-server.xml\ + errors-problems.xml\ + events.xml\ + extending-mysql.xml\ + faqs.xml\ + images/PSEArch.png\ + images/blackhole-1.png\ + images/cluster-components-1.png\ + images/cluster-replication-binlog-injector.png\ + images/cluster-replication-overview.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png\ + information-schema.xml\ + installing.xml\ + introduction.xml\ + language-structure.xml\ + legalnotice.en.xml\ + mysql-cluster.xml\ + news-5.1.xml\ + news.xml\ + optimization.xml\ + partitioning.xml\ + precision-math.xml\ + preface.xml\ + replication-configuration.xml\ + replication-implementation.xml\ + replication-notes.xml\ + replication-solutions.xml\ + replication.xml\ + reserved-new-5.1.xml\ + reservedwords.xml\ + restrictions.xml\ + se-archive.xml\ + se-blackhole.xml\ + se-csv.xml\ + se-example.xml\ + se-federated.xml\ + se-innodb.xml\ + se-memory.xml\ + se-merge.xml\ + se-myisam.xml\ + spatial-extensions.xml\ + sql-syntax.xml\ + storage-engines.xml\ + stored-procedures.xml\ + triggers.xml\ + tutorial.xml\ + using-mysql-programs.xml\ + views.xml +manual_IMAGES = \ + ../refman-common/images/cmxj-overview.png\ + ../refman-common/images/cnet-win-install-step1.png\ + ../refman-common/images/cnet-win-install-step2.png\ + ../refman-common/images/cnet-win-install-step3.png\ + ../refman-common/images/cnet-win-install-step4.png\ + ../refman-common/images/myaccess-odbc.png\ + ../refman-common/images/myaccess.png\ + ../refman-common/images/myarchitecture.png\ + ../refman-common/images/myflowchart.png\ + ../refman-common/images/myodbc-crystal-1.png\ + ../refman-common/images/myodbc-crystal-2.png\ + ../refman-common/images/myodbc-crystal-3.png\ + ../refman-common/images/myodbc-crystal-4.png\ + ../refman-common/images/myodbc-crystal-5.png\ + ../refman-common/images/myodbc-crystal-6.png\ + ../refman-common/images/myodbc-excel-step1.png\ + ../refman-common/images/myodbc-excel-step2.png\ + ../refman-common/images/myodbc-excel-step3.png\ + ../refman-common/images/myodbc-excel-step4.png\ + ../refman-common/images/myodbc-excel-step5.png\ + ../refman-common/images/myodbc-link-step1.png\ + ../refman-common/images/myodbc-link-step3.png\ + ../refman-common/images/myodbc-link-step4.png\ + ../refman-common/images/myodbc-link-step5.png\ + ../refman-common/images/myodbc-macosx-install-step1.png\ + ../refman-common/images/myodbc-macosx-install-step2.png\ + ../refman-common/images/myodbc-macosx-install-step3.png\ + ../refman-common/images/myodbc-macosx-install-step4.png\ + ../refman-common/images/myodbc-macosx-install-step5.png\ + ../refman-common/images/myodbc-macosx-install-step6.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-main.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-macosx-odbcadmin-tracing.png\ + ../refman-common/images/myodbc-win-install-step1.png\ + ../refman-common/images/myodbc-win-install-step2.png\ + ../refman-common/images/myodbc-win-install-step3.png\ + ../refman-common/images/myodbc-win-install-step4.png\ + ../refman-common/images/myodbc-win-odbcadmin-adddsn.png\ + ../refman-common/images/myodbc-win-odbcadmin-advanced.png\ + ../refman-common/images/myodbc-win-odbcadmin-driverselect.png\ + ../refman-common/images/myodbc-win-odbcadmin-main.png\ + ../refman-common/images/myodbc-win-odbcadmin-options.png\ + ../refman-common/images/myodbc-win-odbcadmin-sampledsn.png\ + ../refman-common/images/myodbc-win-tracing.png\ + ../refman-common/images/mysql-vstudioplugin-1.png\ + ../refman-common/images/mysql-vstudioplugin-3.png\ + ../refman-common/images/mysql-vstudioplugin-4.png\ + ../refman-common/images/se-federated-structure.png\ + ../refman-common/replication-graphics/multi-db.png\ + ../refman-common/replication-graphics/redundancy-after.png\ + ../refman-common/replication-graphics/redundancy-before.png\ + ../refman-common/replication-graphics/scaleout.png\ + ../refman-common/replication-graphics/submaster-performance.png\ + images/PSEArch.png\ + images/blackhole-1.png\ + images/cluster-components-1.png\ + images/cluster-replication-binlog-injector.png\ + images/cluster-replication-overview.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +manual_SOURCES = manual.xml $(manual_INCLUDES) +manual-prepped.xml: $(manual_SOURCES) +manual-manprepped.xml: $(manual_SOURCES) +manual-remprepped.xml: $(manual_SOURCES) + +mysql_cluster_INCLUDES = \ + ../common/fixedchars.ent\ + images/cluster-components-1.png\ + images/cluster-replication-binlog-injector.png\ + images/cluster-replication-overview.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +mysql_cluster_IMAGES = \ + images/cluster-components-1.png\ + images/cluster-replication-binlog-injector.png\ + images/cluster-replication-overview.png\ + images/cluster-upgrade-downgrade-table.png\ + images/multi-comp-1.png\ + images/ndb-size-pl-1.png\ + images/replicas-groups-1-1.png\ + images/replicas-groups-1-2.png\ + images/rolling-restarts.png +mysql_cluster_SOURCES = mysql-cluster.xml $(mysql_cluster_INCLUDES) +mysql-cluster-prepped.xml: $(mysql_cluster_SOURCES) +mysql-cluster-manprepped.xml: $(mysql_cluster_SOURCES) +mysql-cluster-remprepped.xml: $(mysql_cluster_SOURCES) + +news_5.1_INCLUDES = \ + ../common/fixedchars.ent +news_5.1_IMAGES = +news_5.1_SOURCES = news-5.1.xml $(news_5.1_INCLUDES) +news-5.1-prepped.xml: $(news_5.1_SOURCES) +news-5.1-manprepped.xml: $(news_5.1_SOURCES) +news-5.1-remprepped.xml: $(news_5.1_SOURCES) + +news_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/../common/fixedchars.ent\ + ../refman-common/news-connector-j.xml\ + ../refman-common/news-connector-net.xml\ + ../refman-common/news-myodbc.xml\ + ../refman-common/news-vstudioplugin.xml\ + news-5.1.xml +news_IMAGES = +news_SOURCES = news.xml $(news_INCLUDES) +news-prepped.xml: $(news_SOURCES) +news-manprepped.xml: $(news_SOURCES) +news-remprepped.xml: $(news_SOURCES) + +optimization_INCLUDES = \ + ../common/fixedchars.ent +optimization_IMAGES = +optimization_SOURCES = optimization.xml $(optimization_INCLUDES) +optimization-prepped.xml: $(optimization_SOURCES) +optimization-manprepped.xml: $(optimization_SOURCES) +optimization-remprepped.xml: $(optimization_SOURCES) + +partitioning_INCLUDES = \ + ../common/fixedchars.ent +partitioning_IMAGES = +partitioning_SOURCES = partitioning.xml $(partitioning_INCLUDES) +partitioning-prepped.xml: $(partitioning_SOURCES) +partitioning-manprepped.xml: $(partitioning_SOURCES) +partitioning-remprepped.xml: $(partitioning_SOURCES) + +precision_math_INCLUDES = \ + ../common/fixedchars.ent +precision_math_IMAGES = +precision_math_SOURCES = precision-math.xml $(precision_math_INCLUDES) +precision-math-prepped.xml: $(precision_math_SOURCES) +precision-math-manprepped.xml: $(precision_math_SOURCES) +precision-math-remprepped.xml: $(precision_math_SOURCES) + +preface_INCLUDES = \ + ../common/fixedchars.ent +preface_IMAGES = +preface_SOURCES = preface.xml $(preface_INCLUDES) +preface-prepped.xml: $(preface_SOURCES) +preface-manprepped.xml: $(preface_SOURCES) +preface-remprepped.xml: $(preface_SOURCES) + +replication_configuration_INCLUDES = \ + ../common/fixedchars.ent +replication_configuration_IMAGES = +replication_configuration_SOURCES = replication-configuration.xml $(replication_configuration_INCLUDES) +replication-configuration-prepped.xml: $(replication_configuration_SOURCES) +replication-configuration-manprepped.xml: $(replication_configuration_SOURCES) +replication-configuration-remprepped.xml: $(replication_configuration_SOURCES) + +replication_implementation_INCLUDES = \ + ../common/fixedchars.ent +replication_implementation_IMAGES = +replication_implementation_SOURCES = replication-implementation.xml $(replication_implementation_INCLUDES) +replication-implementation-prepped.xml: $(replication_implementation_SOURCES) +replication-implementation-manprepped.xml: $(replication_implementation_SOURCES) +replication-implementation-remprepped.xml: $(replication_implementation_SOURCES) + +replication_notes_INCLUDES = \ + ../common/fixedchars.ent +replication_notes_IMAGES = +replication_notes_SOURCES = replication-notes.xml $(replication_notes_INCLUDES) +replication-notes-prepped.xml: $(replication_notes_SOURCES) +replication-notes-manprepped.xml: $(replication_notes_SOURCES) +replication-notes-remprepped.xml: $(replication_notes_SOURCES) + +replication_solutions_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/replication-graphics/multi-db.png\ + ../refman-common/replication-graphics/redundancy-after.png\ + ../refman-common/replication-graphics/redundancy-before.png\ + ../refman-common/replication-graphics/scaleout.png\ + ../refman-common/replication-graphics/submaster-performance.png +replication_solutions_IMAGES = \ + ../refman-common/replication-graphics/multi-db.png\ + ../refman-common/replication-graphics/redundancy-after.png\ + ../refman-common/replication-graphics/redundancy-before.png\ + ../refman-common/replication-graphics/scaleout.png\ + ../refman-common/replication-graphics/submaster-performance.png +replication_solutions_SOURCES = replication-solutions.xml $(replication_solutions_INCLUDES) +replication-solutions-prepped.xml: $(replication_solutions_SOURCES) +replication-solutions-manprepped.xml: $(replication_solutions_SOURCES) +replication-solutions-remprepped.xml: $(replication_solutions_SOURCES) + +replication_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/replication-graphics/multi-db.png\ + ../refman-common/replication-graphics/redundancy-after.png\ + ../refman-common/replication-graphics/redundancy-before.png\ + ../refman-common/replication-graphics/scaleout.png\ + ../refman-common/replication-graphics/submaster-performance.png\ + replication-configuration.xml\ + replication-implementation.xml\ + replication-notes.xml\ + replication-solutions.xml +replication_IMAGES = \ + ../refman-common/replication-graphics/multi-db.png\ + ../refman-common/replication-graphics/redundancy-after.png\ + ../refman-common/replication-graphics/redundancy-before.png\ + ../refman-common/replication-graphics/scaleout.png\ + ../refman-common/replication-graphics/submaster-performance.png +replication_SOURCES = replication.xml $(replication_INCLUDES) +replication-prepped.xml: $(replication_SOURCES) +replication-manprepped.xml: $(replication_SOURCES) +replication-remprepped.xml: $(replication_SOURCES) + +reserved_new_5.1_INCLUDES = +reserved_new_5.1_IMAGES = +reserved_new_5.1_SOURCES = reserved-new-5.1.xml $(reserved_new_5.1_INCLUDES) +reserved-new-5.1-prepped.xml: $(reserved_new_5.1_SOURCES) +reserved-new-5.1-manprepped.xml: $(reserved_new_5.1_SOURCES) +reserved-new-5.1-remprepped.xml: $(reserved_new_5.1_SOURCES) + +reservedwords_INCLUDES = +reservedwords_IMAGES = +reservedwords_SOURCES = reservedwords.xml $(reservedwords_INCLUDES) +reservedwords-prepped.xml: $(reservedwords_SOURCES) +reservedwords-manprepped.xml: $(reservedwords_SOURCES) +reservedwords-remprepped.xml: $(reservedwords_SOURCES) + +restrictions_INCLUDES = \ + ../common/fixedchars.ent +restrictions_IMAGES = +restrictions_SOURCES = restrictions.xml $(restrictions_INCLUDES) +restrictions-prepped.xml: $(restrictions_SOURCES) +restrictions-manprepped.xml: $(restrictions_SOURCES) +restrictions-remprepped.xml: $(restrictions_SOURCES) + +se_archive_INCLUDES = \ + ../common/fixedchars.ent +se_archive_IMAGES = +se_archive_SOURCES = se-archive.xml $(se_archive_INCLUDES) +se-archive-prepped.xml: $(se_archive_SOURCES) +se-archive-manprepped.xml: $(se_archive_SOURCES) +se-archive-remprepped.xml: $(se_archive_SOURCES) + +se_blackhole_INCLUDES = \ + ../common/fixedchars.ent\ + images/blackhole-1.png +se_blackhole_IMAGES = \ + images/blackhole-1.png +se_blackhole_SOURCES = se-blackhole.xml $(se_blackhole_INCLUDES) +se-blackhole-prepped.xml: $(se_blackhole_SOURCES) +se-blackhole-manprepped.xml: $(se_blackhole_SOURCES) +se-blackhole-remprepped.xml: $(se_blackhole_SOURCES) + +se_csv_INCLUDES = \ + ../common/fixedchars.ent +se_csv_IMAGES = +se_csv_SOURCES = se-csv.xml $(se_csv_INCLUDES) +se-csv-prepped.xml: $(se_csv_SOURCES) +se-csv-manprepped.xml: $(se_csv_SOURCES) +se-csv-remprepped.xml: $(se_csv_SOURCES) + +se_example_INCLUDES = \ + ../common/fixedchars.ent +se_example_IMAGES = +se_example_SOURCES = se-example.xml $(se_example_INCLUDES) +se-example-prepped.xml: $(se_example_SOURCES) +se-example-manprepped.xml: $(se_example_SOURCES) +se-example-remprepped.xml: $(se_example_SOURCES) + +se_federated_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/images/se-federated-structure.png +se_federated_IMAGES = \ + ../refman-common/images/se-federated-structure.png +se_federated_SOURCES = se-federated.xml $(se_federated_INCLUDES) +se-federated-prepped.xml: $(se_federated_SOURCES) +se-federated-manprepped.xml: $(se_federated_SOURCES) +se-federated-remprepped.xml: $(se_federated_SOURCES) + +se_innodb_INCLUDES = \ + ../common/fixedchars.ent +se_innodb_IMAGES = +se_innodb_SOURCES = se-innodb.xml $(se_innodb_INCLUDES) +se-innodb-prepped.xml: $(se_innodb_SOURCES) +se-innodb-manprepped.xml: $(se_innodb_SOURCES) +se-innodb-remprepped.xml: $(se_innodb_SOURCES) + +se_memory_INCLUDES = \ + ../common/fixedchars.ent +se_memory_IMAGES = +se_memory_SOURCES = se-memory.xml $(se_memory_INCLUDES) +se-memory-prepped.xml: $(se_memory_SOURCES) +se-memory-manprepped.xml: $(se_memory_SOURCES) +se-memory-remprepped.xml: $(se_memory_SOURCES) + +se_merge_INCLUDES = \ + ../common/fixedchars.ent +se_merge_IMAGES = +se_merge_SOURCES = se-merge.xml $(se_merge_INCLUDES) +se-merge-prepped.xml: $(se_merge_SOURCES) +se-merge-manprepped.xml: $(se_merge_SOURCES) +se-merge-remprepped.xml: $(se_merge_SOURCES) + +se_myisam_INCLUDES = \ + ../common/fixedchars.ent +se_myisam_IMAGES = +se_myisam_SOURCES = se-myisam.xml $(se_myisam_INCLUDES) +se-myisam-prepped.xml: $(se_myisam_SOURCES) +se-myisam-manprepped.xml: $(se_myisam_SOURCES) +se-myisam-remprepped.xml: $(se_myisam_SOURCES) + +spatial_extensions_INCLUDES = \ + ../common/fixedchars.ent +spatial_extensions_IMAGES = +spatial_extensions_SOURCES = spatial-extensions.xml $(spatial_extensions_INCLUDES) +spatial-extensions-prepped.xml: $(spatial_extensions_SOURCES) +spatial-extensions-manprepped.xml: $(spatial_extensions_SOURCES) +spatial-extensions-remprepped.xml: $(spatial_extensions_SOURCES) + +sql_syntax_INCLUDES = \ + ../common/fixedchars.ent +sql_syntax_IMAGES = +sql_syntax_SOURCES = sql-syntax.xml $(sql_syntax_INCLUDES) +sql-syntax-prepped.xml: $(sql_syntax_SOURCES) +sql-syntax-manprepped.xml: $(sql_syntax_SOURCES) +sql-syntax-remprepped.xml: $(sql_syntax_SOURCES) + +storage_engines_INCLUDES = \ + ../common/fixedchars.ent\ + ../refman-common/images/se-federated-structure.png\ + images/PSEArch.png\ + images/blackhole-1.png\ + se-archive.xml\ + se-blackhole.xml\ + se-csv.xml\ + se-example.xml\ + se-federated.xml\ + se-innodb.xml\ + se-memory.xml\ + se-merge.xml\ + se-myisam.xml +storage_engines_IMAGES = \ + ../refman-common/images/se-federated-structure.png\ + images/PSEArch.png\ + images/blackhole-1.png +storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES) +storage-engines-prepped.xml: $(storage_engines_SOURCES) +storage-engines-manprepped.xml: $(storage_engines_SOURCES) +storage-engines-remprepped.xml: $(storage_engines_SOURCES) + +stored_procedures_INCLUDES = \ + ../common/fixedchars.ent +stored_procedures_IMAGES = +stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES) +stored-procedures-prepped.xml: $(stored_procedures_SOURCES) +stored-procedures-manprepped.xml: $(stored_procedures_SOURCES) +stored-procedures-remprepped.xml: $(stored_procedures_SOURCES) + +triggers_INCLUDES = \ + ../common/fixedchars.ent +triggers_IMAGES = +triggers_SOURCES = triggers.xml $(triggers_INCLUDES) +triggers-prepped.xml: $(triggers_SOURCES) +triggers-manprepped.xml: $(triggers_SOURCES) +triggers-remprepped.xml: $(triggers_SOURCES) + +tutorial_INCLUDES = \ + ../common/fixedchars.ent +tutorial_IMAGES = +tutorial_SOURCES = tutorial.xml $(tutorial_INCLUDES) +tutorial-prepped.xml: $(tutorial_SOURCES) +tutorial-manprepped.xml: $(tutorial_SOURCES) +tutorial-remprepped.xml: $(tutorial_SOURCES) + +using_mysql_programs_INCLUDES = \ + ../common/fixedchars.ent +using_mysql_programs_IMAGES = +using_mysql_programs_SOURCES = using-mysql-programs.xml $(using_mysql_programs_INCLUDES) +using-mysql-programs-prepped.xml: $(using_mysql_programs_SOURCES) +using-mysql-programs-manprepped.xml: $(using_mysql_programs_SOURCES) +using-mysql-programs-remprepped.xml: $(using_mysql_programs_SOURCES) + +views_INCLUDES = \ + ../common/fixedchars.ent +views_IMAGES = +views_SOURCES = views.xml $(views_INCLUDES) +views-prepped.xml: $(views_SOURCES) +views-manprepped.xml: $(views_SOURCES) +views-remprepped.xml: $(views_SOURCES) + Modified: trunk/refman-common/Makefile =================================================================== --- trunk/refman-common/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/refman-common/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 2, Lines Added: 9, Lines Deleted: 31; 2967 bytes @@ -35,38 +35,12 @@ # We also build the connector sections as separate docs, so list dependencies # for them as well. -depend:: connector-j.depend +DEPEND_FILES = \ + connector-j.xml \ + connector-mxj.xml \ + connector-net.xml \ + connector-odbc.xml -CONNECTOR_J_SRCS_EXTRA = ../common/fixedchars.ent urls.ent - -CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) connector-j.xml - -connector-j-prepped.xml: $(CONNECTOR_J_SRCS) - -depend:: connector-mxj.depend - -CONNECTOR_MXJ_SRCS_EXTRA = ../common/fixedchars.ent urls.ent - -CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) connector-mxj.xml images/cmxj-overview.png - -connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS) - -depend:: connector-net.depend - -CONNECTOR_NET_SRCS_EXTRA = ../common/fixedchars.ent urls.ent - -CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) connector-net.xml images/cnet-win-install-step1.png images/cnet-win-install-step2.png images/cnet-win-install-step3.png images/cnet-win-install-step4.png images/cnet-win-install-step6.png - -connector-net-prepped.xml: $(CONNECTOR_NET_SRCS) - -depend:: connector-odbc.depend - -CONNECTOR_ODBC_SRCS_EXTRA = ../common/fixedchars.ent urls.ent - -CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) connector-odbc.xml images/myaccess-odbc.png images/myaccess.png images/myarchitecture.png images/myflowchart.png images/myodbc-crystal-1.png images/myodbc-crystal-2.png images/myodbc-crystal-3.png images/myodbc-crystal-4.png images/myodbc-crystal-5.png images/myodbc-crystal-6.png images/myodbc-excel-step1.png images/myodbc-excel-step2.png images/myodbc-excel-step3.png images/myodbc-excel-step4.png images/myodbc-excel-step5.png images/myodbc-macosx-install-step1.png images/myodbc-macosx-install-step2.png images/myodbc-macosx-install-step3.png images/myodbc-macosx-install-step4.png images/myodbc-macosx-install-step5.png images/myodbc-macosx-install-step6.png images/myodbc-macosx-odbcadmin-adddsn.png images/myodbc-macosx-odbcadmin-main.png images/myodbc-macosx-odbcadmin-sampledsn.png images/myodbc-macosx-odbcadmin-tracing.png images/myodbc-win-install-step1.png images/myodbc-win-install-step2.png images/myodbc-win-install-step! 3.png images/myodbc-win-install-step4.png images/myodbc-win-odbcadmin-adddsn.png images/myodbc-win-odbcadmin-advanced.png images/myodbc-win-odbcadmin-driverselect.png images/myodbc-win-odbcadmin-main.png images/myodbc-win-odbcadmin-options.png images/myodbc-win-odbcadmin-sampledsn.png images/myodbc-win-tracing.png - -connector-odbc-prepped.xml: $(CONNECTOR_ODBC_SRCS) - clean:: $(RM) connector-j.txt $(RM) connector-mxj.txt @@ -98,3 +72,7 @@ include $(MAKE_DIR)/xml-titles include $(MAKE_DIR)/xml-depend include $(MAKE_DIR)/xml-listing + +# Import document dependency specifications + +include Makefile.depends Added: trunk/refman-common/Makefile.depends =================================================================== --- trunk/refman-common/Makefile.depends (rev 0) +++ trunk/refman-common/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 122, Lines Deleted: 0; 4696 bytes @@ -0,0 +1,122 @@ +connector_j_INCLUDES = \ + ../common/fixedchars.ent +connector_j_IMAGES = +connector_j_SOURCES = connector-j.xml $(connector_j_INCLUDES) +connector-j-prepped.xml: $(connector_j_SOURCES) +connector-j-manprepped.xml: $(connector_j_SOURCES) +connector-j-remprepped.xml: $(connector_j_SOURCES) + +connector_mxj_INCLUDES = \ + ../common/fixedchars.ent\ + images/cmxj-overview.png +connector_mxj_IMAGES = \ + images/cmxj-overview.png +connector_mxj_SOURCES = connector-mxj.xml $(connector_mxj_INCLUDES) +connector-mxj-prepped.xml: $(connector_mxj_SOURCES) +connector-mxj-manprepped.xml: $(connector_mxj_SOURCES) +connector-mxj-remprepped.xml: $(connector_mxj_SOURCES) + +connector_net_INCLUDES = \ + ../common/fixedchars.ent\ + images/cnet-win-install-step1.png\ + images/cnet-win-install-step2.png\ + images/cnet-win-install-step3.png\ + images/cnet-win-install-step4.png +connector_net_IMAGES = \ + images/cnet-win-install-step1.png\ + images/cnet-win-install-step2.png\ + images/cnet-win-install-step3.png\ + images/cnet-win-install-step4.png +connector_net_SOURCES = connector-net.xml $(connector_net_INCLUDES) +connector-net-prepped.xml: $(connector_net_SOURCES) +connector-net-manprepped.xml: $(connector_net_SOURCES) +connector-net-remprepped.xml: $(connector_net_SOURCES) + +connector_odbc_INCLUDES = \ + ../common/fixedchars.ent\ + images/myaccess-odbc.png\ + images/myaccess.png\ + images/myarchitecture.png\ + images/myflowchart.png\ + images/myodbc-crystal-1.png\ + images/myodbc-crystal-2.png\ + images/myodbc-crystal-3.png\ + images/myodbc-crystal-4.png\ + images/myodbc-crystal-5.png\ + images/myodbc-crystal-6.png\ + images/myodbc-excel-step1.png\ + images/myodbc-excel-step2.png\ + images/myodbc-excel-step3.png\ + images/myodbc-excel-step4.png\ + images/myodbc-excel-step5.png\ + images/myodbc-link-step1.png\ + images/myodbc-link-step3.png\ + images/myodbc-link-step4.png\ + images/myodbc-link-step5.png\ + images/myodbc-macosx-install-step1.png\ + images/myodbc-macosx-install-step2.png\ + images/myodbc-macosx-install-step3.png\ + images/myodbc-macosx-install-step4.png\ + images/myodbc-macosx-install-step5.png\ + images/myodbc-macosx-install-step6.png\ + images/myodbc-macosx-odbcadmin-adddsn.png\ + images/myodbc-macosx-odbcadmin-main.png\ + images/myodbc-macosx-odbcadmin-sampledsn.png\ + images/myodbc-macosx-odbcadmin-tracing.png\ + images/myodbc-win-install-step1.png\ + images/myodbc-win-install-step2.png\ + images/myodbc-win-install-step3.png\ + images/myodbc-win-install-step4.png\ + images/myodbc-win-odbcadmin-adddsn.png\ + images/myodbc-win-odbcadmin-advanced.png\ + images/myodbc-win-odbcadmin-driverselect.png\ + images/myodbc-win-odbcadmin-main.png\ + images/myodbc-win-odbcadmin-options.png\ + images/myodbc-win-odbcadmin-sampledsn.png\ + images/myodbc-win-tracing.png +connector_odbc_IMAGES = \ + images/myaccess-odbc.png\ + images/myaccess.png\ + images/myarchitecture.png\ + images/myflowchart.png\ + images/myodbc-crystal-1.png\ + images/myodbc-crystal-2.png\ + images/myodbc-crystal-3.png\ + images/myodbc-crystal-4.png\ + images/myodbc-crystal-5.png\ + images/myodbc-crystal-6.png\ + images/myodbc-excel-step1.png\ + images/myodbc-excel-step2.png\ + images/myodbc-excel-step3.png\ + images/myodbc-excel-step4.png\ + images/myodbc-excel-step5.png\ + images/myodbc-link-step1.png\ + images/myodbc-link-step3.png\ + images/myodbc-link-step4.png\ + images/myodbc-link-step5.png\ + images/myodbc-macosx-install-step1.png\ + images/myodbc-macosx-install-step2.png\ + images/myodbc-macosx-install-step3.png\ + images/myodbc-macosx-install-step4.png\ + images/myodbc-macosx-install-step5.png\ + images/myodbc-macosx-install-step6.png\ + images/myodbc-macosx-odbcadmin-adddsn.png\ + images/myodbc-macosx-odbcadmin-main.png\ + images/myodbc-macosx-odbcadmin-sampledsn.png\ + images/myodbc-macosx-odbcadmin-tracing.png\ + images/myodbc-win-install-step1.png\ + images/myodbc-win-install-step2.png\ + images/myodbc-win-install-step3.png\ + images/myodbc-win-install-step4.png\ + images/myodbc-win-odbcadmin-adddsn.png\ + images/myodbc-win-odbcadmin-advanced.png\ + images/myodbc-win-odbcadmin-driverselect.png\ + images/myodbc-win-odbcadmin-main.png\ + images/myodbc-win-odbcadmin-options.png\ + images/myodbc-win-odbcadmin-sampledsn.png\ + images/myodbc-win-tracing.png +connector_odbc_SOURCES = connector-odbc.xml $(connector_odbc_INCLUDES) +connector-odbc-prepped.xml: $(connector_odbc_SOURCES) +connector-odbc-manprepped.xml: $(connector_odbc_SOURCES) +connector-odbc-remprepped.xml: $(connector_odbc_SOURCES) + Modified: trunk/sample-data/sakila/Makefile =================================================================== --- trunk/sample-data/sakila/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/sample-data/sakila/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1218 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . -IDMAP_SRCS = $(SAKILA_SRCS) +IDMAP_SRCS = $(sakila_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = sakila.xml -depend:: sakila.depend +# TODO: FIX +sakila-prepped.xml: $(IDMAP_OBJS) -SAKILA_SRCS_EXTRA = sakila.ent - -SAKILA_SRCS = $(SAKILA_SRCS_EXTRA) sakila.xml changelog.xml copyright.xml images/sakila-schema.png legalnotice.en.xml - -sakila-prepped.xml: $(SAKILA_SRCS) $(IDMAP_OBJS) - clean:: $(RM) sakila.txt @@ -69,3 +63,7 @@ include $(MAKE_DIR)/xml-toc include $(MAKE_DIR)/xml-txt include $(MAKE_DIR)/xml-depend + +# Import document dependency specifications + +include Makefile.depends Added: trunk/sample-data/sakila/Makefile.depends =================================================================== --- trunk/sample-data/sakila/Makefile.depends (rev 0) +++ trunk/sample-data/sakila/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 35, Lines Deleted: 0; 1389 bytes @@ -0,0 +1,35 @@ +changelog_INCLUDES = +changelog_IMAGES = +changelog_SOURCES = changelog.xml $(changelog_INCLUDES) +changelog-prepped.xml: $(changelog_SOURCES) +changelog-manprepped.xml: $(changelog_SOURCES) +changelog-remprepped.xml: $(changelog_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +sakila_INCLUDES = \ + changelog.xml\ + copyright.xml\ + images/sakila-schema.png\ + legalnotice.en.xml\ + sakila.ent +sakila_IMAGES = \ + images/sakila-schema.png +sakila_SOURCES = sakila.xml $(sakila_INCLUDES) +sakila-prepped.xml: $(sakila_SOURCES) +sakila-manprepped.xml: $(sakila_SOURCES) +sakila-remprepped.xml: $(sakila_SOURCES) + Modified: trunk/sample-data/world/Makefile =================================================================== --- trunk/sample-data/world/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/sample-data/world/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1192 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . -IDMAP_SRCS = $(WORLD_SETUP_SRCS) +IDMAP_SRCS = $(world_setup_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = world-setup.xml -depend:: world-setup.depend +# TODO: FIX +world-setup-prepped.xml: $(IDMAP_OBJS) -WORLD_SETUP_SRCS_EXTRA = - -WORLD_SETUP_SRCS = $(WORLD_SETUP_SRCS_EXTRA) world-setup.xml - -world-setup-prepped.xml: $(WORLD_SETUP_SRCS) $(IDMAP_OBJS) - clean:: $(RM) world-setup.txt @@ -69,3 +63,7 @@ include $(MAKE_DIR)/xml-toc include $(MAKE_DIR)/xml-txt include $(MAKE_DIR)/xml-depend + +# Import document dependency specifications + +include Makefile.depends Added: trunk/sample-data/world/Makefile.depends =================================================================== --- trunk/sample-data/world/Makefile.depends (rev 0) +++ trunk/sample-data/world/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 7, Lines Deleted: 0; 541 bytes @@ -0,0 +1,7 @@ +world_setup_INCLUDES = +world_setup_IMAGES = +world_setup_SOURCES = world-setup.xml $(world_setup_INCLUDES) +world-setup-prepped.xml: $(world_setup_SOURCES) +world-setup-manprepped.xml: $(world_setup_SOURCES) +world-setup-remprepped.xml: $(world_setup_SOURCES) + Modified: trunk/tools/de-title-entityize.pl =================================================================== --- trunk/tools/de-title-entityize.pl 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/tools/de-title-entityize.pl 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 0, Lines Deleted: 3; 579 bytes @@ -39,9 +39,6 @@ # After converting the title entity references, remove the lines # from DOCTYPE declarations that refer to the title entities file. -# You may also need to update the _SRCS_EXTRA dependency line in the -# Makefile to name the urls.ent file rather than the titles.en.ent -# file. # Who-to-blame: # Paul DuBois Added: trunk/tools/xmldepend-post.pl =================================================================== --- trunk/tools/xmldepend-post.pl (rev 0) +++ trunk/tools/xmldepend-post.pl 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 113, Lines Deleted: 0; 3581 bytes @@ -0,0 +1,113 @@ +#! /usr/bin/perl -w +# vim:set ts=2 sw=2 expandtab: + +# xmldepend-post.pl - postprocess output of xmldepend.pl into a format +# suitable for use in Makefile. + +# Syntax: xmldepend-post.pl options [file] +# Raw dependency information list should be present on stdin or in the +# named file. + +# Strips input of lines that do not correspond to .xml files in the +# current directory. For each remaining line, produces several output +# lines. Suppose the initial filename is abc.xml. Output will be: +# abc_INCLUDES = <list of files included by abc.xml> +# abc_IMAGES = <list of image files included by abc.xml> +# abc_SOURCES = <list of all sources for abc.xml, including itself> +# Dashes in the filename become underscores in the variable names. +# +# In addition, if the --target-list option specifies a list of target +# suffixes, a line is written making each abc<suffix> dependent on +# $(abc_SOURCES). + +# Paul DuBois +# paul@stripped +# 2007-04-17 + +use strict; + +use Getopt::Long; +$Getopt::Long::ignorecase = 0; # options are case sensitive +$Getopt::Long::bundling = 1; # allow short options to be bundled + +my $XMLDEPEND_POST_VERSION = "1.00"; +my $prog_name = "xmldepend-post.pl"; + +# ---------------------------------------------------------------------- + +# Begin main program + +my $usage = <<EOF; +Usage: $prog_name [options] [file] + +Options: +--help, -h + Print this message +--target-list=suffix[,suffix]... + List target types to be made dependent on files named in input + (e.g., --target-list=-prepped.xml causes abc-prepped.xml to be + made dependent on the sources for abc.xml) +--version, -V + Show version information and exit +EOF + +# Variables for command line options +my $help; +my $target_list; +my $show_version; + +GetOptions ( + "help|h" => \$help, # print help message + "target-list|T=s" => \$target_list, # target types + "version|V" => \$show_version, # show version info +) or do { print "$usage\n"; exit (1); }; + +if (defined ($help)) +{ + print "$usage\n"; + exit (0); +} + +if (defined ($show_version)) +{ + print "$prog_name $XMLDEPEND_POST_VERSION\n"; + exit (0); +} + +my @target_list = split(/,/, $target_list); + +while (<>) +{ + my (@files, $file, $base, $base_under); + + chomp; + @files = split(/\s+/, $_); + $file = shift (@files); + # skip files except those in current directory with .xml suffix + next unless $file !~ m|/| && $file =~ /\.xml$/; + $base = $file; + $base =~ s/\.xml$//; + ($base_under = $base) =~ s/-/_/g; + # produce variable definition for all included files + define_variable ($base_under . "_INCLUDES", @files); + # produce variable definition for included image files + define_variable ($base_under . "_IMAGES", + grep { $_ =~ /\.(png|gif|jpg|jpeg)/ } @files); + # produce variable definition for all source files + print "${base_under}_SOURCES = $file \$(${base_under}_INCLUDES)\n"; + # produce dependencies for target types given in --target-list + foreach my $suffix (@target_list) + { + print "$base$suffix: \$(${base_under}_SOURCES)\n"; + } + print "\n"; +} + +sub define_variable +{ +my ($var, @files) = @_; + + print "$var ="; + print " \\\n\t", join ("\\\n\t", @files) if @files; + print "\n"; +} Property changes on: trunk/tools/xmldepend-post.pl ___________________________________________________________________ Name: svn:executable + * Added: trunk/tools/xmldepend.pl =================================================================== --- trunk/tools/xmldepend.pl (rev 0) +++ trunk/tools/xmldepend.pl 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 367, Lines Deleted: 0; 12314 bytes @@ -0,0 +1,367 @@ +#! /usr/bin/perl -w +# vim:set ts=2 sw=2 expandtab: + +# xmldepend.pl - read XML document, generate dependencies + +# Usage: xmldepend.pl file ... + +# Dependencies are defined as: +# - Files named in <xi:xinclude> elements. These must be traversed to +# find any subdependencies, unless parse attribute is "text". +# - Files named by the fileref attribute of any other element. +# - Files named via <!ENTITY> declarations. + +# The output consists of line line per file among all those named on +# the command line or found to be referenced by them. Each line +# contains a filename followed by the names of all files that it +# refers to (either directly or indirectly via files that the file +# refers to) If a file refers to no other files, it is the only name +# on the line. +# Example: Suppose that test1.xml includes image1.png, test2.xml, and +# test3.xml, and that test3.xml includes text4.xml. The output will look +# like this: +# test1.xml image1.png test2.xml test3.xml test4.xml +# test2.xml +# test3.xml test4.xml +# test4.xml + +# The referring file is always first on an output line. The order of the +# referenced files that follow it is undefined. + +# If no files are named on the command line, no output is produced. + +# The output is deliberately generic and likely must be reformatted to +# be useful in a given context such as a Makefile or Ant build file. + +# Assumptions/restrictions: +# - XInclude elements are named xi:include. +# - All referenced files are local, not remote. +# - Entity declarations that name files file are written a certain way +# (see parse_entity_file() below). +# - Files referenced via entity references contain only other entity +# references. That is, they are included into the DOCTYPE declaration, +# not into the document body. + +# To do: +# - Convert the call to XIncluder->new() to take a hash. Add verbose option. + +# Who-to-blame: +# Paul DuBois +# paul@stripped +# 2007-04-14 + +use strict; +use XML::Parser::PerlSAX; + +my $XMLDEPEND_VERSION = "1.00"; +my $prog_name = "xmldepend.pl"; + +# ---------------------------------------------------------------------- + +# Begin main program + +# Map of dependencies. Pass a reference to this map to every invocation +# of the parser so that any shared dependencies among input files will be +# merged and appear only once in the output. + +my %deps = (); + +# Flags to track dependency expansion after parsing and before output. + +my %expanded = (); + +# Parse input files + +my $parser = XML::Parser::PerlSAX->new (); + +foreach my $file (@ARGV) +{ + my $xi_handler = XIncluder->new ($file, \%deps); + + # The same handler is used for the document handler and the DTD handler. + # This appears to be allowable because for the XML::Parser::PerlSAX object, + # the standard method names for the two handlers do not overlap. Doing + # things this way has the significant advantage that document and DTD + # processing can share internal state. + + $parser->parse ( + Handler => $xi_handler, + DTDHandler => $xi_handler, + EntityResolver => $xi_handler, + Source => { SystemId => $file } + ); +} + +# At this point, $deps{$file}, for each file, contains only those files +# that are directly referenced by $file, and not any files referenced +# indirectly through *those* files. Expand all the dependency lists to +# include indirectly referenced files. + +foreach my $file (keys (%deps)) +{ + expand_deps ($file); +} + +# Write dependency information: +# - One line for each file named on the command line or referenced by them. +# - Each line lists a file followed by all files referenced by (included +# within) that file. + +binmode (STDOUT, ":utf8"); +foreach my $file (sort (keys (%deps))) +{ + my @deps = sort (keys (%{$deps{$file}})); + print $file; + print " ", join (" ", @deps) if @deps; + print "\n"; +} + +# Expand the dependencies for a file to include all indirectly referenced +# files, not just directly referenced files. + +sub expand_deps +{ +my $parent = $_[0]; + + return if $expanded{$parent}; + # Look through each child (directly referenced file) and add its own + # dependencies to those of the parent. + foreach my $child (keys (%{$deps{$parent}})) + { + # recurse for any as-yet-unexpanded child file + expand_deps ($child) unless $expanded{$child}; + # add the child's children to the deps of its parent + foreach my $grandchild (keys (%{$deps{$child}})) + { + $deps{$parent}->{$grandchild} = 1; + } + } + $expanded{$parent} = 1; +} + +# ---------------------------------------------------------------------- + +# This module provides a handler object for XML::Parser::PerlSAX. + +# The document start_element handler takes these actions: +# - For <xi:include> elements, the href attribute (required) indicates the +# included file, and the parse attribute (optional) indicates whether it +# is an XML or text file (default: XML). Add the file as a dependency +# for the current file. If it is an XML file, recursively process it to +# find any further dependencies. (Check the file_stack to detect circular +# inclusion loops.) +# - For elements with a fileref attribute, add the attribute value as a +# dependency for the current file. +# The DTD entity_decl handler takes these actions: +# - Adds entity files as dependencies for the current file. +# - Reads entity files, recursively if necessary, looking for further +# entity file references, adding them as dependencies as well. + +# Referenced files are interpreted relative to the directory in which the +# current file is located, unless the referenced file is given as an +# absolute pathname. + +package XIncluder; + +use File::Basename; +use IO::File; + +sub new +{ +my $class = shift; +my $file = shift; # file to be parsed (needed to initialize file_stack) +my $deps = shift; # current dependency map +my $self = {}; + + # List of files currently being processed; used to detect circular + # references. This can be circumvented by use of different paths + # to the same file, but simple checks are better than none. + # The current file is always $self->{file_stack}[-1], the file at + # the top of the stack. + $self->{file_stack} = [ $file ]; + + # Map of dependencies. Each key is a filename; its value is a hash that + # names other files on which the key file depends. (A hash is used for + # the value because it's easier to eliminate duplicates.) + $self->{deps} = $deps; + # Start an entry for this file so that it shows up in the output even + # if there are no dependent files. + $self->{deps}->{$file} = {} unless exists $self->{deps}->{$file}; + + # Bless hash into an object of the class + return bless ($self, $class); +} + +sub start_element +{ +my ($self, $elt) = @_; + + if ($elt->{Name} eq "xi:include") + { + my $file = $elt->{Attributes}->{href}; + my $parse = $elt->{Attributes}->{parse} || "xml"; + + die "Missing href attribute in <xi:include>\n" unless defined $file; + $file = $self->relativize ($file); + if (exists $self->{deps}->{$file}) + { + #warn "skipping $file, already read\n"; + return; + } + + if ($parse eq "xml") + { + #warn "XInclude XML $file\n"; + $self->add_dependency ($file); + die "Circular inclusion reference to $file\n" + if grep { $_ eq $file } @{$self->{file_stack}}; + push (@{$self->{file_stack}}, $file); + XML::Parser::PerlSAX->new->parse ( + # Process a new file, but use myself to do it + Handler => $self, + DTDHandler => $self, + EntityResolver => $self, + Source => { SystemId => $file } + ); + pop (@{$self->{file_stack}}); + } + elsif ($parse eq "text") + { + #warn "XInclude text $file\n"; + $self->add_dependency ($file); + } + else + { + die "Illegal parse attribute ($parse) in <xi:include> element\n"; + } + } + elsif ($elt->{Attributes}->{fileref}) + { + my $file = $self->relativize ($elt->{Attributes}->{fileref}); + + #warn "Reference to $file\n"; + $self->add_dependency ($file); + } +} + +sub entity_decl +{ +my ($self, $evt) = @_; +my $systemid = $evt->{SystemId}; + + return unless defined $systemid; + $systemid = $self->relativize ($systemid); + $self->add_dependency ($systemid); + $self->parse_entity_file ($systemid) +} + +# Helper methods for handler class. +# Note: These method names do not clash with the documented +# names for XML::Parser::PerlSAX object handler methods. + +# XIncluded filenames should be interpreted relative to the location of +# the including file. Given the name of a file referenced from within the +# current file, return the referenced file prefixed with the directory +# containing the current file (unless the referenced file is an absolute +# pathname). Examples (assume that the current file is "../parent.xml"): + +# relativize ("child.xml") -> "../child.xml" +# relativize ("../child.xml") -> "../../child.xml" +# relativize ("subdir/child.xml") -> "subdir/child.xml" +# relativize ("/tmp/child.xml") -> "/tmp/child.xml" + +sub relativize +{ +my $self = shift; +my $child = shift; +my $curfile = $self->{file_stack}[-1]; +my $dir = dirname ($curfile); + + $child = $dir . "/" . $child unless $dir eq "." || $child =~ m|^/|; + return $child; +} + +# Add argument file as dependency for the current file. + +# This also start a deps entry for the argument (with no dependencies), +# which serves to record that the file has been seen. That way, the file +# can be skipped without reading it if it's seen again later. + +# If the dependency does not exit, try to use make to create it. +# This handles the case that the document refers to files that might +# need to be dynamically generated and do not necessarily exist when +# dependencies need to be generated. + +sub add_dependency +{ +my $self = shift; +my $child = shift; +my $curfile = $self->{file_stack}[-1]; + + #warn "$curfile depends on $child\n"; + # Initialize curfile dependencies to empty hash if necessary + $self->{deps}->{$curfile} = {} unless exists $self->{deps}->{$curfile}; + # Add child as dependency of curfile (eliminating duplicates) + $self->{deps}->{$curfile}->{$child} = 1; + # Start empty entry for child if none exists yet + $self->{deps}->{$child} = {} unless exists $self->{deps}->{$child}; + # Try to create child if it does not exist; send stdout to stderr + if (! -e $child) + { + my ($file, $dir) = fileparse ($child); + my $cmd = "make -C $dir $file 1>&2"; + warn "$file does not exist:\n"; + warn "attempting to create with \"$cmd\"\n"; + (system ($cmd) & 127) == 0 or die "Command failed: $cmd\n"; + } +} + +# Parse a file named as an entity, looking for further entity file +# references. Handle nested files references by recursing. +# Assumption: Entity file references are written this way: +# <!ENTITY ... SYSTEM "file_name"> + +# I suppose that it would be better to use DTDHandler methods for +# XML::Parser::PerlSAX, except that I've been able to figure out how +# to make that work. I suspect the support for DTD parsing to be +# incomplete. + +# Note: Just because an entity file reference is defined does not mean +# that the file contents is used. Strictly speaking, the reference is +# not a dependency unless it is used, but it simplifies parsing here +# to assume that if the file reference is defined it will also be used. + +sub parse_entity_file +{ +my ($self, $file) = @_; +my $fh; + + if (exists $self->{deps}->{$file}) + { + #warn "skipping $file, already read\n"; + return; + } + #warn "Parse entity file $file\n"; + die "Circular inclusion reference to $file\n" + if grep { $_ eq $file } @{$self->{file_stack}}; + push (@{$self->{file_stack}}, $file); + $fh = IO::File->new ($file, "r"); + binmode ($fh, ":utf8"); + while (defined ($_ = <$fh>)) + { + chomp; + # Assumption: attributes are quoted with " and not ' here + if (/<!ENTITY\s+\%\s*\S+\s+SYSTEM\s+"([^"]*)"\s*>/) + { + my $entfile = $self->relativize ($1); + + $self->add_dependency ($entfile); + #warn "Nested entity file $entfile\n"; + $self->parse_entity_file ($entfile); + } + } + $fh->close (); + pop (@{$self->{file_stack}}); +} + +1; Property changes on: trunk/tools/xmldepend.pl ___________________________________________________________________ Name: svn:executable + * Modified: trunk/userguide/Makefile =================================================================== --- trunk/userguide/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/userguide/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1711 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../refman-5.1 ../refman-common -IDMAP_SRCS = $(USERGUIDE_SRCS) +IDMAP_SRCS = $(userguide_SOURCES) IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = userguide.xml -depend:: userguide.depend +# TODO: FIX +userguide-prepped.xml: $(IDMAP_OBJS) -USERGUIDE_SRCS_EXTRA = ../common/fixedchars.ent - -USERGUIDE_SRCS = $(USERGUIDE_SRCS_EXTRA) userguide.xml configuring.xml copyright.xml creating.xml disaster.xml dotnet.xml excel-mysql.xml glossary.xml images/indexing-displaying-administrator.png images/logfiles-slow-query-log-administrator-settings.png images/logfiles-slow-query-log-administrator-view.png indexing.xml installing.xml introduction.xml java.xml legalnotice.en.xml logfiles.xml modifying.xml php-mysqli.xml populating.xml querying.xml security.xml storage-engines.xml stored-procedures.xml tools-tricks.xml views.xml - -userguide-prepped.xml: $(USERGUIDE_SRCS) $(IDMAP_OBJS) - # Import standard target rules include $(MAKE_DIR)/xml-valid @@ -60,3 +54,7 @@ include $(MAKE_DIR)/xml-txt #include $(MAKE_DIR)/xml-info include $(MAKE_DIR)/xml-depend + +# Import document dependency specifications + +include Makefile.depends Added: trunk/userguide/Makefile.depends =================================================================== --- trunk/userguide/Makefile.depends (rev 0) +++ trunk/userguide/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 198, Lines Deleted: 0; 6905 bytes @@ -0,0 +1,198 @@ +configuring_INCLUDES = +configuring_IMAGES = +configuring_SOURCES = configuring.xml $(configuring_INCLUDES) +configuring-prepped.xml: $(configuring_SOURCES) +configuring-manprepped.xml: $(configuring_SOURCES) +configuring-remprepped.xml: $(configuring_SOURCES) + +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +creating_INCLUDES = +creating_IMAGES = +creating_SOURCES = creating.xml $(creating_INCLUDES) +creating-prepped.xml: $(creating_SOURCES) +creating-manprepped.xml: $(creating_SOURCES) +creating-remprepped.xml: $(creating_SOURCES) + +disaster_INCLUDES = +disaster_IMAGES = +disaster_SOURCES = disaster.xml $(disaster_INCLUDES) +disaster-prepped.xml: $(disaster_SOURCES) +disaster-manprepped.xml: $(disaster_SOURCES) +disaster-remprepped.xml: $(disaster_SOURCES) + +dotnet_INCLUDES = +dotnet_IMAGES = +dotnet_SOURCES = dotnet.xml $(dotnet_INCLUDES) +dotnet-prepped.xml: $(dotnet_SOURCES) +dotnet-manprepped.xml: $(dotnet_SOURCES) +dotnet-remprepped.xml: $(dotnet_SOURCES) + +excel_mysql_INCLUDES = \ + ../common/fixedchars.ent +excel_mysql_IMAGES = +excel_mysql_SOURCES = excel-mysql.xml $(excel_mysql_INCLUDES) +excel-mysql-prepped.xml: $(excel_mysql_SOURCES) +excel-mysql-manprepped.xml: $(excel_mysql_SOURCES) +excel-mysql-remprepped.xml: $(excel_mysql_SOURCES) + +glossary_INCLUDES = +glossary_IMAGES = +glossary_SOURCES = glossary.xml $(glossary_INCLUDES) +glossary-prepped.xml: $(glossary_SOURCES) +glossary-manprepped.xml: $(glossary_SOURCES) +glossary-remprepped.xml: $(glossary_SOURCES) + +indexing_INCLUDES = \ + images/indexing-displaying-administrator.png +indexing_IMAGES = \ + images/indexing-displaying-administrator.png +indexing_SOURCES = indexing.xml $(indexing_INCLUDES) +indexing-prepped.xml: $(indexing_SOURCES) +indexing-manprepped.xml: $(indexing_SOURCES) +indexing-remprepped.xml: $(indexing_SOURCES) + +installing_INCLUDES = +installing_IMAGES = +installing_SOURCES = installing.xml $(installing_INCLUDES) +installing-prepped.xml: $(installing_SOURCES) +installing-manprepped.xml: $(installing_SOURCES) +installing-remprepped.xml: $(installing_SOURCES) + +introduction_INCLUDES = +introduction_IMAGES = +introduction_SOURCES = introduction.xml $(introduction_INCLUDES) +introduction-prepped.xml: $(introduction_SOURCES) +introduction-manprepped.xml: $(introduction_SOURCES) +introduction-remprepped.xml: $(introduction_SOURCES) + +java_INCLUDES = +java_IMAGES = +java_SOURCES = java.xml $(java_INCLUDES) +java-prepped.xml: $(java_SOURCES) +java-manprepped.xml: $(java_SOURCES) +java-remprepped.xml: $(java_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +logfiles_INCLUDES = \ + images/logfiles-slow-query-log-administrator-settings.png\ + images/logfiles-slow-query-log-administrator-view.png +logfiles_IMAGES = \ + images/logfiles-slow-query-log-administrator-settings.png\ + images/logfiles-slow-query-log-administrator-view.png +logfiles_SOURCES = logfiles.xml $(logfiles_INCLUDES) +logfiles-prepped.xml: $(logfiles_SOURCES) +logfiles-manprepped.xml: $(logfiles_SOURCES) +logfiles-remprepped.xml: $(logfiles_SOURCES) + +modifying_INCLUDES = +modifying_IMAGES = +modifying_SOURCES = modifying.xml $(modifying_INCLUDES) +modifying-prepped.xml: $(modifying_SOURCES) +modifying-manprepped.xml: $(modifying_SOURCES) +modifying-remprepped.xml: $(modifying_SOURCES) + +php_mysqli_INCLUDES = +php_mysqli_IMAGES = +php_mysqli_SOURCES = php-mysqli.xml $(php_mysqli_INCLUDES) +php-mysqli-prepped.xml: $(php_mysqli_SOURCES) +php-mysqli-manprepped.xml: $(php_mysqli_SOURCES) +php-mysqli-remprepped.xml: $(php_mysqli_SOURCES) + +populating_INCLUDES = +populating_IMAGES = +populating_SOURCES = populating.xml $(populating_INCLUDES) +populating-prepped.xml: $(populating_SOURCES) +populating-manprepped.xml: $(populating_SOURCES) +populating-remprepped.xml: $(populating_SOURCES) + +querying_INCLUDES = +querying_IMAGES = +querying_SOURCES = querying.xml $(querying_INCLUDES) +querying-prepped.xml: $(querying_SOURCES) +querying-manprepped.xml: $(querying_SOURCES) +querying-remprepped.xml: $(querying_SOURCES) + +security_INCLUDES = +security_IMAGES = +security_SOURCES = security.xml $(security_INCLUDES) +security-prepped.xml: $(security_SOURCES) +security-manprepped.xml: $(security_SOURCES) +security-remprepped.xml: $(security_SOURCES) + +storage_engines_INCLUDES = +storage_engines_IMAGES = +storage_engines_SOURCES = storage-engines.xml $(storage_engines_INCLUDES) +storage-engines-prepped.xml: $(storage_engines_SOURCES) +storage-engines-manprepped.xml: $(storage_engines_SOURCES) +storage-engines-remprepped.xml: $(storage_engines_SOURCES) + +stored_procedures_INCLUDES = +stored_procedures_IMAGES = +stored_procedures_SOURCES = stored-procedures.xml $(stored_procedures_INCLUDES) +stored-procedures-prepped.xml: $(stored_procedures_SOURCES) +stored-procedures-manprepped.xml: $(stored_procedures_SOURCES) +stored-procedures-remprepped.xml: $(stored_procedures_SOURCES) + +tools_tricks_INCLUDES = +tools_tricks_IMAGES = +tools_tricks_SOURCES = tools-tricks.xml $(tools_tricks_INCLUDES) +tools-tricks-prepped.xml: $(tools_tricks_SOURCES) +tools-tricks-manprepped.xml: $(tools_tricks_SOURCES) +tools-tricks-remprepped.xml: $(tools_tricks_SOURCES) + +userguide_INCLUDES = \ + ../common/fixedchars.ent\ + configuring.xml\ + copyright.xml\ + creating.xml\ + disaster.xml\ + dotnet.xml\ + excel-mysql.xml\ + glossary.xml\ + images/indexing-displaying-administrator.png\ + images/logfiles-slow-query-log-administrator-settings.png\ + images/logfiles-slow-query-log-administrator-view.png\ + indexing.xml\ + installing.xml\ + introduction.xml\ + java.xml\ + legalnotice.en.xml\ + logfiles.xml\ + modifying.xml\ + php-mysqli.xml\ + populating.xml\ + querying.xml\ + security.xml\ + storage-engines.xml\ + stored-procedures.xml\ + tools-tricks.xml\ + views.xml +userguide_IMAGES = \ + images/indexing-displaying-administrator.png\ + images/logfiles-slow-query-log-administrator-settings.png\ + images/logfiles-slow-query-log-administrator-view.png +userguide_SOURCES = userguide.xml $(userguide_INCLUDES) +userguide-prepped.xml: $(userguide_SOURCES) +userguide-manprepped.xml: $(userguide_SOURCES) +userguide-remprepped.xml: $(userguide_SOURCES) + +views_INCLUDES = +views_IMAGES = +views_SOURCES = views.xml $(views_INCLUDES) +views-prepped.xml: $(views_SOURCES) +views-manprepped.xml: $(views_SOURCES) +views-remprepped.xml: $(views_SOURCES) + Modified: trunk/workbench/Makefile =================================================================== --- trunk/workbench/Makefile 2007-04-18 00:03:02 UTC (rev 5939) +++ trunk/workbench/Makefile 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 3, Lines Added: 9, Lines Deleted: 11; 1855 bytes @@ -18,7 +18,7 @@ IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG) IDMAP_REFS = . ../gui-common ../refman-5.1 ../refman-common ../migration-toolkit -IDMAP_SRCS = $(WORKBENCH_SRCS) introduction.xml +IDMAP_SRCS = $(workbench_SOURCES) introduction.xml IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS)) # Import standard variables @@ -31,18 +31,12 @@ include $(MAKE_DIR)/default-target -# Document dependency specifications -# "make depend" updates the _SRCS variable -# Set _SRCS_EXTRA variable by hand to any entity files needed +# Files for which to generate dependencies +DEPEND_FILES = workbench.xml -depend:: workbench.depend +# TODO: FIX +workbench-prepped.xml: $(IDMAP_OBJS) -WORKBENCH_SRCS_EXTRA = ../common/fixedchars.ent ../gui-common/gui-common.ent - -WORKBENCH_SRCS = $(WORKBENCH_SRCS_EXTRA) workbench.xml copyright.xml getting-started.xml ../gui-common/chapter-grt-shell.xml ../gui-common/chapter-table-editor.xml ../gui-common/chapter-uninstall-all.xml ../gui-common/chapter-upgrade-all.xml ../gui-common/images/columneditor.png ../gui-common/images/confirmchanges.png ../gui-common/images/grt-shell.png ../gui-common/images/indexeditor.png ../gui-common/images/tableeditor.png ../gui-common/installation-all.xml ../gui-common/mysql-enterprise.xml ../gui-common/starting-all.xml images/workbench-windows.png legalnotice.en.xml overview.xml reverse-engineering.xml using.xml - -workbench-prepped.xml: $(WORKBENCH_SRCS) $(IDMAP_OBJS) - clean:: $(RM) workbench.txt @@ -67,3 +61,7 @@ # Import directory specific extensions include ../gui-common/Makefile.ext + +# Import document dependency specifications + +include Makefile.depends Added: trunk/workbench/Makefile.depends =================================================================== --- trunk/workbench/Makefile.depends (rev 0) +++ trunk/workbench/Makefile.depends 2007-04-18 01:02:40 UTC (rev 5940) Changed blocks: 1, Lines Added: 84, Lines Deleted: 0; 3219 bytes @@ -0,0 +1,84 @@ +copyright_INCLUDES = +copyright_IMAGES = +copyright_SOURCES = copyright.xml $(copyright_INCLUDES) +copyright-prepped.xml: $(copyright_SOURCES) +copyright-manprepped.xml: $(copyright_SOURCES) +copyright-remprepped.xml: $(copyright_SOURCES) + +getting_started_INCLUDES = \ + ../gui-common/gui-common.ent +getting_started_IMAGES = +getting_started_SOURCES = getting-started.xml $(getting_started_INCLUDES) +getting-started-prepped.xml: $(getting_started_SOURCES) +getting-started-manprepped.xml: $(getting_started_SOURCES) +getting-started-remprepped.xml: $(getting_started_SOURCES) + +legalnotice.en_INCLUDES = \ + copyright.xml +legalnotice.en_IMAGES = +legalnotice.en_SOURCES = legalnotice.en.xml $(legalnotice.en_INCLUDES) +legalnotice.en-prepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-manprepped.xml: $(legalnotice.en_SOURCES) +legalnotice.en-remprepped.xml: $(legalnotice.en_SOURCES) + +overview_INCLUDES = \ + ../common/fixedchars.ent\ + images/workbench-windows.png +overview_IMAGES = \ + images/workbench-windows.png +overview_SOURCES = overview.xml $(overview_INCLUDES) +overview-prepped.xml: $(overview_SOURCES) +overview-manprepped.xml: $(overview_SOURCES) +overview-remprepped.xml: $(overview_SOURCES) + +reverse_engineering_INCLUDES = \ + ../gui-common/gui-common.ent +reverse_engineering_IMAGES = +reverse_engineering_SOURCES = reverse-engineering.xml $(reverse_engineering_INCLUDES) +reverse-engineering-prepped.xml: $(reverse_engineering_SOURCES) +reverse-engineering-manprepped.xml: $(reverse_engineering_SOURCES) +reverse-engineering-remprepped.xml: $(reverse_engineering_SOURCES) + +using_INCLUDES = \ + ../common/fixedchars.ent +using_IMAGES = +using_SOURCES = using.xml $(using_INCLUDES) +using-prepped.xml: $(using_SOURCES) +using-manprepped.xml: $(using_SOURCES) +using-remprepped.xml: $(using_SOURCES) + +workbench_INCLUDES = \ + ../common/fixedchars.ent\ + ../gui-common/../common/fixedchars.ent\ + ../gui-common/chapter-grt-shell.xml\ + ../gui-common/chapter-table-editor.xml\ + ../gui-common/chapter-uninstall-all.xml\ + ../gui-common/chapter-upgrade-all.xml\ + ../gui-common/gui-common.ent\ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/grt-shell.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/tableeditor.png\ + ../gui-common/installation-all.xml\ + ../gui-common/mysql-enterprise.xml\ + ../gui-common/starting-all.xml\ + copyright.xml\ + getting-started.xml\ + images/workbench-windows.png\ + legalnotice.en.xml\ + overview.xml\ + reverse-engineering.xml\ + using.xml +workbench_IMAGES = \ + ../gui-common/images/columneditor.png\ + ../gui-common/images/confirmchanges.png\ + ../gui-common/images/grt-shell.png\ + ../gui-common/images/indexeditor.png\ + ../gui-common/images/tableeditor.png\ + images/workbench-windows.png +workbench_SOURCES = workbench.xml $(workbench_INCLUDES) +workbench-prepped.xml: $(workbench_SOURCES) +workbench-manprepped.xml: $(workbench_SOURCES) +workbench-remprepped.xml: $(workbench_SOURCES) +
| Thread | ||
|---|---|---|
| • svn commit - mysqldoc@docsrva: r5940 - in trunk: . administrator administrator-ro falcon guibook internals make.d migration-toolkit mysqlqb mysqltest ... | paul | 18 Apr |
© 1995-2008 MySQL AB, 2008-2009 Sun Microsystems, Inc.
Page generated in 2.363 sec. using MySQL 5.1.14-beta-log