rygel r641 - in trunk: . src/plugins/dvb src/plugins/test src/plugins/tracker src/rygel

[zeeshanak svn gnome org]

Author: zeeshanak
Date: Mon Feb 23 16:48:06 2009
New Revision: 641
URL: http://svn.gnome.org/viewvc/rygel?rev=641&view=rev

Log:
Don't use shave for now, lets get back to it in the next release.

This reverts commit 4f253364493e8feebed31c98026d2a7a7185917d.

Removed:
   trunk/acinclude.m4
   trunk/shave-libtool.in
   trunk/shave.in
Modified:
   trunk/configure.ac
   trunk/src/plugins/dvb/Makefile.am
   trunk/src/plugins/test/Makefile.am
   trunk/src/plugins/tracker/Makefile.am
   trunk/src/rygel/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Feb 23 16:48:06 2009
@@ -137,11 +137,7 @@
 AM_GLIB_GNU_GETTEXT
 AM_GLIB_DEFINE_LOCALEDIR([LOCALEDIR])
 
-SHAVE_INIT
-
 AC_OUTPUT([
-shave
-shave-libtool
 Makefile
 src/Makefile
 src/rygel/Makefile

Modified: trunk/src/plugins/dvb/Makefile.am
==============================================================================
--- trunk/src/plugins/dvb/Makefile.am	(original)
+++ trunk/src/plugins/dvb/Makefile.am	Mon Feb 23 16:48:06 2009
@@ -1,7 +1,3 @@
-V         = @
-Q         = $(V:1=)
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-dvb.la
@@ -42,7 +38,7 @@
                           rygel-dvb-plugin.vala
 
 rygel-dvb.stamp: $(filter %.vala,$(librygel_dvb_la_SOURCES))
-	$(QUIET_GEN) $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+	$(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 $^
 	touch $@

Modified: trunk/src/plugins/test/Makefile.am
==============================================================================
--- trunk/src/plugins/test/Makefile.am	(original)
+++ trunk/src/plugins/test/Makefile.am	Mon Feb 23 16:48:06 2009
@@ -1,7 +1,3 @@
-V         = @
-Q         = $(V:1=)
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-test.la
@@ -47,7 +43,7 @@
                            rygel-test-plugin.vala
 
 rygel-test.stamp: $(filter %.vala,$(librygel_test_la_SOURCES))
-	$(QUIET_GEN) $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+	$(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 $^

Modified: trunk/src/plugins/tracker/Makefile.am
==============================================================================
--- trunk/src/plugins/tracker/Makefile.am	(original)
+++ trunk/src/plugins/tracker/Makefile.am	Mon Feb 23 16:48:06 2009
@@ -1,7 +1,3 @@
-V         = @
-Q         = $(V:1=)
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 plugindir = $(libdir)/rygel-1.0
 
 plugin_LTLIBRARIES = librygel-media-tracker.la
@@ -82,7 +78,7 @@
 				    rygel-tracker-plugin.vala
 
 rygel-media-tracker.stamp: $(filter %.vala,$(librygel_media_tracker_la_SOURCES))
-	$(QUIET_GEN) $(VALAC) -C --vapidir=$(top_srcdir)/src/rygel \
+	$(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 $^

Modified: trunk/src/rygel/Makefile.am
==============================================================================
--- trunk/src/rygel/Makefile.am	(original)
+++ trunk/src/rygel/Makefile.am	Mon Feb 23 16:48:06 2009
@@ -1,7 +1,3 @@
-V         = @
-Q         = $(V:1=)
-QUIET_GEN = $(Q:@= echo '  GEN   '$@;)
-
 if UNINSTALLED
 shareddir = $(abs_top_builddir)/data
 else
@@ -126,7 +122,7 @@
 		rygel-media-item.h
 
 rygel.stamp: $(filter %.vala,$(rygel_SOURCES))
-	$(QUIET_GEN) $(VALAC) -C --vapidir=$(srcdir) \
+	$(VALAC) -C --vapidir=$(srcdir) \
 	--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 $^
 	touch $@
@@ -162,7 +158,7 @@
 		    rygel-didl-lite-writer.vala
 
 rygel-1.0.vapi: $(VAPI_SOURCE_FILES)
-	$(QUIET_GEN) $(VALAC) -C --library=rygel-1.0 \
+	$(VALAC) -C --library=rygel-1.0 \
 	--pkg gupnp-1.0 --pkg gupnp-av-1.0 --pkg gee-1.0 --pkg gstreamer-0.10 \
 	$^