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

6 files changed, 27 insertions, 14 deletions

diff --git a/configure.in b/configure.in
index 94079d509..cc0496d77 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 e514addbb..b82d93839 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 294fefb51..7c4be2d34 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 000000000..209fcb87a
--- /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
index 77bec28f0..77bec28f0 100644
--- a/src/plugins/properties/bacon-video-widget-properties.c
+++ b/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
index ce3645aaa..ce3645aaa 100644
--- a/src/plugins/properties/bacon-video-widget-properties.h
+++ b/src/properties/bacon-video-widget-properties.h