[gnome-video-effects] Overhaul build system

[David King <davidk src gnome org>]

commit f1db7178687c28f9daeff9c5daa8bb13375fc06e
Author: David King <amigadave amigadave com>
Date:   Mon Jan 30 16:49:10 2012 +0000

    Overhaul build system
    
    Update .gitignore. Simplify Makefile.am. Update configure.ac, and do not
    use AM_GNU_GETTEXT with IT_PROG_INTLTOOL. Create an empty build-aux
    directory in autogen.sh.

 .gitignore   |   59 +++++++++++++++++++++++++++------------------------------
 Makefile.am  |   28 ++++++++++++--------------
 autogen.sh   |    4 ++-
 configure.ac |   18 ++++++++--------
 4 files changed, 53 insertions(+), 56 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5e7de1d..1d0f543 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,33 +1,30 @@
-Makefile
-Makefile.in*
-stamp-it
-POTFILES
-xmldocs.make
 .deps
-.libs
-install-sh
-libtool
-omf-make
-*.mo
-*.gmo
-gnome-doc-utils.make
-intltool*.in
-missing
-ltmain.sh
-stamp-h1
-.intltool-merge-cache
-missing
-mkinstalldirs
-depcomp
-configure
-aclocal.m4
-autom4te.cache
-config.*
-omf.make
-.lock-wscript
-.waf-*
-_build_
 *.swp
-*.effect
-gnome-video-effects.pc
-previews
+Makefile
+Makefile.in*
+/build-aux/
+/effects/*.effect
+/m4/
+/po/*.gmo
+/po/*.mo
+/po/.intltool-merge-cache
+/po/Makevars.template
+/po/POTFILES
+/po/Rules-quot
+/po/boldquot.sed
+/po/en boldquot header
+/po/en quot header
+/po/gnome-video-effects.pot
+/po/insert-header.sin
+/po/quot.sed
+/po/remove-potcdate.sin
+/po/stamp-it
+/preview/
+/ABOUT-NLS
+/aclocal.m4
+/autom4te.cache
+/config.*
+/configure
+/gnome-video-effects.pc
+/gnome-video-effects-*.tar.*
+/intltool*.in
diff --git a/Makefile.am b/Makefile.am
index 000f026..03169d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,42 +1,40 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-DIST_SUBDIRS = $(SUBDIRS) po
+# This causes the po directory to be distributed, but not installed, as the
+# translations are included directly in the effect files.
+DIST_SUBDIRS = po
 
 pkgconfigdir = $(datadir)/pkgconfig
 pkgconfig_DATA = gnome-video-effects.pc
 
 %.effect: %.effect.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
 
-effectsdir = $(datadir)/gnome-video-effects
-effects_in_files = $(wildcard effects/*.effect.in) \
-	$(NULL)
+effectsdir = $(pkgdatadir)
+effects_in_files = $(wildcard effects/*.effect.in)
 
 effects_DATA = $(effects_in_files:.effect.in=.effect)
 
 dist_noinst_SCRIPTS = autogen.sh
 
-EXTRA_DIST = \
-	$(effects_in_files) \
-	README \
-	$(NULL)
+dist_noinst_DATA = $(effects_in_files)
 
 CLEANFILES = \
 	$(effects_DATA) \
-	gnome-video-effects.pc \
-	$(NULL)
+	gnome-video-effects.pc
 
 DISTCLEANFILES = \
-	$(effects_DATA) \
-	gnome-doc-utils.make \
-	$(NULL)
+	intltool-extra \
+	intltool-merge \
+	intltool-update \
+	po/.intltool-merge-cache
 
 dist-hook:
-	@if test -d "$(srcdir)/.git"; \
+	$(AM_V_at)if test -d "$(srcdir)/.git"; \
 	then \
 		echo Creating ChangeLog && \
 		( cd "$(top_srcdir)" && \
 		  echo '# Generated by Makefile. Do not edit.'; echo; \
-		  $(top_srcdir)/missing --run git log \
+		  $(top_srcdir)/build-aux/missing --run git log \
 			--stat -M -C --name-status --no-color ) | \
 			fmt --split-only > ChangeLog.tmp \
 		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
diff --git a/autogen.sh b/autogen.sh
index db8e20e..2b7c525 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,7 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gnome-video-effects"
 
-(test -f $srcdir/configure.ac) || {
+(test -f $srcdir/gnome-video-effects.pc.in) || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level $PKG_NAME directory"
     exit 1
@@ -17,4 +17,6 @@ which gnome-autogen.sh || {
     exit 1
 }
 
+mkdir -p build-aux
+
 . gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index ecb14a6..b3b9fa0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,12 +1,16 @@
 # Process this file with autoconf to produce a configure script.
-
+AC_PREREQ([2.64])
 AC_INIT([gnome-video-effects],
 	[0.3.0],
-	[http://bugzilla.gnome.org/enter_bug.cgi?],
+	[https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-video-effects],
 	[gnome-video-effects],
 	[http://live.gnome.org/GnomeVideoEffects])
 
-AM_INIT_AUTOMAKE([1.11.1 -Wall subdir-objects])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_SRCDIR([gnome-video-effects.pc.in])
+AC_CONFIG_MACRO_DIR([m4])
+
+AM_INIT_AUTOMAKE([1.11.1 -Wall dist-xz no-define no-dist-gzip nostdinc subdir-objects])
 
 AM_SILENT_RULES([yes])
 
@@ -14,12 +18,8 @@ AM_SILENT_RULES([yes])
 #*******************************************************************************
 # Internationalization
 #*******************************************************************************
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.17])
-
-GETTEXT_PACKAGE=gnome-video-effects
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
+AC_SUBST([GETTEXT_PACKAGE], [$PACKAGE_TARNAME])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [GETTEXT package name])
 
 IT_PROG_INTLTOOL([0.40.0])