gnomemm r1281 - in libgnomemm/trunk: . docs/reference

[murrayc svn gnome org]

Author: murrayc
Date: Thu Jan 17 11:02:58 2008
New Revision: 1281
URL: http://svn.gnome.org/viewvc/gnomemm?rev=1281&view=rev

Log:
2008-01-13  Murray Cumming  <murrayc murrayc com>

* docs/reference/Makefile.am: Distribute the generated HTML.
Bug #489762 (manphiz)

Modified:
   libgnomemm/trunk/ChangeLog
   libgnomemm/trunk/NEWS
   libgnomemm/trunk/configure.in
   libgnomemm/trunk/docs/reference/Makefile.am

Modified: libgnomemm/trunk/NEWS
==============================================================================
--- libgnomemm/trunk/NEWS	(original)
+++ libgnomemm/trunk/NEWS	Thu Jan 17 11:02:58 2008
@@ -1,3 +1,7 @@
+2.20.1:
+
+* Distribute the generated HTML documentation.
+
 2.20.0:
 
 * Updated version number to match GNOME version.

Modified: libgnomemm/trunk/configure.in
==============================================================================
--- libgnomemm/trunk/configure.in	(original)
+++ libgnomemm/trunk/configure.in	Thu Jan 17 11:02:58 2008
@@ -17,7 +17,7 @@
 #########################################################################
 LIBGNOMEMM_MAJOR_VERSION=2
 LIBGNOMEMM_MINOR_VERSION=20
-LIBGNOMEMM_MICRO_VERSION=0
+LIBGNOMEMM_MICRO_VERSION=1
 
 #
 # +1 : ? : +1  == new interface that does not break old one

Modified: libgnomemm/trunk/docs/reference/Makefile.am
==============================================================================
--- libgnomemm/trunk/docs/reference/Makefile.am	(original)
+++ libgnomemm/trunk/docs/reference/Makefile.am	Thu Jan 17 11:02:58 2008
@@ -1,18 +1,13 @@
-
 doxygen_configfile = Doxyfile
+doxygen_configfile_source = $(srcdir)/Doxyfile.in
 web_path_reference = /home/groups/g/gt/gtkmm/htdocs/gtkmm2DONTUPLOADTHIS/reference
 
-EXTRA_DIST	= README $(doxygen_configfile)
-
+EXTRA_DIST = README $(doxygen_configfile) $(doxygen_configfile_source) html html/index.html
 
-libgnomeuimm-reference: $(doxygen_configfile)
+html/index.html: $(doxygen_configfile_source)
+	-rm -rf html
 	doxygen $(doxygen_configfile)
 
-libgnomeuimm-reference-html: libgnomeuimm-reference
-
-libgnomeuimm-reference-html.tar.gz: libgnomeuimm-reference-html
-	tar -cf - $< | gzip > $@
-
 
 post-html: libgnomeuimm-reference
 	(cd html && tar -cf - *.html *.gif *.css | gzip -3 | \
@@ -21,7 +16,27 @@
 
 all-local: libgnomeuimm-reference
 
-clean-local:
-	-rm -rf html
-	-rm -f libgnomeuimm-reference-html.tar.gz
+
+mm_docdir = $(datadir)/doc/libgnomemm-2.6/docs
+referencetopdir = $(mm_docdir)/reference
+referencedir = $(referencetopdir)/html
+
+install-reference: html/index.html
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(referencedir)
+	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot ; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(INSTALL_DATA) $$p $(DESTDIR)$(referencedir)/$$f"; \
+	  $(INSTALL_DATA) $$p $(DESTDIR)$(referencedir)/$$f; \
+	done
+
+
+uninstall-reference: html/index.html
+	@$(NORMAL_UNINSTALL)
+	@dir='$(<D)'; for p in $$dir/*.html $$dir/*.css $$dir/*.png $$dir/*.dot ; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(referencedir)/$$f"; \
+	  rm -f $(DESTDIR)$(referencedir)/$$f; \
+	done
+