Author: paul
Date: 2007-05-12 06:05:44 +0200 (Sat, 12 May 2007)
New Revision: 6433
Log:
r24892@polar: paul | 2007-05-11 22:54:26 -0500
Add all document directories to SUBDIRS list, make sure they all
work with the global targets.
Added:
trunk/gui-common-cy/Makefile.depends
trunk/gui-common-ro/Makefile.depends
Modified:
trunk/Makefile
trunk/gui-common-cy/Makefile
trunk/gui-common-ro/Makefile
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24891
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20299
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:24892
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:20299
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:17229
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2007-05-12 04:05:28 UTC (rev 6432)
+++ trunk/Makefile 2007-05-12 04:05:44 UTC (rev 6433)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 7; 1424 bytes
@@ -4,11 +4,14 @@
# Set list of subdirectories
-SUBDIRS = administrator falcon gui-common guibook \
+SUBDIRS = administrator administrator-ro \
+ dynamic-docs falcon \
+ gui-common gui-common-cy gui-common-ro guibook \
internals migration-toolkit mysqldoc-guide \
- mysqlqb mysqltest ndbapi proto-doc query-browser \
+ mysqlqb mysqltest ndbapi proto-doc \
+ query-browser query-browser-cy \
refman-4.1 refman-5.0 refman-5.1 refman-common \
- userguide workbench sample-data/world sample-data/sakila
+ sample-data/world sample-data/sakila userguide workbench
all:
@echo "Documents maintained in this directory generally each"
@@ -23,25 +26,25 @@
idmap:
- @ for dir in $(SUBDIRS); do\
+ @ set -e; for dir in $(SUBDIRS); do\
$(shell echo $(dir) ) \
$(MAKE) -C $$dir idmap; \
done
depend:
- @ for dir in $(SUBDIRS); do\
+ @ set -e; for dir in $(SUBDIRS); do\
$(shell echo $(dir) ) \
$(MAKE) -C $$dir depend; \
done
clean:
- @ for dir in $(SUBDIRS); do\
+ @ set -e; for dir in $(SUBDIRS); do\
$(shell echo $(dir) ) \
$(MAKE) -C $$dir clean; \
done
realclean:
- @ for dir in $(SUBDIRS); do\
+ @ set -e; for dir in $(SUBDIRS); do\
$(shell echo $(dir) ) \
$(MAKE) -C $$dir realclean; \
done
Modified: trunk/gui-common-cy/Makefile
===================================================================
--- trunk/gui-common-cy/Makefile 2007-05-12 04:05:28 UTC (rev 6432)
+++ trunk/gui-common-cy/Makefile 2007-05-12 04:05:44 UTC (rev 6433)
Changed blocks: 2, Lines Added: 6, Lines Deleted: 1; 914 bytes
@@ -17,7 +17,7 @@
IDMAP_MAIN = guibook
IDMAP_URLBASE = $(IDMAP_MAIN)/$(IDMAP_LANG)
-IDMAP_REFS = . ../workbench ../query-browser ../administrator ../migration-toolkit ../refman-5.1 ../refman-common
+IDMAP_REFS = . ../workbench ../query-browser-cy ../administrator ../migration-toolkit ../refman-5.1 ../refman-common
IDMAP_SRCS = $(wildcard *.xml)
IDMAP_OBJS = $(call xmllist_to_idmaplist,$(IDMAP_SRCS))
@@ -34,8 +34,13 @@
clean::
$(RM) guibook.txt
+# Import document dependency specifications
+
+include Makefile.depends
+
# Import standard target rules
include $(MAKE_DIR)/xml-valid
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
+include $(MAKE_DIR)/xml-depend
Added: trunk/gui-common-cy/Makefile.depends
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 110 bytes
Modified: trunk/gui-common-ro/Makefile
===================================================================
--- trunk/gui-common-ro/Makefile 2007-05-12 04:05:28 UTC (rev 6432)
+++ trunk/gui-common-ro/Makefile 2007-05-12 04:05:44 UTC (rev 6433)
Changed blocks: 1, Lines Added: 5, Lines Deleted: 0; 512 bytes
@@ -34,8 +34,13 @@
clean::
$(RM) guibook.txt
+# Import document dependency specifications
+
+include Makefile.depends
+
# Import standard target rules
include $(MAKE_DIR)/xml-valid
include $(MAKE_DIR)/xml-format
include $(MAKE_DIR)/xml-useless
+include $(MAKE_DIR)/xml-depend
Added: trunk/gui-common-ro/Makefile.depends
===================================================================
Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 110 bytes
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r6433 - in trunk: . gui-common-cy gui-common-ro | paul | 12 May |
