[OMPT-svn-commit] SF.net SVN: modplug:[5007] trunk/OpenMPT

[<man...@us...>]

Revision: 5007
          http://sourceforge.net/p/modplug/code/5007
Author:   manxorist
Date:     2015-04-26 13:02:39 +0000 (Sun, 26 Apr 2015)
Log Message:
-----------
[Mod] build: Do not generate libopenmpt manpages with doxygen. They were never installed properly anyway. html documentation should be sufficient.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/build/autotools/Makefile.am
    trunk/OpenMPT/build/autotools/configure.ac
    trunk/OpenMPT/libopenmpt/Doxyfile

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/Makefile	2015-04-26 13:02:39 UTC (rev 5007)
@@ -706,8 +706,6 @@
 ifeq ($(MPT_WITH_DOXYGEN),1)
 	$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/html/
 	$(INSTALL_DATA_DIR) bin/docs/html $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/html
-	$(INSTALL_MAKE_DIR) $(DESTDIR)$(PREFIX)/share/doc/man/
-	#$(INSTALL_DATA_DIR) bin/docs/man $(DESTDIR)$(PREFIX)/share/man
 endif
 
 .PHONY: install-openmpt-modplug

Modified: trunk/OpenMPT/build/autotools/Makefile.am
===================================================================
--- trunk/OpenMPT/build/autotools/Makefile.am	2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/build/autotools/Makefile.am	2015-04-26 13:02:39 UTC (rev 5007)
@@ -475,7 +475,6 @@
 
 man1_MANS = man/openmpt123.1
 
-#$(man3_MANS): doxygen-doc
 MOSTLYCLEANFILES += $(DX_CLEANFILES)
 
 if DX_COND_doc
@@ -491,7 +490,6 @@
 
 clean-local:
 	$(RM) -r html
-	$(RM) -r man
 	$(RM) @DX_DOCDIR@/@PACKAGE@.tag
 
 uninstall-local:
@@ -501,10 +499,6 @@
 DX_CLEAN_HTML = @DX_DOCDIR@/html
 endif DX_COND_html
 
-if DX_COND_man
-DX_CLEAN_MAN = @DX_DOCDIR@/man
-endif DX_COND_man
-
 .PHONY: doxygen-run doxygen-doc
 
 .INTERMEDIATE: doxygen-run
@@ -518,7 +512,7 @@
 	$(DX_ENV) $(DX_DOXYGEN) $(DX_CONFIG)
 	touch $@
 
-DX_CLEANFILES = @DX_DOCDIR@/@PACKAGE@.tag -r $(DX_CLEAN_HTML) $(DX_CLEAN_MAN) 
+DX_CLEANFILES = @DX_DOCDIR@/@PACKAGE@.tag -r $(DX_CLEAN_HTML) 
 
 endif DX_COND_doc
 

Modified: trunk/OpenMPT/build/autotools/configure.ac
===================================================================
--- trunk/OpenMPT/build/autotools/configure.ac	2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/build/autotools/configure.ac	2015-04-26 13:02:39 UTC (rev 5007)
@@ -128,8 +128,8 @@
 DX_DOXYGEN_FEATURE(ON)
 DX_DOT_FEATURE(OFF)
 DX_HTML_FEATURE(ON)
-DX_MAN_FEATURE(ON)
 
+DX_MAN_FEATURE(OFF)
 DX_CHM_FEATURE(OFF)
 DX_CHI_FEATURE(OFF)
 DX_RTF_FEATURE(OFF)

Modified: trunk/OpenMPT/libopenmpt/Doxyfile
===================================================================
--- trunk/OpenMPT/libopenmpt/Doxyfile	2015-04-26 10:29:53 UTC (rev 5006)
+++ trunk/OpenMPT/libopenmpt/Doxyfile	2015-04-26 13:02:39 UTC (rev 5007)
@@ -1756,7 +1756,7 @@
 # classes and files.
 # The default value is: NO.
 
-GENERATE_MAN           = YES
+GENERATE_MAN           = NO
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.