GNOME.org
 

[nautilus-actions] Fix Makefile.am's to make distchek

commit ce5c104641f9b23935372718ac20a79c5ccd142b
Author: Pierre Wieser <pwieser trychlos org>
Date:   Sun Aug 15 14:31:13 2010 +0200

    Fix Makefile.am's to make distchek
    
    Distribute generated HTML and PDF docs.

 .gitignore           |    1 +
 ChangeLog            |    3 +
 Makefile.am          |    3 +
 doc/api/Makefile.am  |    8 ++-
 doc/nact/.gitignore  |    2 +
 doc/nact/Makefile.am |  143 +++++++++++++++++++++++++++++++++++++------------
 6 files changed, 122 insertions(+), 38 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 37c16e9..e5a13f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,7 @@ stamp-h1
 *.o
 *.la
 *.lo
+*.log
 *.bak
 *.gladep
 nautilus-actions-*.tar.gz
diff --git a/ChangeLog b/ChangeLog
index 674b35a..30f5d02 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-13 Pierre Wieser <pwieser trychlos org>
 
+	* doc/api/nautilus-actions-sections.txt:
+	* doc/api/nautilus-actions-docs.xml: New files.
+
 	* src/io-desktop/nadp-desktop-file.c (nadp_desktop_file_set_locale_string):
 	Write all available locales to have a chance another locale can get it.
 
diff --git a/Makefile.am b/Makefile.am
index 7f514e3..878e473 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ DISTCHECK_CONFIGURE_FLAGS += \
 
 EXTRA_DIST = \
 	gnome-doc-utils.make				\
+	gtk-doc.make						\
 	intltool-extract.in					\
 	intltool-merge.in					\
 	intltool-update.in					\
@@ -60,6 +61,7 @@ EXTRA_DIST = \
 
 DISTCLEANFILES = \
 	gnome-doc-utils.make				\
+	gtk-doc.make						\
 	intltool-extract					\
 	intltool-merge						\
 	intltool-update						\
@@ -73,6 +75,7 @@ dist_pkgdoc_DATA = \
 	ChangeLog-2008						\
 	ChangeLog-2009						\
 	COPYING								\
+	COPYING-DOCS						\
 	INSTALL								\
 	MAINTAINERS							\
 	NEWS								\
diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am
index f19d66d..f80e634 100644
--- a/doc/api/Makefile.am
+++ b/doc/api/Makefile.am
@@ -35,6 +35,8 @@ DOC_MODULE_VERSION = 3
 
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
 
+doc_sections = $(DOC_MODULE)-sections.txt
+
 # from the API documentation point of view
 # we have to ignore all headers in src/core, and all corresponding source
 # that is, only consider in src/core .c sources whose header is in src/api
@@ -68,8 +70,8 @@ SCAN_OPTIONS = \
 
 # The directory containing the source code. Relative to $(srcdir)
 DOC_SOURCE_DIR = \
-	../../src/api 								\
-	--source-dir=../../src/core					\
+	$(top_srcdir)/src/api 						\
+	--source-dir=$(top_srcdir)/src/core			\
 	$(NULL)
 
 # Used for dependencies
@@ -167,4 +169,4 @@ EXTRA_DIST += \
 	$(xml_in_files)								\
 	$(NULL)
 
-TESTS = ($GTKDOC_CHECK)
+#TESTS = $(GTKDOC_CHECK)
diff --git a/doc/nact/.gitignore b/doc/nact/.gitignore
new file mode 100644
index 0000000..3b062ee
--- /dev/null
+++ b/doc/nact/.gitignore
@@ -0,0 +1,2 @@
+nautilus-actions-config-tool
+nautilus-actions-config-tool.junk
diff --git a/doc/nact/Makefile.am b/doc/nact/Makefile.am
index 75fc48f..ee4d511 100644
--- a/doc/nact/Makefile.am
+++ b/doc/nact/Makefile.am
@@ -31,8 +31,6 @@
 
 include $(top_srcdir)/gnome-doc-utils.make
 
-dist-hook: doc-dist-hook
-
 DOC_MODULE = nautilus-actions-config-tool
 
 DOC_ENTITIES = \
@@ -100,53 +98,128 @@ DOC_FIGURES = \
 DOC_LINGUAS = \
 	$(NULL)
 
-# generate HTML and PDF NACT user's manual if --enable-manuals has been set
-all-local: manuals
+# generate HTML and PDF NACT user's manual if 
+# --enable-html-manuals and/or --enable-pdf-manuals have been set
+# the generated docs are installed in pkgdocdir/doc/{html|pdf}/
 
-manuals: html-manual pdf-manual
+pkgdocdir = $(datarootdir)/doc/@PACKAGE -@VERSION@
 
-sources_dir = $(top_srcdir)/doc/nact/C
+all-local: all-manuals
 
-target_dir = $(top_builddir)/doc/nact/C
+all-manuals: all-html-manuals all-pdf-manuals
 
-# let DOC_MODULE.xml be the first of the list
-sources_files = \
-	$(addprefix 									\
-		$(sources_dir)/, 							\
-			$(DOC_MODULE).xml						\
-			$(DOC_ENTITIES)							\
-			$(DOC_INCLUDES)							\
-			$(DOC_FIGURES))							\
-	$(NULL)
+install-data-local: install-manuals
 
-$(sources_files):
+install-manuals: install-html-manuals install-pdf-manuals
 
-target_html = $(target_dir)/$(DOC_MODULE)/$(DOC_MODULE).html
+uninstall-local: uninstall-manuals
 
-target_pdf = $(target_dir)/$(DOC_MODULE).pdf
+uninstall-manuals: uninstall-html-manuals uninstall-pdf-manuals
 
-if ENABLE_HTML_MANUALS
-html-manual: $(target_html)
+dist-hook: doc-dist-hook dist-html-manuals-hook dist-pdf-manuals-hook
 
-$(target_html): $(sources_files)
-	@echo "Generating $(target_html)..."
-	-db2html -b html -u $<
+if ENABLE_HTML_MANUALS
+all-html-manuals: html.stamp
+
+html.stamp: $(_DOC_C_DOCS) $(_DOC_C_FIGURES) ChangeLog
+	@-for i in C $(_DOC_REAL_LINGUAS); do \
+		rm -fr $$i/$(DOC_MODULE).junk; \
+		echo "Generating $$i/$(DOC_MODULE)/$(DOC_MODULE).html ..."; \
+		if ! test -d $$i; then $(MKDIR_P) $$i; fi; \
+		(cd $$i; \
+		 if test "x$(abs_srcdir)" != "x$(abs_builddir)"; then cp $(abs_srcdir)/$$i/*.xml .; fi; \
+		 db2html --nochunks $(DOC_MODULE).xml; \
+		 if test "x$(abs_srcdir)" != "x$(abs_builddir)"; then rm -f *.xml .; fi; \
+		); \
+		cp -rp $(abs_srcdir)/$$i/figures $$i/$(DOC_MODULE)/; \
+		chmod -R u+w $$i/$(DOC_MODULE); \
+	done
+	touch html.stamp
+
+install-html-manuals:
+	@-for _lc in C $(_DOC_REAL_LINGUAS); do \
+		_srcdir=$(top_builddir)/doc/nact/$$_lc/$(DOC_MODULE); \
+		_destdir=$(DESTDIR)$(pkgdocdir)/html/$$_lc; \
+		if ! test -d $$_destdir; then $(MKDIR_P) $$_destdir; fi; \
+		find $$_srcdir -type f | while read _f; do \
+			_dname=`dirname $$_f`; \
+			_subdir=`echo "$$_dname" | sed "s|^$$_srcdir[/]*||"`; \
+			if ! test -d "$$_destdir/$$_subdir"; then $(MKDIR_P) "$$_destdir/$$_subdir"; fi; \
+			_bname=`basename "$$_f"`; \
+			echo $(INSTALL_DATA) "$$_f" "$$_destdir/$$_subdir/$$_bname"; \
+			$(INSTALL_DATA) "$$_f" "$$_destdir/$$_subdir/$$_bname"; \
+		done; \
+	done
+
+uninstall-html-manuals:
+	rm -fr $(DESTDIR)$(pkgdocdir)/html
+
+dist-html-manuals-hook:
+	for _lc in C $(_DOC_REAL_LINGUAS); do \
+		$(MKDIR_P) $(distdir)/html/$$_lc; \
+		cp -r $(top_builddir)/doc/nact/$$_lc/$(DOC_MODULE)/* $(distdir)/html/$$_lc/; \
+	done
+	find $(distdir)/html -type d -exec chmod 755 {} \;
+	find $(distdir)/html -type f -exec chmod 644 {} \;
 else
-html-manual:
+all-html-manuals:
+
+install-html-manuals:
+
+uninstall-html-manuals:
+
+dist-html-manuals-hook:
 endif
 
 if ENABLE_PDF_MANUALS
-pdf-manual: $(target_pdf)
-
-$(target_pdf): $(sources_files)
-	@echo "Generating $(target_pdf)..."
-	-dblatex $< >/dev/null
+all-pdf-manuals: pdf.stamp
+
+pdf.stamp: $(_DOC_C_DOCS) $(_DOC_C_FIGURES) ChangeLog
+	@-for i in C $(_DOC_REAL_LINGUAS); do \
+		_target=$$i/$(DOC_MODULE).pdf; \
+		echo "Generating $$_target ..."; \
+		if ! test -d $$i; then $(MKDIR_P) $$i; fi; \
+		echo "dblatex --output $$_target $<"; \
+		dblatex --output $$_target $<; \
+	done
+	touch pdf.stamp
+
+install-pdf-manuals:
+	@-for _lc in C $(_DOC_REAL_LINGUAS); do \
+		_srcdir=$(top_builddir)/doc/nact/$$_lc; \
+		_destdir=$(DESTDIR)$(pkgdocdir)/pdf/$$_lc; \
+		if ! test -d $$_destdir; then $(MKDIR_P) $$_destdir; fi; \
+		echo $(INSTALL_DATA) "$$_srcdir/$(target).pdf" "$$_destdir/$(target).pdf"; \
+		$(INSTALL_DATA) "$$_srcdir/$(target).pdf" "$$_destdir/$(target).pdf"; \
+	done
+
+uninstall-pdf-manuals:
+	rm -fr $(DESTDIR)$(pkgdocdir)/pdf
+
+dist-pdf-manuals-hook:
+	for _lc in C $(_DOC_REAL_LINGUAS); do \
+		$(MKDIR_P) $(distdir)/pdf/$$_lc; \
+		cp $(top_builddir)/doc/nact/$$_lc/$(DOC_MODULE).pdf $(distdir)/pdf/$$_lc/; \
+	done
+	find $(distdir)/pdf -type d -exec chmod 755 {} \;
+	find $(distdir)/pdf -type f -exec chmod 644 {} \;
 else
-pdf-manual:
+all-pdf-manuals:
+
+install-pdf-manuals:
+
+uninstall-pdf-manuals:
+
+dist-pdf-manuals-hook:
 endif
 
-clean-local:
+clean-local: clean-manuals
 	rm -f *~
-	rm -f  $(target_dir)/*.pdf
-	rm -f  $(target_dir)/*.html
-	rm -fr $(target_dir)/$(DOC_MODULE)
+	rm -f *.stamp
+
+distclean-local: clean-manuals
+
+clean-manuals:
+	for lc in C $(_DOC_REAL_LINGUAS); do \
+		rm -fr $$lc; \
+	done
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]