Changeset 1582 for trunk

Timestamp:

Jul 28, 2010 10:53:11 AM (11 years ago)

Author:

lou

Message:

Add forgotten doxydoc targets. But don't build doxydoc by default; breaks
nightly build.

Location:

trunk

Files:

• Clp/Makefile.am (modified) (2 diffs)
• Clp/Makefile.in (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (4 diffs)

trunk/Clp/Makefile.am

@@ -83 +83 @@
 unitTest: test
 
-clean-local:
+# Doxygen documentation
+
+doxydoc:
+        doxygen doxydoc/doxygen.conf
+
+clean-doxydoc:
+        ( cd doxydoc ; rm -rf html *.log *.tag )
+
+
+clean-local: clean-doxydoc
         if test -r test/Makefile; then cd test; $(MAKE) clean; fi
 
@@ -93 +102 @@
 uninstall-local: uninstall-doc
 
-.PHONY: test unitTest
+.PHONY: test unitTest doxydoc
 
 ########################################################################

trunk/Clp/Makefile.in

@@ -819 +819 @@
 unitTest: test
 
-clean-local:
+# Doxygen documentation
+
+doxydoc:
+        doxygen doxydoc/doxygen.conf
+
+clean-doxydoc:
+        ( cd doxydoc ; rm -rf html *.log *.tag )
+
+clean-local: clean-doxydoc
         if test -r test/Makefile; then cd test; $(MAKE) clean; fi
 
@@ -829 +837 @@
 uninstall-local: uninstall-doc
 
-.PHONY: test unitTest
+.PHONY: test unitTest doxydoc
 
 @COIN_HAS_PKGCONFIG_TRUE@install-data-hook:

trunk/Makefile.am

@@ -37 +37 @@
 unitTests: tests
 
+# Generate doxygen doc'n in subdirectories (except @PACKAGE_NAME@) if a doxydoc
+# directory is present, then do the base, if present.
+
 doxydoc:
-        cd $(srcdir); doxygen doxydoc/doxygen.conf
+        for dir in $(subdirs) ; do \
+          if test $$dir != @PACKAGE_NAME@ && test -r $$dir/doxydoc ; then \
+            (cd $$dir ; $(MAKE) doxydoc) \
+          fi ; \
+        done ; \
+        if test -r doxydoc/doxygen.conf ; then \
+          doxygen doxydoc/doxygen.conf ; \
+        fi
+
+clean-doxydoc:
+        ( cd doxydoc ; rm -rf html *.log *.tag )
+
+# DocInstallDir is defined in Makemain.inc and is specific to the package.
+# For the short term, adopt the notion that we install only the package
+# doxydoc.
+
+install-doxydoc: doxydoc
+        if test -r doxydoc/doxygen.conf ; then \
+          $(mkdir_p) $(DocInstallDir) ; \
+          cp -R doxydoc $(DocInstallDir) ; \
+        fi
+
+uninstall-doxydoc:
+        rm -rf $(DocInstallDir)/doxydoc
+
+clean-local: clean-doxydoc
+# install-data-local: install-doxydoc
+uninstall-local: uninstall-doxydoc
 
 .PHONY: test unitTest tests unitTests doxydoc

trunk/Makefile.in

@@ -613 +613 @@
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool mostlyclean-am
+clean-am: clean-generic clean-libtool clean-local mostlyclean-am
 
 distclean: distclean-recursive
@@ -659 +659 @@
 ps-am:
 
-uninstall-am: uninstall-info-am
+uninstall-am: uninstall-info-am uninstall-local
 
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-        check-am clean clean-generic clean-libtool clean-recursive \
-        ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-        dist-shar dist-tarZ dist-zip distcheck distclean \
+        check-am clean clean-generic clean-libtool clean-local \
+        clean-recursive ctags ctags-recursive dist dist-all dist-bzip2 \
+        dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
         distclean-generic distclean-libtool distclean-recursive \
         distclean-tags distcleancheck distdir distuninstallcheck dvi \
@@ -676 +676 @@
         maintainer-clean-recursive mostlyclean mostlyclean-generic \
         mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
-        tags tags-recursive uninstall uninstall-am uninstall-info-am
+        tags tags-recursive uninstall uninstall-am uninstall-info-am \
+        uninstall-local
 
 
@@ -697 +698 @@
 unitTests: tests
 
+# Generate doxygen doc'n in subdirectories (except @PACKAGE_NAME@) if a doxydoc
+# directory is present, then do the base, if present.
+
 doxydoc:
-        cd $(srcdir); doxygen doxydoc/doxygen.conf
+        for dir in $(subdirs) ; do \
+          if test $$dir != @PACKAGE_NAME@ && test -r $$dir/doxydoc ; then \
+            (cd $$dir ; $(MAKE) doxydoc) \
+          fi ; \
+        done ; \
+        if test -r doxydoc/doxygen.conf ; then \
+          doxygen doxydoc/doxygen.conf ; \
+        fi
+
+clean-doxydoc:
+        ( cd doxydoc ; rm -rf html *.log *.tag )
+
+# DocInstallDir is defined in Makemain.inc and is specific to the package.
+# For the short term, adopt the notion that we install only the package
+# doxydoc.
+
+install-doxydoc: doxydoc
+        if test -r doxydoc/doxygen.conf ; then \
+          $(mkdir_p) $(DocInstallDir) ; \
+          cp -R doxydoc $(DocInstallDir) ; \
+        fi
+
+uninstall-doxydoc:
+        rm -rf $(DocInstallDir)/doxydoc
+
+clean-local: clean-doxydoc
+# install-data-local: install-doxydoc
+uninstall-local: uninstall-doxydoc
 
 .PHONY: test unitTest tests unitTests doxydoc