banshee r4180 - in trunk/banshee/src/Backends/Banshee.NowPlaying.X11: . libbnpx11

[abock svn gnome org]

Author: abock
Date: Sat Jun 21 04:30:47 2008
New Revision: 4180
URL: http://svn.gnome.org/viewvc/banshee?rev=4180&view=rev

Log:
Do not build the X11 now playing adapter extension if HAVE_XVIDMODE is not defined

Modified:
   trunk/banshee/src/Backends/Banshee.NowPlaying.X11/   (props changed)
   trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Makefile.am
   trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/   (props changed)
   trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am

Modified: trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.NowPlaying.X11/Makefile.am	Sat Jun 21 04:30:47 2008
@@ -9,5 +9,9 @@
 
 RESOURCES = Banshee.NowPlaying.X11.addin.xml
 
+if HAVE_XVIDMODE
 include $(top_srcdir)/build/build.mk
+else
+EXTRA_DIST = $(SOURCES) $(RESOURCES)
+endif
 

Modified: trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am
==============================================================================
--- trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am	(original)
+++ trunk/banshee/src/Backends/Banshee.NowPlaying.X11/libbnpx11/Makefile.am	Sat Jun 21 04:30:47 2008
@@ -1,10 +1,10 @@
+SOURCES = bacon-resize.c bacon-resize.h
+
+if HAVE_XVIDMODE
 bnpx11dir = $(pkglibdir)/Backends
 bnpx11_LTLIBRARIES = libbnpx11.la
 
-libbnpx11_la_SOURCES = \
-	bacon-resize.c \
-	bacon-resize.h
-
+libbnpx11_la_SOURCES = $(SOURCES)
 libbnpx11_la_CFLAGS = $(BNPX_CFLAGS) $(BNPX_GTK_CFLAGS)
 libbnpx11_la_LIBADD = $(BNPX_LIBS) $(BNPX_GTK_LIBS) -lX11 -lXxf86vm
 libbnpx11_la_LDFLAGS = -avoid-version -module
@@ -19,5 +19,9 @@
 
 CLEANFILES = $(top_builddir)/bin/libbnpx11.so
 
+else
+EXTRA_DIST = $(SOURCES)
+endif
+
 MAINTAINERCLEANFILES = Makefile.in