svn commit - mysqldoc@docsrva: r4392 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-common

[mcbrown]

Author: mcbrown
Date: 2007-01-08 10:43:04 +0100 (Mon, 08 Jan 2007)
New Revision: 4392

Log:
Updating Makefile for correct connectors build



Modified:
   trunk/refman-4.1/Makefile
   trunk/refman-5.0/Makefile
   trunk/refman-5.1/Makefile
   trunk/refman-common/Makefile


Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2007-01-07 17:54:34 UTC (rev 4391)
+++ trunk/refman-4.1/Makefile	2007-01-08 09:43:04 UTC (rev 4392)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 35; 3027 bytes

@@ -47,41 +47,6 @@
 manual-prepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
 manual-manprepped.xml: $(MANUAL_SRCS) $(IDMAP_OBJS)
 
-# We also build the connector sections as separate docs, so list dependencies
-# for them as well.
-
-depend:: ../refman-common/connector-j.depend
-
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) ../refman-common/connector-j.xml 
-
-connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
-
-depend:: ../refman-common/connector-mxj.depend
-
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) ../refman-common/connector-mxj.xml
images/cmxj-overview.png 
-
-connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
-
-depend:: ../refman-common/connector-net.depend
-
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) ../refman-common/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:: ../refman-common/connector-odbc.depend
-
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) ../refman-common/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-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-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-
 mysql.info: manual.info
 	cp manual.info mysql.info
 


Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2007-01-07 17:54:34 UTC (rev 4391)
+++ trunk/refman-5.0/Makefile	2007-01-08 09:43:04 UTC (rev 4392)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 35; 3014 bytes

@@ -55,41 +55,6 @@
 database-administration.xml: dba-optvars-table.xml
 manual.depend: dba-optvars-table.xml
 
-# We also build the connector sections as separate docs, so list dependencies
-# for them as well.
-
-depend:: ../refman-common/connector-j.depend
-
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) ../refman-common/connector-j.xml 
-
-connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
-
-depend:: ../refman-common/connector-mxj.depend
-
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) ../refman-common/connector-mxj.xml
images/cmxj-overview.png 
-
-connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
-
-depend:: ../refman-common/connector-net.depend
-
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) ../refman-common/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:: ../refman-common/connector-odbc.depend
-
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) ../refman-common/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-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-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-
 mysql.info: manual.info
 	cp manual.info mysql.info
 


Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2007-01-07 17:54:34 UTC (rev 4391)
+++ trunk/refman-5.1/Makefile	2007-01-08 09:43:04 UTC (rev 4392)
Changed blocks: 1, Lines Added: 0, Lines Deleted: 35; 3014 bytes

@@ -53,41 +53,6 @@
 database-administration.xml: dba-optvars-table.xml
 manual.depend: dba-optvars-table.xml
 
-# We also build the connector sections as separate docs, so list dependencies
-# for them as well.
-
-depend:: ../refman-common/connector-j.depend
-
-CONNECTOR_J_SRCS_EXTRA = versions.ent ../common/fixedchars.ent ../refman-common/urls.ent
-
-CONNECTOR_J_SRCS = $(CONNECTOR_J_SRCS_EXTRA) ../refman-common/connector-j.xml 
-
-connector-j-prepped.xml: $(CONNECTOR_J_SRCS)
-
-depend:: ../refman-common/connector-mxj.depend
-
-CONNECTOR_MXJ_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_MXJ_SRCS = $(CONNECTOR_MXJ_SRCS_EXTRA) ../refman-common/connector-mxj.xml
images/cmxj-overview.png 
-
-connector-mxj-prepped.xml: $(CONNECTOR_MXJ_SRCS)
-
-depend:: ../refman-common/connector-net.depend
-
-CONNECTOR_NET_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_NET_SRCS = $(CONNECTOR_NET_SRCS_EXTRA) ../refman-common/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:: ../refman-common/connector-odbc.depend
-
-CONNECTOR_ODBC_SRCS_EXTRA = versions.ent ../common/fixedchars.ent
../refman-common/urls.ent
-
-CONNECTOR_ODBC_SRCS = $(CONNECTOR_ODBC_SRCS_EXTRA) ../refman-common/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-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-prepped.xml: $(CONNECTOR_ODBC_SRCS)
-
 mysql.info: manual.info
 	cp manual.info mysql.info
 


Modified: trunk/refman-common/Makefile
===================================================================
--- trunk/refman-common/Makefile	2007-01-07 17:54:34 UTC (rev 4391)
+++ trunk/refman-common/Makefile	2007-01-08 09:43:04 UTC (rev 4392)
Changed blocks: 1, Lines Added: 56, Lines Deleted: 0; 3619 bytes

@@ -28,12 +28,68 @@
 include $(MAKE_DIR)/vars-shell
 include $(MAKE_DIR)/vars-docbook
 
+# We also build the connector sections as separate docs, so list dependencies
+# for them as well.
+
+depend:: connector-j.depend
+
+CONNECTOR_J_SRCS_EXTRA = versions.ent ../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 = versions.ent ../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 = versions.ent ../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 = versions.ent ../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)
+
 # Import default target rule (causes help message to print)
 
 include $(MAKE_DIR)/default-target
 
 # Import standard target rules
 
+include $(MAKE_DIR)/xml-dynxml
 include $(MAKE_DIR)/xml-valid
 include $(MAKE_DIR)/xml-format
 include $(MAKE_DIR)/xml-useless
+include $(MAKE_DIR)/xml-prep
+include $(MAKE_DIR)/xml-html
+include $(MAKE_DIR)/xml-html-dir
+include $(MAKE_DIR)/xml-html-section
+include $(MAKE_DIR)/xml-html-chapter
+include $(MAKE_DIR)/xml-html-web
+include $(MAKE_DIR)/xml-eclipse
+include $(MAKE_DIR)/xml-chm
+include $(MAKE_DIR)/xml-xhtml-dir
+include $(MAKE_DIR)/xml-pdf
+include $(MAKE_DIR)/xml-toc
+include $(MAKE_DIR)/xml-txt
+include $(MAKE_DIR)/xml-info
+include $(MAKE_DIR)/xml-man
+include $(MAKE_DIR)/xml-help
+include $(MAKE_DIR)/xml-remark
+include $(MAKE_DIR)/xml-titles
+include $(MAKE_DIR)/fragment-files
+include $(MAKE_DIR)/xml-depend
+include $(MAKE_DIR)/xml-listing