[totem] Bug 640048 — Build failure due libbaconvideowidgetproperties.la

[Philip Withnall <pwithnall src gnome org>]

commit ada23c9ebccaf5ad31071ffc145da94910bb0b1c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Jan 22 20:57:16 2011 +0000

    Bug 640048 â?? Build failure due libbaconvideowidgetproperties.la
    
    Move libbaconvideowidgetproperties.la from src/plugins/properties to
    src/properties, as it's needed by both the plugins and the main libraries,
    but the plugins need the main libraries to be built first for GIR, and
    libbaconvideowidgetproperties.la was only being built with the plugins.
    
    Closes: bgo#640048

 configure.in                                       |    1 +
 src/Makefile.am                                    |   10 +++++-----
 src/plugins/properties/Makefile.am                 |   13 ++++---------
 src/properties/Makefile.am                         |   17 +++++++++++++++++
 .../properties/bacon-video-widget-properties.c     |    0
 .../properties/bacon-video-widget-properties.h     |    0
 6 files changed, 27 insertions(+), 14 deletions(-)
---
diff --git a/configure.in b/configure.in
index 94079d5..cc0496d 100644
--- a/configure.in
+++ b/configure.in
@@ -769,6 +769,7 @@ Makefile
 totem.spec
 lib/Makefile
 src/Makefile
+src/properties/Makefile
 src/plugins/Makefile
 src/plugins/bemused/Makefile
 src/plugins/coherence_upnp/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index e514add..b82d938 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = backend . plugins
+SUBDIRS = backend properties . plugins
 
 bin_PROGRAMS = totem totem-video-thumbnailer totem-video-indexer totem-audio-preview
 lib_LTLIBRARIES = libtotem.la
@@ -212,7 +212,7 @@ libtotem_properties_page_la_SOURCES = \
 	totem-properties-view.h
 
 libtotem_properties_page_la_CPPFLAGS = \
-	-I$(srcdir)/plugins/properties		\
+	-I$(top_srcdir)/src/properties		\
 	-I$(top_builddir)/data			\
 	-DG_LOG_DOMAIN=\""TotemPropertiesPage"\"\
 	$(AM_CPPFLAGS)
@@ -228,7 +228,7 @@ libtotem_properties_page_la_LDFLAGS = \
 
 libtotem_properties_page_la_LIBADD = \
 	backend/libbaconvideowidget.la				\
-	plugins/properties/libbaconvideowidgetproperties.la	\
+	properties/libbaconvideowidgetproperties.la		\
 	libtotem_player.la					\
 	$(DEPENDENCY_LIBS)					\
 	$(NAUTILUS_LIBS)
@@ -243,7 +243,7 @@ test_properties_page_SOURCES = \
 
 test_properties_page_CPPFLAGS = \
 	-I$(top_builddir)/data			\
-	-I$(srcdir)/plugins/properties		\
+	-I$(top_srcdir)/src/properties		\
 	$(AM_CPPFLAGS)
 
 test_properties_page_CFLAGS = \
@@ -253,7 +253,7 @@ test_properties_page_CFLAGS = \
 
 test_properties_page_LDADD = \
 	backend/libbaconvideowidget.la				\
-	plugins/properties/libbaconvideowidgetproperties.la	\
+	properties/libbaconvideowidgetproperties.la		\
 	libtotem_player.la					\
 	$(DEPENDENCY_LIBS)					\
 	$(NAUTILUS_LIBS)
diff --git a/src/plugins/properties/Makefile.am b/src/plugins/properties/Makefile.am
index 294fefb..7c4be2d 100644
--- a/src/plugins/properties/Makefile.am
+++ b/src/plugins/properties/Makefile.am
@@ -2,20 +2,15 @@ include $(top_srcdir)/src/plugins/Makefile.plugins
 
 plugindir = $(PLUGINDIR)/properties
 plugin_LTLIBRARIES = libmovie-properties.la
-noinst_LTLIBRARIES = libbaconvideowidgetproperties.la
 
 plugin_in_files = movie-properties.plugin.in
 
 libmovie_properties_la_SOURCES = totem-movie-properties.c
 libmovie_properties_la_LDFLAGS = $(plugin_ldflags)
-libmovie_properties_la_LIBADD = libbaconvideowidgetproperties.la
+libmovie_properties_la_LIBADD = $(top_builddir)/src/properties/libbaconvideowidgetproperties.la
 libmovie_properties_la_CFLAGS = $(plugin_cflags)
-
-libbaconvideowidgetproperties_la_SOURCES = \
-	bacon-video-widget-properties.c	\
-	bacon-video-widget-properties.h
-libbaconvideowidgetproperties_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(WARN_CFLAGS)
+libmovie_properties_la_CPPFLAGS = \
+	-I$(top_srcdir)/src/properties/ \
+	$(AM_CPPFLAGS)
 
 -include $(top_srcdir)/git.mk
diff --git a/src/properties/Makefile.am b/src/properties/Makefile.am
new file mode 100644
index 0000000..209fcb8
--- /dev/null
+++ b/src/properties/Makefile.am
@@ -0,0 +1,17 @@
+noinst_LTLIBRARIES = libbaconvideowidgetproperties.la
+
+libbaconvideowidgetproperties_la_SOURCES = \
+	bacon-video-widget-properties.c \
+	bacon-video-widget-properties.h \
+	$(NULL)
+
+libbaconvideowidgetproperties_la_CPPFLAGS = \
+	-I$(top_srcdir)/src/ \
+	$(AM_CPPFLAGS)
+
+libbaconvideowidgetproperties_la_CFLAGS = \
+	$(DEPENDENCY_CFLAGS) \
+	$(WARN_CFLAGS) \
+	$(AM_CFLAGS)
+
+-include $(top_srcdir)/git.mk
diff --git a/src/plugins/properties/bacon-video-widget-properties.c b/src/properties/bacon-video-widget-properties.c
similarity index 100%
rename from src/plugins/properties/bacon-video-widget-properties.c
rename to src/properties/bacon-video-widget-properties.c
diff --git a/src/plugins/properties/bacon-video-widget-properties.h b/src/properties/bacon-video-widget-properties.h
similarity index 100%
rename from src/plugins/properties/bacon-video-widget-properties.h
rename to src/properties/bacon-video-widget-properties.h