[libexif-cvs] libexif/doc Makefile.am,1.11,1.12

[Hans U. N. <hu...@us...>]

Update of /cvsroot/libexif/libexif/doc
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv3250/doc

Modified Files:
	Makefile.am 
Log Message:
reorganize doxygen rules

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif/doc/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -d -r1.11 -r1.12
--- Makefile.am	21 May 2007 23:27:34 -0000	1.11
+++ Makefile.am	22 May 2007 22:41:22 -0000	1.12
@@ -11,63 +11,59 @@ DOXYGEN_UNINSTALL_TARGETS =
 
 DOXYGEN_CLEAN_TARGETS =
 
-if HAVE_DOXYGEN
+DOXYGEN_TARBALLS =
 
-DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp
-DOXYGEN_UPLOAD += $(HTML_APIDOC_DIR).uploaded
+# FIXME: Depending on the source files would be sufficient.
+#        Depending on libexif.la works at least, however.
+$(top_builddir)/libexif/libexif.la:
+	cd $(top_builddir)/libexif && $(MAKE) libexif.la
 
-if ENABLE_INTERNAL_DOCS
-DOXYGEN_STAMPS += $(HTML_APIDOC_INTERNALS_DIR).stamp
-DOXYGEN_UPLOAD += $(HTML_APIDOC_INTERNALS_DIR).uploaded
-endif
+if HAVE_DOXYGEN
 
-DOXYGEN_STAMPS += $(DOXYGEN_OUTPUT_DIR).stamp
+DOXYGEN_UPLOAD += $(HTML_APIDOC_DIR).uploaded
 
-# FIXME: Depending on the source files would be sufficient...
+DOXYGEN_STAMPS += $(HTML_APIDOC_DIR).stamp
 $(HTML_APIDOC_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
-	doxygen $<
-	echo > $@
-
-# FIXME: Depending on the source files would be sufficient...
-$(HTML_APIDOC_INTERNALS_DIR).stamp: Doxyfile-internals $(top_builddir)/libexif/libexif.la
-	doxygen $<
+	$(DOXYGEN) $<
 	echo > $@
 
-$(DOXYGEN_OUTPUT_DIR).stamp: Doxyfile $(top_builddir)/libexif/libexif.la
-	doxygen $<
-	echo > $@
+DOXYGEN_TARBALLS += $(HTML_APIDOC_DIR).tar.gz
+$(HTML_APIDOC_DIR).tar.gz: $(HTML_APIDOC_DIR).stamp
+	(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@
 
-$(top_builddir)/libexif/libexif.la:
-	cd $(top_builddir)/libexif && $(MAKE) libexif.la
+if ENABLE_INTERNAL_DOCS
+DOXYGEN_UPLOAD += $(HTML_APIDOC_INTERNALS_DIR).uploaded
 
-$(HTML_APIDOC_DIR).tar.gz: $(DOXYGEN_OUTPUT_DIR).stamp
-	(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_DIR) | GZIP=--best gzip -c) > $@
+DOXYGEN_STAMPS += $(HTML_APIDOC_INTERNALS_DIR).stamp
+$(HTML_APIDOC_INTERNALS_DIR).stamp: Doxyfile-internals $(top_builddir)/libexif/libexif.la
+	$(DOXYGEN) $<
+	echo > $@
 
-$(HTML_APIDOC_INTERNALS_DIR).tar.gz: $(DOXYGEN_OUTPUT_DIR).stamp
+DOXYGEN_TARBALLS += $(HTML_APIDOC_INTERNALS_DIR).tar.gz
+$(HTML_APIDOC_INTERNALS_DIR).tar.gz: $(HTML_APIDOC_INTERNALS_DIR).stamp
 	(cd $(DOXYGEN_OUTPUT_DIR) && $(AMTAR) chof - $(HTML_APIDOC_INTERNALS_DIR) | GZIP=--best gzip -c) > $@
 
-DOC_APIDOC_HTML = api.html
-DOC_APIDOC_INTERNALS_HTML = internals.html
-
-if ENABLE_INTERNAL_DOCS
 DOXYGEN_INSTALL_TARGETS += install-apidocs-internals
 install-apidocs-internals: $(HTML_APIDOC_INTERNALS_DIR).stamp
 	$(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)
 	$(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_INTERNALS_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)/
-endif
 
-DOXYGEN_INSTALL_TARGETS += install-apidocs
-install-apidocs: $(HTML_APIDOC_DIR).stamp
-	$(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)
-	$(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)/
-
-if ENABLE_INTERNAL_DOCS
 DOXYGEN_UNINSTALL_TARGETS += uninstall-apidocs-internals
 uninstall-apidocs-internals:
 	cd "$(DESTDIR)$(docdir)" && rm -f $(DOC_APIDOC_INTERNALS_HTML)/*
 	rmdir $(DESTDIR)$(docdir)/$(DOC_APIDOC_INTERNALS_HTML)
+
 endif
 
+# Directory names used while installing
+DOC_APIDOC_HTML = api.html
+DOC_APIDOC_INTERNALS_HTML = internals.html
+
+DOXYGEN_INSTALL_TARGETS += install-apidocs
+install-apidocs: $(HTML_APIDOC_DIR).stamp
+	$(INSTALL) -m 0755 -d $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)
+	$(INSTALL) -m 0644 $(DOXYGEN_OUTPUT_DIR)/$(HTML_APIDOC_DIR)/* $(DESTDIR)$(docdir)/$(DOC_APIDOC_HTML)/
+
 DOXYGEN_UNINSTALL_TARGETS += uninstall-apidocs
 uninstall-apidocs:
 	cd "$(DESTDIR)$(docdir)" && rm -f $(DOC_APIDOC_HTML)/*
@@ -76,7 +72,7 @@ uninstall-apidocs:
 DOXYGEN_CLEAN_TARGETS += clean-apidocs
 clean-apidocs:
 	rm -rf $(DOXYGEN_OUTPUT_DIR)
-	rm -f $(HTML_APIDOC_DIR).tar.gz
+	rm -f $(HTML_APIDOC_DIR).tar.gz $(HTML_APIDOC_INTERNALS_DIR).tar.gz
 
 $(DOXYGEN_UPLOAD): $(DOXYGEN_STAMPS)
 	find $(DOXYGEN_OUTPUT_DIR) \( -type d -exec chmod a+rx,go-w,g+s {} \; \) \