Author: paul
Date: 2007-11-29 18:23:02 +0100 (Thu, 29 Nov 2007)
New Revision: 8991
Log:
r33573@arctic: paul | 2007-11-29 11:14:57 -0600
Unify the .idmap-creation commands by being trickier.
Modified:
trunk/make.d/Makefile.ext
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33513
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27548
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22282
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:33573
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:27548
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:22282
Modified: trunk/make.d/Makefile.ext
===================================================================
--- trunk/make.d/Makefile.ext 2007-11-29 17:13:50 UTC (rev 8990)
+++ trunk/make.d/Makefile.ext 2007-11-29 17:23:02 UTC (rev 8991)
Changed blocks: 1, Lines Added: 27, Lines Deleted: 22; 4517 bytes
@@ -1,68 +1,73 @@
# Rules for generating .idmap files that correspond to the .xml
# files in this repository's document directories.
+# Notes for this command: make -C $(subst /metadata,,$(@D)) metadata/$(@F)
+# - $(subst /metadata,,$(@D)) figures out the directory above the metadata
+# directory (this is where the .xml file is located)
+# - metadata/$(@F) is the location of the .idmap file relative to the
+# directory containing the .xml file.
$(REPO_ROOT)/administrator/metadata/%.idmap: $(REPO_ROOT)/administrator/%.xml
- make -C $(REPO_ROOT)/administrator metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/administrator-ro/metadata/%.idmap: $(REPO_ROOT)/administrator-ro/%.xml
- make -C $(REPO_ROOT)/administrator-ro metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/falcon/metadata/%.idmap: $(REPO_ROOT)/falcon/%.xml
- make -C $(REPO_ROOT)/falcon metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/gui-common/metadata/%.idmap: $(REPO_ROOT)/gui-common/%.xml
- make -C $(REPO_ROOT)/gui-common metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/gui-common-cy/metadata/%.idmap: $(REPO_ROOT)/gui-common-cy/%.xml
- make -C $(REPO_ROOT)/gui-common-cy metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/gui-common-ro/metadata/%.idmap: $(REPO_ROOT)/gui-common-ro/%.xml
- make -C $(REPO_ROOT)/gui-common-ro metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/guibook/metadata/%.idmap: $(REPO_ROOT)/guibook/%.xml
- make -C $(REPO_ROOT)/guibook metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/migration-toolkit/metadata/%.idmap: $(REPO_ROOT)/migration-toolkit/%.xml
- make -C $(REPO_ROOT)/migration-toolkit metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/mysqldoc-guide/metadata/%.idmap: $(REPO_ROOT)/mysqldoc-guide/%.xml
- make -C $(REPO_ROOT)/mysqldoc-guide metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/quick-guides/metadata/%.idmap: $(REPO_ROOT)/quick-guides/%.xml
- make -C $(REPO_ROOT)/quick-guides metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/mysqltest/metadata/%.idmap: $(REPO_ROOT)/mysqltest/%.xml
- make -C $(REPO_ROOT)/mysqltest metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/ndbapi/metadata/%.idmap: $(REPO_ROOT)/ndbapi/%.xml
- make -C $(REPO_ROOT)/ndbapi metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/query-browser/metadata/%.idmap: $(REPO_ROOT)/query-browser/%.xml
- make -C $(REPO_ROOT)/query-browser metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/query-browser-cy/metadata/%.idmap: $(REPO_ROOT)/query-browser-cy/%.xml
- make -C $(REPO_ROOT)/query-browser-cy metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/refman-4.1/metadata/%.idmap: $(REPO_ROOT)/refman-4.1/%.xml
- make -C $(REPO_ROOT)/refman-4.1 metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/refman-5.0/metadata/%.idmap: $(REPO_ROOT)/refman-5.0/%.xml
- make -C $(REPO_ROOT)/refman-5.0 metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/refman-5.1/metadata/%.idmap: $(REPO_ROOT)/refman-5.1/%.xml
- make -C $(REPO_ROOT)/refman-5.1 metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/refman-5.2/metadata/%.idmap: $(REPO_ROOT)/refman-5.2/%.xml
- make -C $(REPO_ROOT)/refman-5.2 metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/refman-6.0/metadata/%.idmap: $(REPO_ROOT)/refman-6.0/%.xml
- make -C $(REPO_ROOT)/refman-6.0 metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/refman-common/metadata/%.idmap: $(REPO_ROOT)/refman-common/%.xml
- make -C $(REPO_ROOT)/refman-common metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/userguide/metadata/%.idmap: $(REPO_ROOT)/userguide/%.xml
- make -C $(REPO_ROOT)/userguide metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
$(REPO_ROOT)/workbench/metadata/%.idmap: $(REPO_ROOT)/workbench/%.xml
- make -C $(REPO_ROOT)/workbench metadata/$(@F)
+ make -C $(subst /metadata,,$(@D)) metadata/$(@F)
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r8991 - in trunk: . make.d | paul | 29 Nov |
