Alexandre Julliard : makefiles: Get rid of the documentation makefile.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Nov 9 08:34:17 CST 2015
Module: wine
Branch: master
Commit: 7735bb5217175e798aac45a20fe77cc9fe9e416e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7735bb5217175e798aac45a20fe77cc9fe9e416e
Author: Alexandre Julliard <julliard at winehq.org>
Date: Mon Nov 9 14:09:46 2015 +0900
makefiles: Get rid of the documentation makefile.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
Makefile.in | 9 ++++++++-
configure | 2 --
configure.ac | 1 -
documentation/Makefile.in | 6 ------
4 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 4c41640..eb58fd2 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -112,7 +112,7 @@ include/stamp-h: $(srcdir)/include/config.h.in config.status
clean:: __clean__
distclean:: clean
$(RM) config.* configure.lineno TAGS tags include/config.h include/stamp-h Makefile Make.tmp .gitignore
- $(RM) -r autom4te.cache
+ $(RM) -r autom4te.cache documentation/html documentation/api-guide documentation/api-guide-xml documentation/man$(api_manext)
# Rules for uninstalling
@@ -120,6 +120,13 @@ distclean:: clean
uninstall:: __uninstall__
-rmdir $(DESTDIR)$(fontdir) $(DESTDIR)$(datadir)/wine $(DESTDIR)$(fakedlldir) $(DESTDIR)$(dlldir) $(DESTDIR)$(includedir)
+# Rules for API documentation
+
+install-manpages:: manpages
+ for i in documentation/man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
+
+.PHONY: install-manpages
+
# Dependencies between directories
# dependencies needed to build any dll or program
diff --git a/configure b/configure
index 2bfa2b9..751baa9 100755
--- a/configure
+++ b/configure
@@ -1402,7 +1402,6 @@ enable_xmllite
enable_xolehlp
enable_xpsprint
enable_xpssvcs
-enable_documentation
enable_fonts
enable_include
enable_libs_port
@@ -18137,7 +18136,6 @@ wine_fn_config_test dlls/xmllite/tests xmllite_test
wine_fn_config_dll xolehlp enable_xolehlp
wine_fn_config_dll xpsprint enable_xpsprint
wine_fn_config_dll xpssvcs enable_xpssvcs
-wine_fn_config_makefile documentation enable_documentation clean
wine_fn_config_makefile fonts enable_fonts clean,install-lib
wine_fn_config_makefile include enable_include clean,install-dev
wine_fn_config_makefile libs/port enable_libs_port
diff --git a/configure.ac b/configure.ac
index 138312f..c6088f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3493,7 +3493,6 @@ WINE_CONFIG_TEST(dlls/xmllite/tests)
WINE_CONFIG_DLL(xolehlp)
WINE_CONFIG_DLL(xpsprint)
WINE_CONFIG_DLL(xpssvcs)
-WINE_CONFIG_MAKEFILE([documentation],,[clean])
WINE_CONFIG_MAKEFILE([fonts],,[clean,install-lib])
WINE_CONFIG_MAKEFILE([include],,[clean,install-dev])
WINE_CONFIG_MAKEFILE([libs/port])
diff --git a/documentation/Makefile.in b/documentation/Makefile.in
deleted file mode 100644
index e3e6d40..0000000
--- a/documentation/Makefile.in
+++ /dev/null
@@ -1,6 +0,0 @@
-install-man::
- @cd $(top_builddir) && $(MAKE) manpages
- for i in man$(api_manext)/*.$(api_manext); do $(INSTALL_DATA) $$i $(DESTDIR)$(mandir)/$$i; done
-
-clean::
- $(RM) -r html api-guide api-guide-xml man$(api_manext)
More information about the wine-cvs
mailing list