GNOME.org
 

[rygel] core,ui,plugins: Work-around for automake bug

commit 7aba314bed22aa1aeb558e91c874f3123bd697dd
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Mon Jan 4 02:28:15 2010 +0200

    core,ui,plugins: Work-around for automake bug
    
    According to Nathan: It scrapes VALAFLAGS looking for options which
    specify files, like -H or, significantly, --gir. Unfortunately, rather
    than actually checking correctly, it does it in a weird "why did anybody
    ever think that was the right thing to do?" kind of way. It has a list of
    flags which specify files, and then if a flag is a substring of any of
    those flags, it is considered to actually be one. So it mistakes "-g" for
    "--gir" and assumes the following argument should be included when you
    make dist. Until automake is fixed, you can fool it by putting -g at the
    end of VALAFLAGS.

 src/plugins/external/Makefile.am     |    4 ++--
 src/plugins/gst-launch/Makefile.am   |    5 +++--
 src/plugins/gst-renderer/Makefile.am |    4 ++--
 src/plugins/media-export/Makefile.am |    4 ++--
 src/plugins/mediathek/Makefile.am    |    4 ++--
 src/plugins/test/Makefile.am         |    5 +++--
 src/plugins/tracker/Makefile.am      |    4 ++--
 src/rygel/Makefile.am                |    4 ++--
 src/ui/Makefile.am                   |    4 ++--
 9 files changed, 20 insertions(+), 18 deletions(-)
---
diff --git a/src/plugins/external/Makefile.am b/src/plugins/external/Makefile.am
index c95316f..2172168 100644
--- a/src/plugins/external/Makefile.am
+++ b/src/plugins/external/Makefile.am
@@ -25,11 +25,11 @@ librygel_external_la_SOURCES = rygel-external-content-dir.vala \
 			       rygel-external-icon-factory.vala
 
 rygel-external.stamp: $(librygel_external_la_VALASOURCES)
-librygel_external_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
+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
+				 --pkg gconf-2.0 -g
 
 librygel_external_la_LIBADD = $(LIBGUPNP_LIBS) \
                               $(LIBGUPNP_AV_LIBS) \
diff --git a/src/plugins/gst-launch/Makefile.am b/src/plugins/gst-launch/Makefile.am
index bf6890f..0d2f4c0 100644
--- a/src/plugins/gst-launch/Makefile.am
+++ b/src/plugins/gst-launch/Makefile.am
@@ -15,10 +15,11 @@ librygel_gst_launch_la_SOURCES = rygel-gst-launch-plugin.vala \
 				rygel-gst-launch-content-dir.vala \
 				rygel-gst-launch-item.vala
 
-librygel_gst_launch_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
+librygel_gst_launch_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
+			     --pkg dbus-glib-1 --pkg gee-1.0 \
+			     --pkg gstreamer-0.10 -g
 
 librygel_gst_launch_la_LIBADD = $(LIBGUPNP_LIBS) \
      			       $(LIBGUPNP_AV_LIBS) \
diff --git a/src/plugins/gst-renderer/Makefile.am b/src/plugins/gst-renderer/Makefile.am
index 92e3c48..bd02703 100644
--- a/src/plugins/gst-renderer/Makefile.am
+++ b/src/plugins/gst-renderer/Makefile.am
@@ -23,10 +23,10 @@ librygel_gst_renderer_la_SOURCES = rygel-gst-connection-manager.vala \
 				   rygel-gst-plugin.vala
 
 librygel_gst_renderer_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
-                     	             --vapidir=$(srcdir) -g \
+                     	             --vapidir=$(srcdir) \
 				     --pkg rygel-1.0 --pkg cstuff \
 				     --pkg gupnp-1.0 --pkg gupnp-av-1.0 \
-				     --pkg gee-1.0 --pkg gstreamer-0.10
+				     --pkg gee-1.0 --pkg gstreamer-0.10 -g
 
 librygel_gst_renderer_la_LIBADD = $(LIBGUPNP_LIBS) \
                     	          $(LIBGUPNP_AV_LIBS) \
diff --git a/src/plugins/media-export/Makefile.am b/src/plugins/media-export/Makefile.am
index fcade75..bfd83e3 100644
--- a/src/plugins/media-export/Makefile.am
+++ b/src/plugins/media-export/Makefile.am
@@ -23,7 +23,7 @@ librygel_media_export_la_SOURCES = rygel-media-export-plugin.vala \
 				   rygel-media-export-harvester.vala \
 				   rygel-media-export-item.vala
 
-librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
+librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
 				     --pkg dbus-glib-1 \
                                      --pkg rygel-1.0 \
                                      --pkg cstuff \
@@ -31,7 +31,7 @@ librygel_media_export_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
                                      --pkg gupnp-av-1.0 \
                                      --pkg libsoup-2.4 \
                                      --pkg gee-1.0 \
-                                     --pkg libxml-2.0
+                                     --pkg libxml-2.0 -g
 
 librygel_media_export_la_LIBADD = $(LIBGUPNP_LIBS) \
 				  $(LIBGUPNP_AV_LIBS) \
diff --git a/src/plugins/mediathek/Makefile.am b/src/plugins/mediathek/Makefile.am
index 51eb857..4dfbba3 100644
--- a/src/plugins/mediathek/Makefile.am
+++ b/src/plugins/mediathek/Makefile.am
@@ -22,7 +22,7 @@ librygel_mediathek_la_SOURCES = rygel-mediathek-asx-playlist.vala \
 				rygel-mediathek-root-container.vala \
 				rygel-mediathek-rss-container.vala
 
-librygel_mediathek_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
+librygel_mediathek_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel \
 				  --pkg rygel-1.0 \
 				  --pkg cstuff \
 				  --pkg gupnp-1.0 \
@@ -30,7 +30,7 @@ librygel_mediathek_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
 				  --pkg libsoup-2.4 \
 				  --pkg gee-1.0 \
 				  --pkg libxml-2.0 \
-				  --pkg gconf-2.0
+				  --pkg gconf-2.0 -g
 
 librygel_mediathek_la_LIBADD = $(LIBGUPNP_LIBS) \
 			       $(LIBGUPNP_AV_LIBS) \
diff --git a/src/plugins/test/Makefile.am b/src/plugins/test/Makefile.am
index e85766f..7cade2e 100644
--- a/src/plugins/test/Makefile.am
+++ b/src/plugins/test/Makefile.am
@@ -22,10 +22,11 @@ librygel_test_la_SOURCES = rygel-test-content-dir.vala \
 			   rygel-test-video-item.vala \
 			   rygel-test-plugin.vala
 
-librygel_test_la_VALAFLAGS = --vapidir=$(top_srcdir)/src/rygel -g \
+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
+			     --pkg dbus-glib-1 --pkg gee-1.0 \
+			     --pkg gstreamer-0.10 -g
 
 librygel_test_la_LIBADD = $(LIBGUPNP_LIBS) \
 			  $(LIBGUPNP_AV_LIBS) \
diff --git a/src/plugins/tracker/Makefile.am b/src/plugins/tracker/Makefile.am
index fae8b18..ba18233 100644
--- a/src/plugins/tracker/Makefile.am
+++ b/src/plugins/tracker/Makefile.am
@@ -31,10 +31,10 @@ librygel_media_tracker_la_SOURCES = \
 				    rygel-tracker-interfaces.vala
 
 librygel_media_tracker_la_VALAFLAGS = \
-	--vapidir=$(top_srcdir)/src/rygel -g \
+	--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
+	--pkg dbus-glib-1 --pkg gee-1.0 --pkg gstreamer-0.10 -g
 
 librygel_media_tracker_la_LIBADD = $(LIBGUPNP_LIBS) \
 				   $(LIBGUPNP_AV_LIBS) \
diff --git a/src/rygel/Makefile.am b/src/rygel/Makefile.am
index 335cfaf..379dfd7 100644
--- a/src/rygel/Makefile.am
+++ b/src/rygel/Makefile.am
@@ -95,9 +95,9 @@ VAPI_SOURCE_FILES = rygel-configuration.vala \
 		    rygel-log-handler.vala
 
 rygel_VALAFLAGS = \
-	-H rygel.h -g -C --library=rygel-1.0 --vapidir=$(srcdir) --thread \
+	-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
+	--pkg gstreamer-0.10 --pkg gio-2.0 --pkg gee-1.0 --pkg sqlite3 -g
 
 rygel_LDADD = $(LIBGUPNP_LIBS) \
 	      $(LIBGUPNP_AV_LIBS) \
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 5c893d7..5882c31 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -30,10 +30,10 @@ rygel_preferences_SOURCES = \
 
 rygel.stamp: $(rygel_preferences_VALASOURCES)
 rygel_preferences_VALAFLAGS = \
-	--vapidir=$(rygeldir) --thread -g \
+	--vapidir=$(rygeldir) --thread \
 	--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
+	--pkg gio-2.0 --pkg gee-1.0 --pkg gtk+-2.0 -g
 
 rygel_preferences_LDADD = $(LIBGUPNP_LIBS) \
                           $(LIBGUPNP_AV_LIBS) \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]