makefiles: Output all the documentation rules explicitly for each module.
diff --git a/Makefile.in b/Makefile.in index 535f251..7a3bd80 100644 --- a/Makefile.in +++ b/Makefile.in
@@ -28,7 +28,6 @@ MODULE = none ALL_DIRS = @ALL_DIRS@ -ALL_DLL_DIRS = @ALL_DLL_DIRS@ ALL_TOP_DIRS = @ALL_TOP_DIRS@ # Sub-directories to run make all into @@ -123,33 +122,6 @@ .PHONY: $(INSTALLSUBDIRS:%=%/__install__) $(INSTALLSUBDIRS:%=%/__uninstall__) \ $(INSTALLSUBDIRS:%=%/__install-lib__) $(INSTALLSUBDIRS:%=%/__install-dev__) -# Rules for auto documentation - -DOCSUBDIRS = $(ALL_DLL_DIRS) - -$(DOCSUBDIRS:%=%/__man__): dummy - @cd `dirname $@` && $(MAKE) man - -$(DOCSUBDIRS:%=%/__doc_html__): dummy - @cd `dirname $@` && $(MAKE) doc-html - -$(DOCSUBDIRS:%=%/__doc_sgml__): dummy - @cd `dirname $@` && $(MAKE) doc-sgml - -$(DOCSUBDIRS:%=%/__doc_xml__): dummy - @cd `dirname $@` && $(MAKE) doc-xml - -man: $(DOCSUBDIRS:%=%/__man__) -doc-html: $(DOCSUBDIRS:%=%/__doc_html__) -doc-sgml: $(DOCSUBDIRS:%=%/__doc_sgml__) -doc-xml: $(DOCSUBDIRS:%=%/__doc_xml__) - -manpages htmlpages sgmlpages xmlpages: dummy - @cd documentation && $(MAKE) $@ - -.PHONY: man doc-html doc-sgml doc-xml manpages htmlpages sgmlpages xmlpages \ - $(DOCSUBDIRS:%=%/__man__) $(DOCSUBDIRS:%=%/__doc_html__) $(DOCSUBDIRS:%=%/__doc_sgml__) $(DOCSUBDIRS:%=%/__doc_xml__) - # Dependencies between directories # dependencies needed to build any dll or program
diff --git a/aclocal.m4 b/aclocal.m4 index 3807ff8..253f1a4 100644 --- a/aclocal.m4 +++ b/aclocal.m4
@@ -148,7 +148,6 @@ AC_SUBST(ALL_SYMLINKS,"") AC_SUBST(ALL_DIRS,"") AC_SUBST(ALL_TOP_DIRS,"") -AC_SUBST(ALL_DLL_DIRS,"") AC_SUBST(ALL_TEST_BINARIES,"") AC_SUBST(ALL_PROGRAM_BIN_INSTALL_DIRS,"") @@ -215,16 +214,15 @@ AS_VAR_IF([$ac_enable],[no], dnl enable_win16 is special in that it disables import libs too [test "$ac_enable" != enable_win16 || return 0], - [wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + [wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: dlls/$ac_dir dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ install:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install install-lib:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-lib -uninstall:: dlls/$ac_dir/Makefile - @cd dlls/$ac_dir && \$(MAKE) uninstall"]) +uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile + @cd dlls/$ac_dir && \$(MAKE) \$[@]"]) if test -n "$ac_implibsrc" then
diff --git a/configure b/configure index f771fa9..ed41bb5 100755 --- a/configure +++ b/configure
@@ -598,7 +598,6 @@ LIBOBJS ALL_PROGRAM_BIN_INSTALL_DIRS ALL_TEST_BINARIES -ALL_DLL_DIRS ALL_TOP_DIRS ALL_DIRS ALL_SYMLINKS @@ -13861,8 +13860,6 @@ ALL_TOP_DIRS="" -ALL_DLL_DIRS="" - ALL_TEST_BINARIES="" ALL_PROGRAM_BIN_INSTALL_DIRS="" @@ -13937,16 +13934,15 @@ if test "x$as_val" = x""no; then : test "$ac_enable" != enable_win16 || return 0 else - wine_fn_append_file ALL_DLL_DIRS dlls/$ac_dir - wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ + wine_fn_append_rule ALL_MAKEFILE_DEPENDS \ "all: dlls/$ac_dir dlls/$ac_dir: dlls/$ac_dir/Makefile __builddeps__ install:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install install-lib:: dlls/$ac_dir/Makefile __builddeps__ @cd dlls/$ac_dir && \$(MAKE) install-lib -uninstall:: dlls/$ac_dir/Makefile - @cd dlls/$ac_dir && \$(MAKE) uninstall" +uninstall manpages htmlpages sgmlpages xmlpages:: dlls/$ac_dir/Makefile + @cd dlls/$ac_dir && \$(MAKE) \$@" fi if test -n "$ac_implibsrc"
diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in index 2269659..fb989bd 100644 --- a/dlls/Makedll.rules.in +++ b/dlls/Makedll.rules.in
@@ -52,20 +52,18 @@ # Rules for auto documentation -man: $(C_SRCS) dummy +manpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/man$(api_manext) -R$(TOPOBJDIR) -C$(SRCDIR) -S$(api_manext) $(INCLUDES) $(MAINSPEC:%=-w %) $(C_SRCS) -doc-html: $(C_SRCS) dummy +htmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/html -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Th $(MAINSPEC:%=-w %) $(C_SRCS) -doc-sgml: $(C_SRCS) dummy +sgmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Ts $(MAINSPEC:%=-w %) $(C_SRCS) -doc-xml: $(C_SRCS) dummy +xmlpages:: $(C_SRCS) dummy $(C2MAN) -o $(TOPOBJDIR)/documentation/api-guide-xml -R$(TOPOBJDIR) -C$(SRCDIR) $(INCLUDES) -Tx $(MAINSPEC:%=-w %) $(C_SRCS) -.PHONY: man doc-html doc-sgml doc-xml - # Rules for installation .PHONY: install_static_implib_def install_static_implib_a
diff --git a/documentation/Makefile.in b/documentation/Makefile.in index 7453927..332fefb 100644 --- a/documentation/Makefile.in +++ b/documentation/Makefile.in
@@ -4,25 +4,12 @@ VPATH = @srcdir@ MODULE = none -INSTALLDIRS = man$(api_manext) html api-guide api-guide-xml $(DESTDIR)$(mandir)/man$(api_manext) +INSTALLDIRS = $(DESTDIR)$(mandir)/man$(api_manext) @MAKE_RULES@ -manpages: man$(api_manext) dummy - @cd $(TOPOBJDIR) && $(MAKE) man - -htmlpages: html dummy - @cd $(TOPOBJDIR) && $(MAKE) doc-html - -sgmlpages: api-guide dummy - @cd $(TOPOBJDIR) && $(MAKE) doc-sgml - -xmlpages: api-guide-xml dummy - @cd $(TOPOBJDIR) && $(MAKE) doc-xml - -.PHONY: manpages htmlpages sgmlpages xmlpages install-man - -install-man:: manpages $(DESTDIR)$(mandir)/man$(api_manext) +install-man:: $(DESTDIR)$(mandir)/man$(api_manext) + @cd $(TOPOBJDIR) && $(MAKE) manpages for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done clean::