[gnome-video-effects] use non-recursive automake



commit 23696cabf5a2c0739abf4cc1089ad72124d69604
Author: daniel g. siegel <dgsiegel gnome org>
Date:   Mon Feb 7 13:39:50 2011 +0100

    use non-recursive automake
    
    this reduces the automake setup to a single Makefile.am file
    in top_srcdir. for more information see
    http://www.flameeyes.eu/autotools-mythbuster/automake/nonrecursive.html
    http://www.openismus.com/documents/linux/automake/automake.shtml

 Makefile.am         |   21 +++++++++++++++------
 configure.ac        |    1 -
 effects/Makefile.am |   11 -----------
 3 files changed, 15 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 8638fc8..702f9c9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,27 @@
-SUBDIRS = effects
-
 DIST_SUBDIRS = $(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)
+
+effects_DATA = $(effects_in_files:.effect.in=.effect)
+
 EXTRA_DIST = \
+	$(effects_in_files) \
 	README \
 	$(NULL)
 
 CLEANFILES = gnome-video-effects.pc
 
 DISTCLEANFILES = \
-	gnome-doc-utils.make
-
-pkgconfigdir = $(datadir)/pkgconfig
-pkgconfig_DATA = gnome-video-effects.pc
+	$(effects_DATA) \
+	gnome-doc-utils.make \
+	$(NULL)
 
 dist-hook:
 	@if test -d "$(srcdir)/.git"; \
diff --git a/configure.ac b/configure.ac
index 6df60a2..76ab843 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,6 @@ AC_PROG_LN_S
 AC_CONFIG_FILES([
 Makefile
 gnome-video-effects.pc
-effects/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]