build: Use automake-1.11's vala support

diff --git a/configure.ac b/configure.ac
index 3457c99..15c5fd5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,9 @@ AC_INIT([rygel],
        m4_esyscmd([GNOME_TAG_PATTERN=RYGEL build-aux/git-version-gen .tarball-version]),
        [http://live.gnome.org/Rygel])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE
+
+# require automake-1.11 for vala support
+AM_INIT_AUTOMAKE([1.11])
 AC_CONFIG_SRCDIR([src/rygel/rygel-root-device.vala])
 AM_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
@@ -52,19 +54,13 @@ AC_ARG_ENABLE(vala,
 # Vala
 if test x$enable_vala = xyes ; then
     # check for vala
-    PKG_CHECK_MODULES(VALA, [vala-1.0 >= $VALA_REQUIRED])
-    PKG_CHECK_MODULES(GUPNP_VALA, gupnp-vala-1.0 >= $GUPNP_VALA_REQUIRED)
-
-    # Vala compiler
-    # This is more to get the path of the compiler since the pkg-config check
-    # should covers check for compiler as well.
+    AM_PROG_VALAC([$VALA_REQUIRED])
 
-    AC_PATH_PROG(VALAC, valac, no)
-
-    if test "x$VALAC" = "xno"; then
-       AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
+    if test "x$VALAC" = "x"; then
+        AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])
     fi
 
+    PKG_CHECK_MODULES(GUPNP_VALA, gupnp-vala-1.0 >= $GUPNP_VALA_REQUIRED)
     VAPIDIR=`pkg-config --variable=vapidir vala-1.0`
 
     # FIXME: Whats the proper way for checking for particular Vala bindings

diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index aca0592..b5cdada 100644 (file)
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -9,24 +9,18 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGSTREAMER_CFLAGS) \
            -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-$(librygel_external_la_SOURCES) : rygel-external.stamp
-
-librygel_external_la_VALASOURCES = \
+librygel_external_la_SOURCES = \
                               rygel-external-content-dir.vala \
                               rygel-external-container.vala \
                               rygel-external-item.vala \
                               rygel-external-plugin.vala \
                               rygel-external-plugin-factory.vala
 
-librygel_external_la_SOURCES = \
-                       $(librygel_external_la_VALASOURCES:.vala=.c)
-
 rygel-external.stamp: $(librygel_external_la_VALASOURCES)
-       $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+librygel_external_la_VALAFLAGS = \
+       --vapidir=$(top_srcdir)/src/rygel \
        --pkg rygel-1.0 --pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-       --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 --pkg gconf-2.0 \
-       $^
-       touch $@
+       --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 --pkg gconf-2.0
 
 librygel_external_la_LIBADD = $(LIBGUPNP_LIBS) \
                               $(LIBGUPNP_AV_LIBS) \
@@ -35,6 +29,4 @@ librygel_external_la_LIBADD = $(LIBGUPNP_LIBS) \
                              $(GEE_LIBS)
 librygel_external_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-CLEANFILES = rygel-external.stamp
-MAINTAINERCLEANFILES = Makefile.in $(librygel_external_la_SOURCES)
-EXTRA_DIST = $(librygel_external_la_VALASOURCES) rygel-external.stamp
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 08d1f1c..98fcfb7 100644 (file)
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -9,18 +9,14 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
        $(GEE_CFLAGS) \
        -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-$(librygel_media_export_la_SOURCES) : rygel-media-export.stamp
-
-librygel_media_export_la_VALASOURCES = \
+librygel_media_export_la_SOURCES = \
        rygel-media-export-plugin.vala \
        rygel-media-export-root-container.vala \
        rygel-media-export-harvester.vala \
        rygel-media-export-item.vala
-librygel_media_export_la_SOURCES = \
-       $(librygel_media_export_la_VALASOURCES:.vala=.c)
 
-rygel-media-export.stamp: $(librygel_media_export_la_VALASOURCES)
-       $(VALAC) -g -C --vapidir=$(top_srcdir)/src/rygel \
+librygel_media_export_la_VALAFLAGS = \
+       --vapidir=$(top_srcdir)/src/rygel \
        --pkg rygel-1.0 \
        --pkg cstuff \
        --pkg gupnp-1.0 \
@@ -28,9 +24,7 @@ rygel-media-export.stamp: $(librygel_media_export_la_VALASOURCES)
        --pkg libsoup-2.4 \
        --pkg gee-1.0 \
        --pkg libxml-2.0 \
-       --pkg gconf-2.0 \
-       $^
-       touch $@
+       --pkg gconf-2.0
 
 librygel_media_export_la_LIBADD = \
        $(LIBGUPNP_LIBS) \
@@ -40,6 +34,4 @@ librygel_media_export_la_LIBADD = \
        $(GEE_LIBS)
 librygel_media_export_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-CLEANFILES = rygel-media-export.stamp
-MAINTAINERCLEANFILES = Makefile.in $(librygel_media_export_la_SOURCES)
-EXTRA_DIST = $(librygel_media_export_la_VALASOURCES) rygel-media-export.stamp
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index 4e65835..94f40f5 100644 (file)
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -11,20 +11,17 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/rygel \
        -DDATA_DIR='"$(datadir)"'
 
-$(librygel_mediathek_la_SOURCES) : rygel-mediathek.stamp
-
-librygel_mediathek_la_VALASOURCES = \
+librygel_mediathek_la_SOURCES = \
        rygel-mediathek-asx-playlist.vala \
        rygel-mediathek-plugin.vala \
        rygel-mediathek-video-item.vala \
        rygel-mediathek-root-container.vala \
        rygel-mediathek-rss-container.vala
 
-librygel_mediathek_la_SOURCES = \
-       $(librygel_mediathek_la_VALASOURCES:.vala=.c)
-
 rygel-mediathek.stamp: $(librygel_mediathek_la_VALASOURCES)
-       $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+       $(VALAC) -C
+librygel_mediathek_la_VALAFLAGS = \
+       --vapidir=$(top_srcdir)/src/rygel \
        --pkg rygel-1.0 \
        --pkg cstuff \
        --pkg gupnp-1.0 \
@@ -32,9 +29,7 @@ rygel-mediathek.stamp: $(librygel_mediathek_la_VALASOURCES)
        --pkg libsoup-2.4 \
        --pkg gee-1.0 \
        --pkg libxml-2.0 \
-       --pkg gconf-2.0 \
-       $^
-       touch $@
+       --pkg gconf-2.0
 
 librygel_mediathek_la_LIBADD = \
        $(LIBGUPNP_LIBS) \
@@ -45,6 +40,4 @@ librygel_mediathek_la_LIBADD = \
 
 librygel_mediathek_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-CLEANFILES = rygel-mediathek.stamp
-MAINTAINERCLEANFILES = Makefile.in $(librygel_mediathek_la_SOURCES)
-EXTRA_DIST = $(librygel_mediathek_la_VALASOURCES) rygel-mediathek.stamp
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index 35053ae..18f91b5 100644 (file)
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -9,9 +9,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGSTREAMER_CFLAGS) \
            -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-$(librygel_test_la_SOURCES) : rygel-test.stamp
-
-librygel_test_la_VALASOURCES = \
+librygel_test_la_SOURCES = \
                           rygel-test-content-dir.vala \
                           rygel-test-root-container.vala \
                           rygel-test-item.vala \
@@ -19,23 +17,18 @@ librygel_test_la_VALASOURCES = \
                           rygel-test-video-item.vala \
                           rygel-test-plugin.vala
 
-librygel_test_la_SOURCES = \
-                       $(librygel_test_la_VALASOURCES:.vala=.c)
-
-rygel-test.stamp: $(librygel_test_la_VALASOURCES)
-       $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+librygel_test_la_VALAFLAGS = \
+       --vapidir=$(top_srcdir)/src/rygel \
        --pkg rygel-1.0 --pkg cstuff --pkg gconf-2.0 \
        --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-        --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 $^
-       touch $@
+       --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10
 
 librygel_test_la_LIBADD = $(LIBGUPNP_LIBS) \
                          $(LIBGUPNP_AV_LIBS) \
-                          $(LIBDBUS_GLIB_LIBS) \
-                         $(LIBGSTREAMER_LIBS) \
-                          $(GEE_LIBS)
+                         $(LIBDBUS_GLIB_LIBS) \
+                         $(LIBGSTREAMER_LIBS) \
+                         $(GEE_LIBS)
+
 librygel_test_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-CLEANFILES = rygel-test.stamp
-MAINTAINERCLEANFILES = Makefile.in $(librygel_test_la_SOURCES)
-EXTRA_DIST = $(librygel_test_la_VALASOURCES) rygel-test.stamp
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index eaa10ff..6aaedec 100644 (file)
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -5,13 +5,11 @@ plugin_LTLIBRARIES = librygel-media-tracker.la
 AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
            $(LIBGUPNP_AV_CFLAGS) \
            $(LIBDBUS_GLIB_CFLAGS) \
-            $(LIBGSTREAMER_CFLAGS) \
+           $(LIBGSTREAMER_CFLAGS) \
            $(GEE_CFLAGS) \
            -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-$(librygel_media_tracker_la_SOURCES) : rygel-media-tracker.stamp
-
-librygel_media_tracker_la_VALASOURCES = \
+librygel_media_tracker_la_SOURCES = \
                                    rygel-media-tracker.vala \
                                    rygel-tracker-root-container.vala \
                                    rygel-tracker-category.vala \
@@ -26,23 +24,18 @@ librygel_media_tracker_la_VALASOURCES = \
                                    rygel-tracker-image-item.vala \
                                    rygel-tracker-plugin.vala \
                                    rygel-tracker-plugin-factory.vala
-librygel_media_tracker_la_SOURCES = \
-                               $(librygel_media_tracker_la_VALASOURCES:.vala=.c)
 
-rygel-media-tracker.stamp: $(librygel_media_tracker_la_VALASOURCES)
-       $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+librygel_media_tracker_la_VALAFLAGS = \
+       --vapidir=$(top_srcdir)/src/rygel \
        --pkg rygel-1.0 --pkg cstuff --pkg gconf-2.0 \
        --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-        --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 $^
-       touch $@
+       --pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10
 
 librygel_media_tracker_la_LIBADD = $(LIBGUPNP_LIBS) \
-                                  $(LIBGUPNP_AV_LIBS) \
-                                  $(LIBDBUS_GLIB_LIBS) \
-                                  $(LIBGSTREAMER_LIBS) \
-                                  $(GEE_LIBS)
+                                                                  $(LIBGUPNP_AV_LIBS) \
+                                                                  $(LIBDBUS_GLIB_LIBS) \
+                                                                  $(LIBGSTREAMER_LIBS) \
+                                                                  $(GEE_LIBS)
 librygel_media_tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
-CLEANFILES = rygel-media-tracker.stamp
-MAINTAINERCLEANFILES = Makefile.in $(librygel_media_tracker_la_SOURCES)
-EXTRA_DIST = $(librygel_media_tracker_la_VALASOURCES) rygel-media-tracker.stamp
+MAINTAINERCLEANFILES = Makefile.in

diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 002325c..e620462 100644 (file)
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -33,62 +33,18 @@ librygelinc_HEADERS = rygel.h
 bin_PROGRAMS = rygel
 
 BUILT_SOURCES = rygel-1.0.vapi \
-               rygel.h \
-               $(rygel_SOURCES)
+               rygel.h
 
-$(BUILT_SOURCES) : rygel.stamp
-
-rygel_VALASOURCE = $(VAPI_SOURCE_FILES) \
+rygel_SOURCES = $(VAPI_SOURCE_FILES) \
                rygel-dbus-service.vala \
                rygel-root-device.vala \
                rygel-root-device-factory.vala \
                rygel-main.vala
 
-rygel_SOURCES = \
-               rygel-root-device.c \
-               rygel-root-device-factory.c \
-               rygel-main.c \
-               rygel-dbus-service.c \
-               rygel-content-directory.c \
-               rygel-browse.c \
-               rygel-didl-lite-writer.c \
-               rygel-browse-filter.c \
-               rygel-plugin.c \
-               rygel-plugin-loader.c \
-               rygel-transcode-manager.c \
-               rygel-http-server.c \
-               rygel-state-machine.c \
-               rygel-http-request.c \
-               rygel-seek.c \
-               rygel-http-response.c \
-               rygel-live-response.c \
-               rygel-seekable-response.c \
-               rygel-resource-info.c \
-               rygel-icon-info.c \
-               rygel-connection-manager.c \
-               rygel-media-object.c \
-               rygel-media-container.c \
-               rygel-simple-async-result.c \
-               rygel-media-item.c \
-               rygel-metadata-extractor.c \
-               rygel-media-db.c \
-               rygel-transcoder.c \
-               rygel-mp2ts-transcoder.c \
-               rygel-mp3-transcoder.c \
-               rygel-l16-transcoder.c \
-               rygel-mp2ts-transcoder-bin.c \
-               rygel-mp3-transcoder-bin.c \
-               rygel-l16-transcoder-bin.c \
-               rygel-gst-utils.c \
-               rygel-media-db-container.c \
-               rygel-media-db-object-factory.c
-
-rygel.stamp: $(rygel_VALASOURCE)
-       $(VALAC) -C --vapidir=$(srcdir) --thread \
+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 \
-        $^
-       touch $@
+       --pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 --pkg sqlite3
 
 rygel_LDADD = $(LIBGUPNP_LIBS) \
              $(LIBGUPNP_AV_LIBS) \
@@ -143,29 +99,25 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
                    rygel-media-db-container.vala \
                    rygel-media-db-object-factory.vala
 
-rygel-1.0.vapi: $(VAPI_SOURCE_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 \
+       --pkg gstreamer-0.10 --pkg sqlite3 --pkg dbus-glib-1 \
        $(VAPI_SOURCE_FILES)
 
 noinst_LIBRARIES = librygel-configuration.a
 
 librygel_configuration_a_SOURCES = rygel-configuration.c \
-                                  rygel-user-config.c \
+                                  rygel-user-config.c \
                                   rygel-meta-config.c \
                                   rygel-cmdline-config.c \
-                                  cstuff.c \
-                                   cstuff.h
+                                  cstuff.c
 
 vapidir = $(VAPIDIR)
 vapi_DATA = $(VAPI_FILES) $(DEPS_FILES)
 
-CLEANFILES = rygel.stamp
 MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
 EXTRA_DIST = cstuff.vapi \
              $(VAPI_FILES) \
              $(DEPS_FILES) \
-             $(rygel_VALASOURCE) \
-             $(BUILT_SOURCES) \
-            rygel.stamp
+             $(BUILT_SOURCES) cstuff.h

diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 0a521b8..5bafd9a 100644 (file)
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -20,9 +20,7 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 
 bin_PROGRAMS = rygel-preferences
 
-$(rygel_preferences_SOURCES) : rygel.stamp
-
-rygel_preferences_VALASOURCES = \
+rygel_preferences_SOURCES = \
                            rygel-preferences-dialog.vala \
                            rygel-preferences-section.vala \
                            rygel-general-pref-section.vala \
@@ -30,14 +28,12 @@ rygel_preferences_VALASOURCES = \
                            rygel-media-export-pref-section.vala \
                            rygel-tracker-pref-section.vala
 
-rygel_preferences_SOURCES = $(rygel_preferences_VALASOURCES:.vala=.c)
-
 rygel.stamp: $(rygel_preferences_VALASOURCES)
-       $(VALAC) -C --vapidir=$(rygeldir) \
+rygel_preferences_VALAFLAGS = \
+       --vapidir=$(rygeldir) \
        --pkg rygel-1.0 --pkg cstuff --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
        --pkg dbus-glib-1 --pkg gconf-2.0 --pkg gstreamer-0.10 \
-       --pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0 $^
-       touch $@
+       --pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0
 
 rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
                          $(LIBGUPNP_AV_LIBS) \
@@ -52,6 +48,4 @@ rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
                           -lrygel-configuration
 rygel_preferences_LDFLAGS = -export-dynamic
 
-CLEANFILES = rygel.stamp
-MAINTAINERCLEANFILES = Makefile.in $(rygel_preferences_SOURCES)
-EXTRA_DIST = $(rygel_preferences_VALASOURCES) rygel.stamp
+MAINTAINERCLEANFILES = Makefile.in