make htmlpages does not work - regression?

[Vincent Béron]

thomas.mertes at gmx.at a écrit:
> Hello
> 
> I noticed that "make htmlpages" does not work in Wine-20030408
> but in Wine-20030318. The problem seems to be in some makefile
> or configure change since /dlls/Makedll.rules.in still contains the
> "Rules for auto documentation". but the actual Makefile does not.
> 
> I have in the moment no time to fix it myself (or search the patch
> that made this change).
> 
> Btw. the documentation system is great, but I think that only a few
> people know that it exists. To start it (according to Jon Griffiths):
> 
> Run ./configure, make htmlpages, point your browser at
> documentation/html/index.html, then immediately start sending
> patches for documentation glitches :-)
> 
> The interesting dlls (with many docomented functions) are
> shlwapi.dll and ntdll.dll.

The patch which broke it is http://cvs.winehq.com/patch.py?id=7602.
This patch should help you.

I still get a couple problems with it, such as a ".html" file in 
documentation/html, and a couple lines about sh trying to execute .h 
files (sh: line 2: ../../include/winternal.h: Permission non accordée). 
They were present before though, so it's something else.

Changelog:
Fix a regression preventing the building of the automatic documentation.

Vincent
-------------- next part --------------
Index: wine/dlls/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/Makefile.in,v
retrieving revision 1.172
diff -u -r1.172 Makefile.in
--- wine/dlls/Makefile.in	21 Mar 2003 00:42:39 -0000	1.172
+++ wine/dlls/Makefile.in	10 Apr 2003 17:01:24 -0000
@@ -140,6 +140,25 @@
 
 @MAKE_RULES@
 
+# 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__)
+
 WIN16_FILES = \
 	avifile.dll$(DLLEXT) \
 	comm.dll$(DLLEXT) \
Index: wine/dlls/Maketest.rules.in
===================================================================
RCS file: /home/wine/wine/dlls/Maketest.rules.in,v
retrieving revision 1.21
diff -u -r1.21 Maketest.rules.in
--- wine/dlls/Maketest.rules.in	23 Mar 2003 01:12:31 -0000	1.21
+++ wine/dlls/Maketest.rules.in	10 Apr 2003 17:01:24 -0000
@@ -73,3 +73,13 @@
 
 clean::
 	$(RM) $(MODULE) $(TESTLIST) $(TESTRESULTS) $(CROSSTEST)
+
+# Rules for auto documentation
+
+man:
+
+doc-html:
+
+doc-sgml:
+
+.PHONY: man doc-html doc-sgml