[eog] Merge per-plugin Makefiles into a single Makefile

[Felix Riemann <friemann src gnome org>]

commit 7f0e5cf5a7bd4916df21d9ba43be37cf97c6e3b4
Author: Felix Riemann <friemann gnome org>
Date:   Sat Jul 25 13:45:35 2009 +0200

    Merge per-plugin Makefiles into a single Makefile
    
    Merges all the per-plugin Makefiles into a single non-recursive
    Makefile. It makes it possible to build the plugins in parallel which
    nearly halves the build time necessary for them on my dual core system.

 ChangeLog                          |    8 ++++-
 configure.ac                       |    4 +--
 plugins/ChangeLog                  |    6 ++++
 plugins/Makefile.am                |   55 ++++++++++++++++++++++++++++++++---
 plugins/fullscreen/Makefile.am     |   34 ----------------------
 plugins/reload/Makefile.am         |   34 ----------------------
 plugins/statusbar-date/Makefile.am |   33 ---------------------
 7 files changed, 64 insertions(+), 110 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index eb35cbf..d82ef2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,16 @@
+2009-07-25  Felix Riemann  <friemann gnome org>
+
+	* configure.ac:
+	* plugins/*/Makefile.am:
+	Merge per-plugin Makefiles into a single one. This makes it possible
+	to build the plugins in parallel.
+
 2009-07-24  Felix Riemann  <friemann gnome org>
 
 	* configure.ac:
 	* data/icons/*/*/Makefile.am:
 	Merge per-context Makefiles for the icons into per-size Makefiles.
 
-
 2009-07-24  Felix Riemann  <friemann gnome org>
 
 	* data/eog.schemas.in:
diff --git a/configure.ac b/configure.ac
index 094c289..9cb8dc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,7 @@ AC_PROG_LIBTOOL
 
 AC_ISC_POSIX
 AC_PROG_CC
+AM_PROG_CC_C_O
 AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
 AC_PATH_PROG([GLIB_MKENUMS],[glib-mkenums])
 
@@ -415,9 +416,6 @@ doc/reference/Makefile
 doc/reference/version.xml
 doc/reference/eog-docs.sgml
 plugins/Makefile
-plugins/reload/Makefile
-plugins/fullscreen/Makefile
-plugins/statusbar-date/Makefile
 bindings/Makefile
 bindings/python/Makefile
 ])
diff --git a/plugins/ChangeLog b/plugins/ChangeLog
index 05ed5f7..9225f02 100644
--- a/plugins/ChangeLog
+++ b/plugins/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-25  Felix Riemann  <friemann gnome org>
+
+	* Makefile.am:
+	Merge per-plugin Makefiles into a single one. This makes it possible
+	to build the plugins in parallel.
+
 2009-04-10  Felix Riemann  <friemann svn gnome org>
 
 	* reload/eog-reload-plugin.c:
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 11dcf1f..8db9d02 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,13 +1,58 @@
-SUBDIRS = fullscreen reload
+AUTOMAKE_OPTIONS = subdir-objects
 
+pluginsdir = $(libdir)/eog/plugins
+
+INCLUDES = \
+	-I$(top_srcdir)/src 				\
+	$(EOG_CFLAGS) 					\
+	$(WARN_CFLAGS)					\
+	-DEOG_LOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"
+
+AM_LDFLAGS = -avoid-version -module
+
+plugins_LTLIBRARIES = \
+	fullscreen/libfullscreen.la  \
+	reload/libreload.la
+
+plugins_in_files = \
+	fullscreen/fullscreen.eog-plugin.desktop.in  \
+	reload/reload.eog-plugin.desktop.in
+
+# Fullscreen plugin
+fullscreen_libfullscreen_la_SOURCES = \
+	fullscreen/eog-fullscreen-plugin.h  \
+	fullscreen/eog-fullscreen-plugin.c
+
+fullscreen_libfullscreen_la_LIBADD = $(EOG_LIBS)
+
+# Reload plugin
+reload_libreload_la_SOURCES = \
+	reload/eog-reload-plugin.h  \
+	reload/eog-reload-plugin.c
+
+reload_libreload_la_LIBADD = $(EOG_LIBS)
+
+# Statusbar Date Plugin
 if HAVE_EXIF
-SUBDIRS += statusbar-date
+plugins_LTLIBRARIES += statusbar-date/libstatusbar-date.la
+
+statusbar_date_libstatusbar_date_la_SOURCES = \
+	statusbar-date/eog-statusbar-date-plugin.h  \
+	statusbar-date/eog-statusbar-date-plugin.c
+
+statusbar_date_libstatusbar_date_la_LIBADD = $(EOG_LIBS)
+plugins_in_files += statusbar-date/statusbar-date.eog-plugin.desktop.in
 endif
 
-plugindir = $(libdir)/eog/plugins
+# Generate plugin info files
+
+%.eog-plugin: %.eog-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+plugins_DATA = $(plugins_in_files:.eog-plugin.desktop.in=.eog-plugin)
 
-DISTCLEANFILES =
+DISTCLEANFILES = $(plugins_DATA)
+CLEANFILES = $(plugins_DATA)
 
-EXTRA_DIST =
+EXTRA_DIST = $(plugins_in_files)
 
 -include $(top_srcdir)/git.mk