[rygel] build: unify and hence simplify core build

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 8ef3f4c39d9cf4aa9c83f428776c6a8052fe526d
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Sun Jul 26 01:41:51 2009 +0300

    build: unify and hence simplify core build
    
    No need to build vapi separately from rest of rygel

 src/rygel/Makefile.am |   49 ++++++++++++++++++++++---------------------------
 1 files changed, 22 insertions(+), 27 deletions(-)
---
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index e620462..10d8d2a 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -41,26 +41,6 @@ rygel_SOURCES = $(VAPI_SOURCE_FILES) \
 		rygel-root-device-factory.vala \
 		rygel-main.vala
 
-rygel_VALAFLAGS = \
-	--vapidir=$(srcdir) --thread \
-	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
-	--pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 --pkg sqlite3
-
-rygel_LDADD = $(LIBGUPNP_LIBS) \
-	      $(LIBGUPNP_AV_LIBS) \
-	      $(LIBGSTREAMER_LIBS) \
-	      $(GIO_LIBS) \
-	      $(GEE_LIBS) \
-	      $(UUID_LIBS) \
-	      $(LIBSOUP_LIBS) \
-	      $(LIBDBUS_GLIB_LIBS) \
-	      $(LIBSQLITE3_LIBS) \
-	      librygel-configuration.a
-rygel_LDFLAGS = -export-dynamic
-
-VAPI_FILES = rygel-1.0.vapi
-DEPS_FILES = rygel-1.0.deps
-
 VAPI_SOURCE_FILES = rygel-configuration.vala \
 		    rygel-user-config.vala \
 		    rygel-meta-config.vala \
@@ -99,11 +79,29 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
 		    rygel-media-db-container.vala \
 		    rygel-media-db-object-factory.vala
 
+rygel_VALAFLAGS = \
+	-H rygel.h -C --library=rygel-1.0 --vapidir=$(srcdir) --thread \
+	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg dbus-glib-1 \
+	--pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 --pkg sqlite3
+
+rygel_LDADD = $(LIBGUPNP_LIBS) \
+	      $(LIBGUPNP_AV_LIBS) \
+	      $(LIBGSTREAMER_LIBS) \
+	      $(GIO_LIBS) \
+	      $(GEE_LIBS) \
+	      $(UUID_LIBS) \
+	      $(LIBSOUP_LIBS) \
+	      $(LIBDBUS_GLIB_LIBS) \
+	      $(LIBSQLITE3_LIBS) \
+	      librygel-configuration.a
+rygel_LDFLAGS = -export-dynamic
+
+VAPI_FILES = rygel-1.0.vapi
+DEPS_FILES = rygel-1.0.deps
+
+vapidir = $(VAPIDIR)
+vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
 rygel-1.0.vapi rygel.h: $(VAPI_SOURCE_FILES)
-	$(VALAC) -H rygel.h -C --library=rygel-1.0 --vapidir=$(srcdir) \
-	--pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0 \
-	--pkg gstreamer-0.10 --pkg sqlite3 --pkg dbus-glib-1 \
-	$(VAPI_SOURCE_FILES)
 
 noinst_LIBRARIES = librygel-configuration.a
 
@@ -113,9 +111,6 @@ librygel_configuration_a_SOURCES = rygel-configuration.c \
 				   rygel-cmdline-config.c \
 				   cstuff.c
 
-vapidir = $(VAPIDIR)
-vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
-
 MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
 EXTRA_DIST = cstuff.vapi \
              $(VAPI_FILES) \