[totem/introspection: 2/17] Merge libtotemmodule.la with libtotem_main.la

[Philip Withnall <pwithnall src gnome org>]

commit cfedb89b7f2d171ea7d4ad933213860f59d831f3
Author: Philip Withnall <philip tecnocode co uk>
Date:   Sat Jun 26 21:46:55 2010 +0100

    Merge libtotemmodule.la with libtotem_main.la
    
    There's no need for the plugin module code to be compiled into a noinst
    library when it can just as easily be directly compiled into the main Totem
    library.

 src/Makefile.am         |   10 ++++++++--
 src/plugins/Makefile.am |   42 ------------------------------------------
 2 files changed, 8 insertions(+), 44 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index c0c1e99..3d408ae 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,6 +12,7 @@ common_defines = \
 	-DGCONF_PREFIX=\""/apps/totem"\"		\
 	-DDATADIR=\""$(datadir)"\"			\
 	-DLIBEXECDIR=\""$(libexecdir)"\"		\
+	-DTOTEM_PLUGIN_DIR=\""$(libdir)/totem/plugins"\"\
 	-DBINDIR=\""$(bindir)"\"			\
 	-DGTKBUILDERDIR=\"""\"				\
 	$(DISABLE_DEPRECATED)
@@ -83,7 +84,12 @@ libtotem_main_la_SOURCES = \
 	ev-sidebar.h			\
 	totem-subtitle-encoding.c	\
 	totem-subtitle-encoding.h	\
-	totem-profile.h
+	totem-profile.h			\
+	plugins/totem-plugin.h		\
+	plugins/totem-plugins-engine.c	\
+	plugins/totem-plugins-engine.h	\
+	plugins/totem-dirs.c		\
+	plugins/totem-dirs.h
 
 libtotem_main_la_CPPFLAGS = \
 	-I$(top_srcdir)/		\
@@ -99,6 +105,7 @@ libtotem_main_la_CFLAGS = \
 	$(WARN_CFLAGS)			\
 	$(DBUS_CFLAGS)			\
 	$(MISSING_PLUGINS_CFLAGS)	\
+	$(PEAS_CFLAGS)			\
 	$(PEASUI_CFLAGS)		\
 	$(AM_CFLAGS)
 
@@ -109,7 +116,6 @@ libtotem_main_la_LDFLAGS =		\
 libtotem_main_la_LIBADD = \
 	libtotem_player.la		\
 	backend/libbaconvideowidget.la	\
-	plugins/libtotemmodule.la	\
 	$(PEASUI_LIBS)			\
 	$(DEPENDENCY_LIBS)		\
 	$(DBUS_LIBS)			\
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index fc6ad4e..9357e7f 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,45 +1,3 @@
 SUBDIRS = $(PLUGINS)
 DIST_SUBDIRS = $(ALL_PLUGINS)
 
-noinst_LTLIBRARIES = libtotemmodule.la
-
-common_defines =					\
-	-D_REENTRANT					\
-	-DDBUS_API_SUBJECT_TO_CHANGE			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DGCONF_PREFIX=\""/apps/totem"\"		\
-	-DDATADIR=\""$(datadir)"\"			\
-	-DLIBEXECDIR=\""$(libexecdir)"\"		\
-	-DBINDIR=\""$(bindir)"\"			\
-	-DTOTEM_PLUGIN_DIR=\""$(libdir)/totem/plugins"\"\
-	-DG_LOG_DOMAIN=\""Totem"\"			\
-	$(DISABLE_DEPRECATED)
-
-modules_flags = -export_dynamic -avoid-version -module
-
-libtotemmodule_la_SOURCES =		\
-	totem-plugin.h			\
-	totem-plugins-engine.c		\
-	totem-plugins-engine.h		\
-	totem-dirs.c			\
-	totem-dirs.h
-
-libtotemmodule_la_CPPFLAGS = \
-	$(common_defines)	\
-	$(AM_CPPFLAGS)
-
-libtotemmodule_la_LDFLAGS = $(AM_LDFLAGS) $(modules_flags)
-
-libtotemmodule_la_CFLAGS = \
-	$(DEPENDENCY_CFLAGS)	\
-	$(PEAS_CFLAGS)		\
-	$(WARN_CFLAGS)		\
-	$(DBUS_CFLAGS)		\
-	$(AM_CFLAGS)		\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/lib 				\
-	-I$(top_builddir)/lib 				\
-	-I$(top_srcdir)/src				\
-	-I$(top_srcdir)/src/backend			\
-	-I$(top_srcdir)/src/plugins
-