Mercurial > hg > nginx-site

changeset 30:8ed43632a28c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing dependencies of included XSLT files.
author Igor Sysoev <igor@sysoev.ru>
date Fri, 30 Sep 2011 12:53:26 +0000
parents 3cc1fbdc53e8
children dc74e3a8f324
files GNUmakefile xml/en/GNUmakefile xml/he/GNUmakefile xml/ja/GNUmakefile xml/ru/GNUmakefile xml/tr/GNUmakefile
diffstat 6 files changed, 158 insertions(+), 136 deletions(-) [+]
line wrap: on
line diff
--- a/GNUmakefile	Thu Sep 29 14:20:44 2011 +0000
+++ b/GNUmakefile	Fri Sep 30 12:53:26 2011 +0000
@@ -33,6 +33,75 @@
 		> $2
 endef
 
+
+ARTICLE_DEPS =								\
+		xml/menu.xml						\
+		xml/versions.xml					\
+		dtd/article.dtd						\
+		dtd/content.dtd						\
+		xslt/article.xslt					\
+		xslt/dirname.xslt					\
+		xslt/link.xslt						\
+		xslt/style.xslt						\
+		xslt/body.xslt						\
+		xslt/menu.xslt						\
+		xslt/donate.xslt					\
+		xslt/directive.xslt					\
+		xslt/content.xslt					\
+		xslt/versions.xslt
+
+NEWS_DEPS =								\
+		xml/menu.xml						\
+		xml/versions.xml					\
+		dtd/news.dtd						\
+		dtd/content.dtd						\
+		xslt/news.xslt						\
+		xslt/dirname.xslt					\
+		xslt/link.xslt						\
+		xslt/style.xslt						\
+		xslt/body.xslt						\
+		xslt/menu.xslt						\
+		xslt/content.xslt
+
+DOWNLOAD_DEPS =								\
+		xml/menu.xml						\
+		xml/versions.xml					\
+		dtd/article.dtd						\
+		dtd/content.dtd						\
+		xslt/download.xslt					\
+		xslt/dirname.xslt					\
+		xslt/link.xslt						\
+		xslt/style.xslt						\
+		xslt/body.xslt						\
+		xslt/menu.xslt						\
+		xslt/content.xslt
+
+SECURITY_DEPS =								\
+		xml/menu.xml						\
+		xml/versions.xml					\
+		dtd/article.dtd						\
+		dtd/content.dtd						\
+		xslt/security.xslt					\
+		xslt/dirname.xslt					\
+		xslt/link.xslt						\
+		xslt/style.xslt						\
+		xslt/body.xslt						\
+		xslt/menu.xslt						\
+		xslt/content.xslt
+
+BOOK_DEPS =								\
+		xml/menu.xml						\
+		xml/versions.xml					\
+		dtd/article.dtd						\
+		dtd/content.dtd						\
+		xslt/books.xslt						\
+		xslt/dirname.xslt					\
+		xslt/link.xslt						\
+		xslt/style.xslt						\
+		xslt/body.xslt						\
+		xslt/menu.xslt						\
+		xslt/content.xslt
+
 all:		news arx 404 en ja he ru tr
 
 news:		$(OUT)/index.html $(OUT)/index.rss
@@ -40,12 +109,6 @@
 404:		$(OUT)/404.html
 
 
-ARTICLE_XSLT =	xml/menu.xml						\
-		xml/versions.xml					\
-		xslt/article.xslt					\
-		dtd/article.dtd						\
-		dtd/content.dtd						\
-
 include 	xml/en/GNUmakefile
 include 	xml/ja/GNUmakefile
 include 	xml/he/GNUmakefile
@@ -53,92 +116,45 @@
 include 	xml/tr/GNUmakefile
 
 
-$(OUT)/index.html:	xml/index.xml					\
-		xml/menu.xml						\
-		xslt/news.xslt						\
-		dtd/news.dtd						\
-		dtd/content.dtd
+$(OUT)/index.html:							\
+		xml/index.xml						\
+		$(NEWS_DEPS)
 	$(call XSLT, xslt/news.xslt, $<, $@)
 
-$(OUT)/index.rss:	xml/index.xml					\
+$(OUT)/index.rss:							\
+		xml/index.xml						\
+		$(NEWS_DEPS)
 		xslt/rss.xslt						\
-		dtd/article.dtd						\
-		dtd/content.dtd
 	$(call XSLT, xslt/rss.xslt, $<, $@)
 
 
-$(OUT)/2010.html:	xml/index.xml					\
-		xml/menu.xml						\
-		xslt/news.xslt						\
-		dtd/news.dtd						\
-		dtd/content.dtd
+$(OUT)/2010.html:							\
+		xml/index.xml						\
+		$(NEWS_DEPS)
 	$(call XSLT, xslt/news.xslt, $<, $@, YEAR=2010)
 
 
-$(OUT)/2009.html:	xml/index.xml					\
-		xml/menu.xml						\
-		xslt/news.xslt						\
-		dtd/news.dtd						\
-		dtd/content.dtd
+$(OUT)/2009.html:							\
+		xml/index.xml						\
+		$(NEWS_DEPS)
 	$(call XSLT, xslt/news.xslt, $<, $@, YEAR=2009)
 
-$(OUT)/404.html:	xml/404.xml					\
+$(OUT)/404.html:							\
+		xml/404.xml						\
 		xml/menu.xml						\
-		xslt/error.xslt						\
 		dtd/article.dtd						\
-		dtd/content.dtd
+		dtd/content.dtd						\
+		xslt/error.xslt
 	$(call XSLT, xslt/error.xslt, $<, $@)
 
 .SECONDARY:
 
-$(OUT)/%.html:		xml/%.xml					\
-		$(ARTICLE_XSLT)
+$(OUT)/%.html:	xml/%.xml						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
 
-xslt/news.xslt:		xsls/news.xsls					\
-		xslt/dirname.xslt					\
-		xslt/link.xslt						\
-		xslt/style.xslt						\
-		xslt/body.xslt						\
-		xslt/menu.xslt						\
-		xslt/content.xslt
-
-xslt/article.xslt:	xsls/article.xsls				\
-		xslt/dirname.xslt					\
-		xslt/link.xslt						\
-		xslt/style.xslt						\
-		xslt/body.xslt						\
-		xslt/menu.xslt						\
-		xslt/donate.xslt					\
-		xslt/content.xslt					\
-		xslt/versions.xslt
-
-xslt/download.xslt:	xsls/download.xsls				\
-		xslt/dirname.xslt					\
-		xslt/link.xslt						\
-		xslt/style.xslt						\
-		xslt/body.xslt						\
-		xslt/menu.xslt						\
-		xslt/content.xslt
-
-xslt/security.xslt:	xsls/security.xsls				\
-		xslt/dirname.xslt					\
-		xslt/link.xslt						\
-		xslt/style.xslt						\
-		xslt/body.xslt						\
-		xslt/menu.xslt						\
-		xslt/content.xslt
-
-xslt/books.xslt:	xsls/books.xsls					\
-		xslt/dirname.xslt					\
-		xslt/link.xslt						\
-		xslt/style.xslt						\
-		xslt/body.xslt						\
-		xslt/menu.xslt						\
-		xslt/content.xslt
-
-xslt/%.xslt:		xsls/%.xsls					\
+xslt/%.xslt:	xsls/%.xsls						\
 		xsls/dump.xsls
 	$(call XSLScript, $<, $@)
 
--- a/xml/en/GNUmakefile	Thu Sep 29 14:20:44 2011 +0000
+++ b/xml/en/GNUmakefile	Fri Sep 30 12:53:26 2011 +0000
@@ -47,44 +47,42 @@
 		$(HOWTO_EN_HTML)					\
 		$(FAQ_EN_HTML)						\
 
-$(OUT)/en/docs/index.html:	xml/en/docs/index.xml			\
-		$(ARTICLE_XSLT)						\
+$(OUT)/en/docs/index.html:						\
+		xml/en/docs/index.xml					\
 		$(DOCS_EN_XML)						\
-		$(REFS_EN_XML)
+		$(REFS_EN_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/en/download.html:	xml/en/download.xml			\
-		xml/menu.xml						\
-		xslt/download.xslt					\
-		dtd/article.dtd						\
-		dtd/content.dtd
+$(OUT)/en/download.html:						\
+		xml/en/download.xml					\
+		$(DOWNLOAD_DEPS)
 	$(call XSLT, xslt/download.xslt, $<, $@)
 
-$(OUT)/en/security_advisories.html:	xml/en/security_advisories.xml	\
-		xml/menu.xml						\
-		xslt/security.xslt					\
-		dtd/article.dtd						\
-		dtd/content.dtd
+$(OUT)/en/security_advisories.html:					\
+		xml/en/security_advisories.xml				\
+		$(SECURITY_DEPS)
 	$(call XSLT, xslt/security.xslt, $<, $@)
 
-$(OUT)/en/docs/introduction.html:	xml/en/docs/introduction.xml	\
-		$(ARTICLE_XSLT)						\
-		$(INTRO_EN_XML)
-	$(call XSLT, xslt/article.xslt, $<, $@)
-
-$(OUT)/en/docs/howto.html:	xml/en/docs/howto.xml			\
-		$(ARTICLE_XSLT)						\
-		$(HOWTO_EN_XML)
+$(OUT)/en/docs/introduction.html:					\
+		xml/en/docs/introduction.xml				\
+		$(INTRO_EN_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/en/docs/faq.html:	xml/en/docs/faq.xml			\
-		$(ARTICLE_XSLT)						\
-		$(FAQ_EN_XML)
+$(OUT)/en/docs/howto.html:						\
+		xml/en/docs/howto.xml					\
+		$(HOWTO_EN_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/en/books.html:	xml/en/books.xml				\
-		xml/menu.xml						\
-		xslt/books.xslt						\
-		dtd/article.dtd						\
-		dtd/content.dtd
+$(OUT)/en/docs/faq.html:						\
+		xml/en/docs/faq.xml					\
+		$(FAQ_EN_XML)						\
+		$(ARTICLE_DEPS)
+	$(call XSLT, xslt/article.xslt, $<, $@)
+
+$(OUT)/en/books.html:							\
+		xml/en/books.xml					\
+		$(BOOK_DEPS)
 	$(call XSLT, xslt/books.xslt, $<, $@)
--- a/xml/he/GNUmakefile	Thu Sep 29 14:20:44 2011 +0000
+++ b/xml/he/GNUmakefile	Fri Sep 30 12:53:26 2011 +0000
@@ -23,17 +23,20 @@
 		$(INTRO_HE_HTML)					\
 		$(HOWTO_HE_HTML)					\
 
-$(OUT)/he/docs/index.html:	xml/he/docs/index.xml			\
-		$(ARTICLE_XSLT)						\
-		$(DOCS_HE_XML)
+$(OUT)/he/docs/index.html:						\
+		xml/he/docs/index.xml					\
+		$(DOCS_HE_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/he/docs/introduction.html:	xml/he/docs/introduction.xml	\
-		$(ARTICLE_XSLT)						\
-		$(INTRO_HE_XML)
+$(OUT)/he/docs/introduction.html:					\
+		xml/he/docs/introduction.xml				\
+		$(INTRO_HE_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/he/docs/howto.html:	xml/he/docs/howto.xml			\
-		$(ARTICLE_XSLT)						\
-		$(HOWTO_HE_XML)
+$(OUT)/he/docs/howto.html:						\
+		xml/he/docs/howto.xml					\
+		$(HOWTO_HE_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
--- a/xml/ja/GNUmakefile	Thu Sep 29 14:20:44 2011 +0000
+++ b/xml/ja/GNUmakefile	Fri Sep 30 12:53:26 2011 +0000
@@ -32,17 +32,20 @@
 		$(HOWTO_JA_HTML)					\
 		$(FAQ_JA_HTML)						\
 
-$(OUT)/ja/docs/introduction.html:	xml/ja/docs/introduction.xml	\
-		$(ARTICLE_XSLT)						\
-		$(INTRO_JA_XML)
+$(OUT)/ja/docs/introduction.html:					\
+		xml/ja/docs/introduction.xml				\
+		$(INTRO_JA_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/ja/docs/howto.html:	xml/ja/docs/howto.xml			\
-		$(ARTICLE_XSLT)						\
-		$(HOWTO_JA_XML)
+$(OUT)/ja/docs/howto.html:						\
+		xml/ja/docs/howto.xml					\
+		$(HOWTO_JA_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/ja/docs/faq.html:	xml/ja/docs/faq.xml			\
-		$(ARTICLE_XSLT)						\
-		$(FAQ_JA_XML)
+$(OUT)/ja/docs/faq.html:						\
+		xml/ja/docs/faq.xml					\
+		$(FAQ_JA_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
--- a/xml/ru/GNUmakefile	Thu Sep 29 14:20:44 2011 +0000
+++ b/xml/ru/GNUmakefile	Fri Sep 30 12:53:26 2011 +0000
@@ -17,14 +17,13 @@
 		$(DOCS_RU_HTML)						\
 		$(FAQ_RU_HTML)						\
 
-$(OUT)/ru/download.html:	xml/ru/download.xml			\
-		xml/menu.xml						\
-		xslt/download.xslt					\
-		dtd/article.dtd						\
-		dtd/content.dtd
+$(OUT)/ru/download.html:						\
+		xml/ru/download.xml					\
+		$(DOWNLOAD_DEPS)
 	$(call XSLT, xslt/download.xslt, $<, $@)
 
-$(OUT)/ru/docs/faq.html:	xml/ru/docs/faq.xml			\
-		$(ARTICLE_XSLT)						\
-		$(FAQ_RU_XML)
+$(OUT)/ru/docs/faq.html:						\
+		xml/ru/docs/faq.xml					\
+		$(FAQ_RU_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
--- a/xml/tr/GNUmakefile	Thu Sep 29 14:20:44 2011 +0000
+++ b/xml/tr/GNUmakefile	Fri Sep 30 12:53:26 2011 +0000
@@ -33,17 +33,20 @@
 		$(HOWTO_TR_HTML)					\
 		$(FAQ_TR_HTML)						\
 
-$(OUT)/tr/docs/introduction.html:	xml/tr/docs/introduction.xml	\
-		$(ARTICLE_XSLT)						\
-		$(INTRO_TR_XML)
+$(OUT)/tr/docs/introduction.html:					\
+		xml/tr/docs/introduction.xml				\
+		$(INTRO_TR_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/tr/docs/howto.html:	xml/tr/docs/howto.xml			\
-		$(ARTICLE_XSLT)						\
-		$(HOWTO_TR_XML)
+$(OUT)/tr/docs/howto.html:						\
+		xml/tr/docs/howto.xml					\
+		$(HOWTO_TR_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)
 
-$(OUT)/tr/docs/faq.html:	xml/tr/docs/faq.xml			\
-		$(ARTICLE_XSLT)						\
-		$(FAQ_TR_XML)
+$(OUT)/tr/docs/faq.html:						\
+		xml/tr/docs/faq.xml					\
+		$(FAQ_TR_XML)						\
+		$(ARTICLE_DEPS)
 	$(call XSLT, xslt/article.xslt, $<, $@)