[ease/libraries: 8/138] [build] Cleaned up packages.

[Nate Stedman <natesm src gnome org>]

commit c0b32f8d52d291c7a79fddba52184c242d4c9a81
Author: Nate Stedman <natesm gmail com>
Date:   Sun Jul 4 17:56:05 2010 -0400

    [build] Cleaned up packages.

 Makefile.am         |    2 +-
 configure.ac        |   34 ++++++++++++++++++++++++++--------
 libease/Makefile.am |   13 +------------
 src/Makefile.am     |    5 ++++-
 4 files changed, 32 insertions(+), 22 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index dfa0923..2c0ae1a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -27,7 +27,7 @@ theme_DATA = $(wildcard $(top_srcdir)/themes/*.easetheme)
 
 doc: libease/*.vala
 	rm -rf doc
-	valadoc --internal --private --pkg "json-glib-1.0" --pkg "gee-1.0"  --pkg "clutter-gtk-0.10" --pkg "clutter-gst-1.0" --pkg "libarchive" --directory=./doc --basedir=src ./libease/*.vala
+	valadoc --internal --private $(EASE_PACKAGES) --directory=./doc --basedir=src ./libease/*.vala
 	gnome-open doc/doc/Ease.html
 
 archive: themes/* examples/*
diff --git a/configure.ac b/configure.ac
index 86606f2..d46919a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,11 +3,11 @@ AC_INIT([Ease], [0.1], [https://bugzilla.gnome.org/enter_bug.cgi?product=ease],
 AC_PREREQ([2.59])
 
 AC_CONFIG_FILES([Makefile
-                 po/Makefile.in
-                 data/Makefile
-                 libease/Makefile
-                 src/Makefile
-                 ease-0.1.pc])
+	  po/Makefile.in
+	  data/Makefile
+	  libease/Makefile
+	  src/Makefile
+	  ease-0.1.pc])
 
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
@@ -33,9 +33,27 @@ GNOME_COMPILE_WARNINGS([maximum])
 GNOME_MAINTAINER_MODE_DEFINES
 
 dnl FIXME
-pkg_modules="clutter-gtk-0.10 >= 0.10 gee-1.0 >= 0.5.0 clutter-gst-1.0 >= 1.0.0 json-glib-1.0 >= 0.7.6 libarchive gmodule-2.0"
-
-EASE_PACKAGES="--pkg glib-2.0 --pkg gtk+-2.0 --pkg clutter-1.0 --pkg gdk-2.0 --pkg libxml-2.0 --pkg gee-1.0 --pkg clutter-gtk-0.10 --pkg cogl-1.0 --pkg gio-2.0 --pkg clutter-gst-1.0 --pkg libarchive --pkg gmodule-2.0"
+pkg_modules=" \
+	clutter-gtk-0.10 >= 0.10 \
+	gee-1.0 >= 0.5.0 \
+	clutter-gst-1.0 >= 1.0.0 \
+	json-glib-1.0 >= 0.7.6 \
+	libarchive \
+	gmodule-2.0"
+
+EASE_PACKAGES=" \
+	--pkg glib-2.0 \ 
+	--pkg gtk+-2.0 \
+	--pkg clutter-1.0 \
+	--pkg gdk-2.0 \
+	--pkg libxml-2.0 \
+	--pkg gee-1.0 \
+	--pkg clutter-gtk-0.10 \
+	--pkg cogl-1.0 \
+	--pkg gio-2.0 \
+	--pkg clutter-gst-1.0 \
+	--pkg libarchive \
+	--pkg gmodule-2.0"
 
 EASE_CFLAGS="\`pkg-config --cflags \
 	glib-2.0 \
diff --git a/libease/Makefile.am b/libease/Makefile.am
index 5736da5..1db4cb1 100644
--- a/libease/Makefile.am
+++ b/libease/Makefile.am
@@ -60,18 +60,7 @@ libease_0_1_la_SOURCES = \
 
 # compiler flags
 libease_0_1_la_VALAFLAGS = \
-	--pkg glib-2.0 \
-	--pkg gtk+-2.0 \
-	--pkg clutter-1.0 \
-	--pkg gdk-2.0 \
-	--pkg gee-1.0 \
-	--pkg clutter-gtk-0.10 \
-	--pkg cogl-1.0 \
-	--pkg gio-2.0 \
-	--pkg clutter-gst-1.0 \
-	--pkg json-glib-1.0 \
-	--pkg libarchive \
-	--pkg gmodule-2.0 \
+	$(EASE_PACKAGES) \
 	--vapi=ease.vapi \
 	--header=libease.h \
 	--thread \
diff --git a/src/Makefile.am b/src/Makefile.am
index 4af3623..5d685f1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,10 @@ bin_PROGRAMS = ease
 ease_SOURCES = main.vala
 
 # compiler flags
-ease_VALAFLAGS = --pkg ease --pkg gtk+-2.0 --pkg clutter-1.0 --pkg gee-1.0 --pkg json-glib-1.0 --vapidir ../libease
+ease_VALAFLAGS = \
+	--pkg ease \
+	$(EASE_PACKAGES) \
+	--vapidir ../libease
 
 ease_LDADD = \
 	../libease/libease-0.1.la \