From 78e3311197829ff6036062c9a927ee8bc75574aa Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 12 Apr 2003 00:05:27 +0000
Subject: [PATCH] =?UTF-8?q?Fixed=20rules=20for=20auto=20documentation=20(r?=
 =?UTF-8?q?eported=20by=20Vincent=20B=C3=A9ron).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dlls/Makedll.rules.in | 17 ++++-------------
 dlls/Makefile.in      | 19 +++++++++++++++++++
 dlls/make_dlls        | 19 +++++++++++++++++++
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 863ccecea3c..eea70688c48 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -67,25 +67,16 @@ crosstest:: $(SUBDIRS:%=%/__crosstest__)
 
 # Rules for auto documentation
 
-$(SUBDIRS:%=%/__man__): dummy
-	cd `dirname $@` && $(MAKE) man
-
-man: $(C_SRCS) $(SUBDIRS:%=%/__man__)
+man: $(C_SRCS)
 	$(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -S$(api_manext) $(DIVINCL) $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
 
-$(SUBDIRS:%=%/__doc_html__): dummy
-	cd `dirname $@` && $(MAKE) doc-html
-
-doc-html: $(C_SRCS) $(SUBDIRS:%=%/__doc_html__)
+doc-html: $(C_SRCS)
 	$(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) $(DIVINCL) -Th $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
 
-$(SUBDIRS:%=%/__doc_sgml__): dummy
-	cd `dirname $@` && $(MAKE) doc-sgml
-
-doc-sgml: $(C_SRCS) $(SUBDIRS:%=%/__doc_sgml__)
+doc-sgml: $(C_SRCS)
 	$(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) $(DIVINCL) -Ts $(MAINSPEC:%=-w %) $(SPEC_SRCS16:%=-w %) $(C_SRCS) $(C_SRCS16)
 
-.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
+.PHONY: man doc-html doc-sgml
 
 # Sanity check
 
diff --git a/dlls/Makefile.in b/dlls/Makefile.in
index c72d37dfd7e..6ae5d7477a4 100644
--- a/dlls/Makefile.in
+++ b/dlls/Makefile.in
@@ -1568,6 +1568,25 @@ install install-lib:: $(INSTALLSUBDIRS:%=%/__install__)
 	  $(LN_S) $(dlldir)/ntdll.dll$(DLLEXT) libntdll.dll.$(LIBEXT); \
 	fi
 
+# Rules for auto documentation
+
+$(SUBDIRS:%=%/__man__): dummy
+	cd `dirname $@` && $(MAKE) man
+
+man: $(SUBDIRS:%=%/__man__)
+
+$(SUBDIRS:%=%/__doc_html__): dummy
+	cd `dirname $@` && $(MAKE) doc-html
+
+doc-html: $(SUBDIRS:%=%/__doc_html__)
+
+$(SUBDIRS:%=%/__doc_sgml__): dummy
+	cd `dirname $@` && $(MAKE) doc-sgml
+
+doc-sgml: $(SUBDIRS:%=%/__doc_sgml__)
+
+.PHONY: man doc-html doc-sgml $(SUBDIRS:%=%/__man__) $(SUBDIRS:%=%/__doc_html__) $(SUBDIRS:%=%/__doc_sgml__)
+
 # Misc rules
 
 install install-dev:: $(IMPORT_LIBS:%=%.$(IMPLIBEXT))
diff --git a/dlls/make_dlls b/dlls/make_dlls
index f750db1e1dc..2be3d7ffb08 100755
--- a/dlls/make_dlls
+++ b/dlls/make_dlls
@@ -312,6 +312,25 @@ print NEWMAKE "\tfi\n\n";
 # makefile trailer
 
 print NEWMAKE <<EOF;
+# Rules for auto documentation
+
+\$(SUBDIRS:%=%/__man__): dummy
+	cd `dirname \$@` && \$(MAKE) man
+
+man: \$(SUBDIRS:%=%/__man__)
+
+\$(SUBDIRS:%=%/__doc_html__): dummy
+	cd `dirname \$@` && \$(MAKE) doc-html
+
+doc-html: \$(SUBDIRS:%=%/__doc_html__)
+
+\$(SUBDIRS:%=%/__doc_sgml__): dummy
+	cd `dirname \$@` && \$(MAKE) doc-sgml
+
+doc-sgml: \$(SUBDIRS:%=%/__doc_sgml__)
+
+.PHONY: man doc-html doc-sgml \$(SUBDIRS:%=%/__man__) \$(SUBDIRS:%=%/__doc_html__) \$(SUBDIRS:%=%/__doc_sgml__)
+
 # Misc rules
 
 install install-dev:: \$(IMPORT_LIBS:%=%.\$(IMPLIBEXT))