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

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

Revision: 3478
          http://sourceforge.net/p/modplug/code/3478
Author:   manxorist
Date:     2013-12-15 14:45:08 +0000 (Sun, 15 Dec 2013)
Log Message:
-----------
[Mod] libopenmpt build: Separate make doc from default make target.

Modified Paths:
--------------
    trunk/OpenMPT/Makefile
    trunk/OpenMPT/README.md
    trunk/OpenMPT/libopenmpt/dox/quickstart.md

Modified: trunk/OpenMPT/Makefile
===================================================================
--- trunk/OpenMPT/Makefile	2013-12-15 13:51:15 UTC (rev 3477)
+++ trunk/OpenMPT/Makefile	2013-12-15 14:45:08 UTC (rev 3478)
@@ -387,10 +387,7 @@
 OUTPUTS += bin/openmpt123.1
 endif
 endif
-ifeq ($(MPT_WITH_DOXYGEN),1)
-OUTPUTS += docs
 endif
-endif
 ifeq ($(SHARED_SONAME),1)
 LIBOPENMPT_LDFLAGS += -Wl,-soname,$(LIBOPENMPT_SONAME)
 endif
@@ -416,6 +413,9 @@
 .PHONY: docs
 docs: bin/made.docs
 
+.PHONY: doc
+doc: bin/made.docs
+
 bin/made.docs:
 	$(VERYSILENT)mkdir -p bin/docs
 	$(INFO) [DOXYGEN] libopenmpt
@@ -483,6 +483,9 @@
 	$(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_c.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c.c
 	$(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_c_mem.c $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_c_mem.c
 	$(INSTALL_DATA) libopenmpt/examples/libopenmpt_example_cxx.cpp $(DESTDIR)$(PREFIX)/share/doc/libopenmpt/examples/libopenmpt_example_cxx.cpp
+
+.PHONY: install-doc
+install-doc: bin/made.docs
 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

Modified: trunk/OpenMPT/README.md
===================================================================
--- trunk/OpenMPT/README.md	2013-12-15 13:51:15 UTC (rev 3477)
+++ trunk/OpenMPT/README.md	2013-12-15 14:45:08 UTC (rev 3478)
@@ -123,8 +123,20 @@
     `make DYNLINK=0` or similar. Cross compiling or different compiler would
     best be implemented via new `Makefile.config.*` files.
 
+    The `Makefile` also supports building doxygen documentation by using
 
+        make doc
 
+    Binaries and documentation can be installed systen-wide with
+
+        make PREFIX=/yourprefix install
+        make PREFIX=/yourprefix install-doc
+
+    `PREFIX` defaults to `/usr/local`. A `DESTDIR=` parameter is also
+    supported.
+
+
+
 Coding conventions
 ------------------
 

Modified: trunk/OpenMPT/libopenmpt/dox/quickstart.md
===================================================================
--- trunk/OpenMPT/libopenmpt/dox/quickstart.md	2013-12-15 13:51:15 UTC (rev 3477)
+++ trunk/OpenMPT/libopenmpt/dox/quickstart.md	2013-12-15 14:45:08 UTC (rev 3478)
@@ -11,7 +11,9 @@
     make TEST=1 check
     make clean
     make
+    make doc
     sudo make install
+    sudo make install-doc
     openmpt123 $SOMEMODULE
 
 ### Windows

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