[rygel] build: Fix build with automake-1.11

From: Zeeshan Ali Khattak <zeeshanak src gnome org>
To: svn-commits-list gnome org
Subject: [rygel] build: Fix build with automake-1.11
Date: Sat, 25 Jul 2009 20:38:57 +0000 (UTC)
commit 63c41306669fc9df370b19891f96324e33ad67b5
Author: Jens Georg <mail jensge org>
Date:   Sat Jul 25 12:59:18 2009 +0200

    build: Fix build with automake-1.11

 src/plugins/external/Makefile.am     |   23 +++++---------
 src/plugins/media-export/Makefile.am |   21 ++++--------
 src/plugins/mediathek/Makefile.am    |   25 +++++----------
 src/plugins/test/Makefile.am         |   25 +++++----------
 src/plugins/tracker/Makefile.am      |   40 ++++-------------------
 src/rygel/Makefile.am                |   57 ++++++----------------------------
 src/ui/Makefile.am                   |   24 ++++----------
 7 files changed, 55 insertions(+), 160 deletions(-)
---
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index 7fac14c..aca0592 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -9,26 +9,19 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
 	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-BUILT_SOURCES = rygel-external-content-dir.c \
-		rygel-external-container.c \
-		rygel-external-item.c \
-		rygel-external-plugin.c \
-		rygel-external-plugin-factory.c
+$(librygel_external_la_SOURCES) : rygel-external.stamp
 
-$(BUILT_SOURCES) : rygel-external.stamp
-
-librygel_external_la_SOURCES = rygel-external-content-dir.c \
+librygel_external_la_VALASOURCES = \
 			       rygel-external-content-dir.vala \
-			       rygel-external-container.c \
 			       rygel-external-container.vala \
-			       rygel-external-item.c \
 			       rygel-external-item.vala \
-			       rygel-external-plugin.c \
 			       rygel-external-plugin.vala \
-			       rygel-external-plugin-factory.c \
 			       rygel-external-plugin-factory.vala
 
-rygel-external.stamp: $(filter %.vala,$(librygel_external_la_SOURCES))
+librygel_external_la_SOURCES = \
+			$(librygel_external_la_VALASOURCES:.vala=.c)
+
+rygel-external.stamp: $(librygel_external_la_VALASOURCES)
 	$(VALAC) -C --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 \
@@ -43,5 +36,5 @@ librygel_external_la_LIBADD = $(LIBGUPNP_LIBS) \
 librygel_external_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = rygel-external.stamp
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = $(BUILT_SOURCES) rygel-external.stamp
+MAINTAINERCLEANFILES = Makefile.in $(librygel_external_la_SOURCES)
+EXTRA_DIST = $(librygel_external_la_VALASOURCES) rygel-external.stamp
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index 8bdbff0..08d1f1c 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -9,24 +9,17 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	$(GEE_CFLAGS) \
 	-I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-BUILT_SOURCES = rygel-media-export-root-container.c \
-		rygel-media-export-item.c \
-		rygel-media-export-harvester.c \
-		rygel-media-export-plugin.c
+$(librygel_media_export_la_SOURCES) : rygel-media-export.stamp
 
-$(BUILT_SOURCES) : rygel-media-export.stamp
-
-librygel_media_export_la_SOURCES = \
-	rygel-media-export-plugin.c \
+librygel_media_export_la_VALASOURCES = \
 	rygel-media-export-plugin.vala \
-	rygel-media-export-root-container.c \
 	rygel-media-export-root-container.vala \
-	rygel-media-export-harvester.c \
 	rygel-media-export-harvester.vala \
-	rygel-media-export-item.c \
 	rygel-media-export-item.vala
+librygel_media_export_la_SOURCES = \
+	$(librygel_media_export_la_VALASOURCES:.vala=.c)
 
-rygel-media-export.stamp: $(filter %.vala,$(librygel_media_export_la_SOURCES))
+rygel-media-export.stamp: $(librygel_media_export_la_VALASOURCES)
 	$(VALAC) -g -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 \
 	--pkg cstuff \
@@ -48,5 +41,5 @@ librygel_media_export_la_LIBADD = \
 librygel_media_export_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = rygel-media-export.stamp
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = $(BUILT_SOURCES) rygel-media-export.stamp
+MAINTAINERCLEANFILES = Makefile.in $(librygel_media_export_la_SOURCES)
+EXTRA_DIST = $(librygel_media_export_la_VALASOURCES) rygel-media-export.stamp
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index fb138b4..4e65835 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -11,28 +11,19 @@ AM_CFLAGS = \
 	-I$(top_srcdir)/src/rygel \
 	-DDATA_DIR='"$(datadir)"'
 
-BUILT_SOURCES = rygel-mediathek-asx-playlist.c \
-		rygel-mediathek-plugin.c \
-		rygel-mediathek-video-item.c \
-		rygel-mediathek-root-container.c \
-		rygel-mediathek-rss-container.c
+$(librygel_mediathek_la_SOURCES) : rygel-mediathek.stamp
 
-$(BUILT_SOURCES) : rygel-mediathek.stamp
-
-librygel_mediathek_la_SOURCES = \
-	rygel-mediathek-asx-playlist.c \
+librygel_mediathek_la_VALASOURCES = \
 	rygel-mediathek-asx-playlist.vala \
-	rygel-mediathek-plugin.c \
 	rygel-mediathek-plugin.vala \
-	rygel-mediathek-video-item.c \
 	rygel-mediathek-video-item.vala \
-	rygel-mediathek-root-container.c \
 	rygel-mediathek-root-container.vala \
-	rygel-mediathek-rss-container.c \
-	rygel-mediathek-rss-container.vala 
+	rygel-mediathek-rss-container.vala
 
+librygel_mediathek_la_SOURCES = \
+	$(librygel_mediathek_la_VALASOURCES:.vala=.c)
 
-rygel-mediathek.stamp: $(filter %.vala,$(librygel_mediathek_la_SOURCES))
+rygel-mediathek.stamp: $(librygel_mediathek_la_VALASOURCES)
 	$(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 \
 	--pkg cstuff \
@@ -55,5 +46,5 @@ librygel_mediathek_la_LIBADD = \
 librygel_mediathek_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = rygel-mediathek.stamp
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = $(BUILT_SOURCES) rygel-mediathek.stamp
+MAINTAINERCLEANFILES = Makefile.in $(librygel_mediathek_la_SOURCES)
+EXTRA_DIST = $(librygel_mediathek_la_VALASOURCES) rygel-mediathek.stamp
diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index 9fd4548..35053ae 100644
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -9,29 +9,20 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(LIBGSTREAMER_CFLAGS) \
 	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-BUILT_SOURCES = rygel-test-content-dir.c \
-		rygel-test-root-container.c \
-		rygel-test-item.c \
-		rygel-test-audio-item.c \
-		rygel-test-video-item.c \
-		rygel-test-plugin.c
+$(librygel_test_la_SOURCES) : rygel-test.stamp
 
-$(BUILT_SOURCES) : rygel-test.stamp
-
-librygel_test_la_SOURCES = rygel-test-content-dir.c \
+librygel_test_la_VALASOURCES = \
 			   rygel-test-content-dir.vala \
-			   rygel-test-root-container.c \
 			   rygel-test-root-container.vala \
-			   rygel-test-item.c \
 			   rygel-test-item.vala \
-			   rygel-test-audio-item.c \
 			   rygel-test-audio-item.vala \
-			   rygel-test-video-item.c \
 			   rygel-test-video-item.vala \
-			   rygel-test-plugin.c \
 			   rygel-test-plugin.vala
 
-rygel-test.stamp: $(filter %.vala,$(librygel_test_la_SOURCES))
+librygel_test_la_SOURCES = \
+			$(librygel_test_la_VALASOURCES:.vala=.c)
+
+rygel-test.stamp: $(librygel_test_la_VALASOURCES)
 	$(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 --pkg cstuff --pkg gconf-2.0 \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
@@ -46,5 +37,5 @@ librygel_test_la_LIBADD = $(LIBGUPNP_LIBS) \
 librygel_test_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = rygel-test.stamp
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = $(BUILT_SOURCES) rygel-test.stamp
+MAINTAINERCLEANFILES = Makefile.in $(librygel_test_la_SOURCES)
+EXTRA_DIST = $(librygel_test_la_VALASOURCES) rygel-test.stamp
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index 39fa0e1..eaa10ff 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -9,53 +9,27 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 	    $(GEE_CFLAGS) \
 	    -I$(top_srcdir)/src/rygel -DDATA_DIR='"$(datadir)"'
 
-BUILT_SOURCES = rygel-media-tracker.c \
-		rygel-tracker-root-container.c \
-		rygel-tracker-category.c \
-		rygel-tracker-video-category.c \
-		rygel-tracker-music-category.c \
-		rygel-tracker-image-category.c \
-		rygel-tracker-search-result.c \
-		rygel-tracker-get-metadata-result.c \
-		rygel-tracker-item.c \
-		rygel-tracker-video-item.c \
-		rygel-tracker-music-item.c \
-		rygel-tracker-image-item.c \
-		rygel-tracker-plugin.c \
-		rygel-tracker-plugin-factory.c
+$(librygel_media_tracker_la_SOURCES) : rygel-media-tracker.stamp
 
-$(BUILT_SOURCES) : rygel-media-tracker.stamp
-
-librygel_media_tracker_la_SOURCES = rygel-media-tracker.c \
+librygel_media_tracker_la_VALASOURCES = \
 				    rygel-media-tracker.vala \
-				    rygel-tracker-root-container.c \
 				    rygel-tracker-root-container.vala \
-				    rygel-tracker-category.c \
 				    rygel-tracker-category.vala \
-				    rygel-tracker-video-category.c \
 				    rygel-tracker-video-category.vala \
-				    rygel-tracker-music-category.c \
 				    rygel-tracker-music-category.vala \
-				    rygel-tracker-image-category.c \
 				    rygel-tracker-image-category.vala \
-				    rygel-tracker-search-result.c \
 				    rygel-tracker-search-result.vala \
-				    rygel-tracker-get-metadata-result.c \
 				    rygel-tracker-get-metadata-result.vala \
-				    rygel-tracker-item.c \
 				    rygel-tracker-item.vala \
-				    rygel-tracker-video-item.c \
 				    rygel-tracker-video-item.vala \
-				    rygel-tracker-music-item.c \
 				    rygel-tracker-music-item.vala \
-				    rygel-tracker-image-item.c \
 				    rygel-tracker-image-item.vala \
-				    rygel-tracker-plugin.c \
 				    rygel-tracker-plugin.vala \
-				    rygel-tracker-plugin-factory.c \
 				    rygel-tracker-plugin-factory.vala
+librygel_media_tracker_la_SOURCES = \
+				$(librygel_media_tracker_la_VALASOURCES:.vala=.c)
 
-rygel-media-tracker.stamp: $(filter %.vala,$(librygel_media_tracker_la_SOURCES))
+rygel-media-tracker.stamp: $(librygel_media_tracker_la_VALASOURCES)
 	$(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
 	--pkg rygel-1.0 --pkg cstuff --pkg gconf-2.0 \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 \
@@ -70,5 +44,5 @@ librygel_media_tracker_la_LIBADD = $(LIBGUPNP_LIBS) \
 librygel_media_tracker_la_LDFLAGS = -shared -fPIC -module -avoid-version
 
 CLEANFILES = rygel-media-tracker.stamp
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = $(BUILT_SOURCES) rygel-media-tracker.stamp
+MAINTAINERCLEANFILES = Makefile.in $(librygel_media_tracker_la_SOURCES)
+EXTRA_DIST = $(librygel_media_tracker_la_VALASOURCES) rygel-media-tracker.stamp
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index b4f3116..002325c 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -34,58 +34,21 @@ bin_PROGRAMS = rygel
 
 BUILT_SOURCES = rygel-1.0.vapi \
 		rygel.h \
-		rygel-root-device.c \
-		rygel-root-device-factory.c \
-		rygel-configuration.c \
-		rygel-user-config.c \
-		rygel-meta-config.c \
-		rygel-cmdline-config.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-media-db-container.c \
-		rygel-media-db-object-factory.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_SOURCES)
 
 $(BUILT_SOURCES) : rygel.stamp
 
-rygel_SOURCES = $(VAPI_SOURCE_FILES) \
-		rygel-root-device.c \
+rygel_VALASOURCE = $(VAPI_SOURCE_FILES) \
+		rygel-dbus-service.vala \
 		rygel-root-device.vala \
-		rygel-root-device-factory.c \
 		rygel-root-device-factory.vala \
+		rygel-main.vala
+
+rygel_SOURCES = \
+		rygel-root-device.c \
+		rygel-root-device-factory.c \
 		rygel-main.c \
-		rygel-main.vala \
 		rygel-dbus-service.c \
-		rygel-dbus-service.vala \
 		rygel-content-directory.c \
 		rygel-browse.c \
 		rygel-didl-lite-writer.c \
@@ -120,7 +83,7 @@ rygel_SOURCES = $(VAPI_SOURCE_FILES) \
 		rygel-media-db-container.c \
 		rygel-media-db-object-factory.c
 
-rygel.stamp: $(filter %.vala,$(rygel_SOURCES))
+rygel.stamp: $(rygel_VALASOURCE)
 	$(VALAC) -C --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 \
@@ -203,6 +166,6 @@ MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
 EXTRA_DIST = cstuff.vapi \
              $(VAPI_FILES) \
              $(DEPS_FILES) \
-             $(VAPI_SOURCE_FILES) \
+             $(rygel_VALASOURCE) \
              $(BUILT_SOURCES) \
 	     rygel.stamp
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 279ac79..0a521b8 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -20,29 +20,19 @@ AM_CFLAGS = $(LIBGUPNP_CFLAGS) \
 
 bin_PROGRAMS = rygel-preferences
 
-BUILT_SOURCES = rygel-preferences-dialog.c \
-		rygel-preferences-section.c \
-		rygel-general-pref-section.c \
-		rygel-plugin-pref-section.c \
-		rygel-media-export-pref-section.c \
-		rygel-tracker-pref-section.c
+$(rygel_preferences_SOURCES) : rygel.stamp
 
-$(BUILT_SOURCES) : rygel.stamp
-
-rygel_preferences_SOURCES = rygel-preferences-dialog.c \
+rygel_preferences_VALASOURCES = \
 			    rygel-preferences-dialog.vala \
-			    rygel-preferences-section.c \
 			    rygel-preferences-section.vala \
-			    rygel-general-pref-section.c \
 			    rygel-general-pref-section.vala \
-			    rygel-plugin-pref-section.c \
 			    rygel-plugin-pref-section.vala \
-			    rygel-media-export-pref-section.c \
 			    rygel-media-export-pref-section.vala \
-			    rygel-tracker-pref-section.c \
 			    rygel-tracker-pref-section.vala
 
-rygel.stamp: $(filter %.vala,$(rygel_preferences_SOURCES))
+rygel_preferences_SOURCES = $(rygel_preferences_VALASOURCES:.vala=.c)
+
+rygel.stamp: $(rygel_preferences_VALASOURCES)
 	$(VALAC) -C --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 \
@@ -63,5 +53,5 @@ rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
 rygel_preferences_LDFLAGS = -export-dynamic
 
 CLEANFILES = rygel.stamp
-MAINTAINERCLEANFILES = Makefile.in $(BUILT_SOURCES)
-EXTRA_DIST = $(BUILT_SOURCES) rygel.stamp
+MAINTAINERCLEANFILES = Makefile.in $(rygel_preferences_SOURCES)
+EXTRA_DIST = $(rygel_preferences_VALASOURCES) rygel.stamp
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]