From 0564202a417e3d8eb6aad2c93c6d5e716f967549 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 17 Apr 2009 21:37:53 -0400 Subject: [git.mk] Add gnome-doc-utils support --- Makefile.am | 1 + git.mk | 23 ++++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index a440d4f2..59d3f02e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,6 +50,7 @@ MAINTAINERCLEANFILES = \ $(srcdir)/mkinstalldirs \ $(srcdir)/omf.make \ $(srcdir)/xmldocs.make \ + $(srcdir)/gtk-doc.make \ $(srcdir)/ChangeLog \ `find "$(srcdir)" -type f -name Makefile.in -print` diff --git a/git.mk b/git.mk index 767d7d66..3809d715 100644 --- a/git.mk +++ b/git.mk @@ -35,6 +35,9 @@ # not tarballs. It serves no useful purpose in tarballs and clutters the # build dir. # +# This file knows how to handle autoconf, automake, libtool, gtk-doc, +# gnome-doc-utils, intltool. +# # # KNOWN ISSUES: # @@ -76,7 +79,8 @@ git-mk-install: .gitignore: Makefile.am $(top_srcdir)/git.mk @echo Generating $@; \ - GTKDOCGITIGNOREFILES=; test "x$(DOC_MODULE)" = x || \ + GTKDOCGITIGNOREFILES=; \ + test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x || \ GTKDOCGITIGNOREFILES=" \ $(DOC_MODULE)-decl-list.txt \ $(DOC_MODULE)-decl.txt \ @@ -84,6 +88,18 @@ git-mk-install: tmpl/*.bak \ xml html \ "; \ + GNOMEDOCUTILSGITIGNOREFILES=; \ + test "x$(DOC_MODULE)" = x -o "x$(DOC_LINGUAS)" = x || \ + GNOMEDOCUTILSGITIGNOREFILES=" \ + $(_DOC_C_DOCS) \ + $(_DOC_LC_DOCS) \ + $(_DOC_OMF_ALL) \ + $(_DOC_DSK_ALL) \ + $(_DOC_HTML_ALL) \ + $(_DOC_POFILES) \ + */.xml2po.mo \ + */*.omf.out \ + "; \ INTLTOOLGITIGNOREFILES=; test -f $(srcdir)/po/Makefile.in.in && \ INTLTOOLGITIGNOREFILES=" \ po/Makefile.in.in \ @@ -93,6 +109,7 @@ git-mk-install: po/*.mo \ po/POTFILES \ po/stamp-it \ + po/.intltool-merge-cache \ intltool-extract.in \ intltool-merge.in \ intltool-update.in \ @@ -105,12 +122,11 @@ git-mk-install: stamp-h1 \ libtool \ config.lt \ - gtk-doc.make \ - git.mk \ "; \ for x in \ .gitignore \ $$GTKDOCGITIGNOREFILES \ + $$GNOMEDOCUTILSGITIGNOREFILES \ $$INTLTOOLGITIGNOREFILES \ $$AUTOCONFGITIGNOREFILES \ $(GITIGNOREFILES) \ @@ -137,6 +153,7 @@ git-mk-install: "*.rej" \ "*.bak" \ "*~" \ + ".*.swp" \ ; do echo /$$x; done | \ grep -v '/[.][.]/' | \ sed 's@/[.]/@/@g' | \ -- cgit v1.2.1