[eog] Split eog into executable and private shared library

[Felix Riemann <friemann src gnome org>]

commit f295f4debe455fb14b1c4cb8aff913bbb9a54597
Author: Felix Riemann <friemann gnome org>
Date:   Sun May 11 17:09:41 2014 +0200

    Split eog into executable and private shared library
    
    This makes the GResource migration cleaner as the resources are
    logically grouped with the code using them.

 doc/reference/Makefile.am |   19 ++++++++++++++-----
 plugins/Makefile.am       |   13 ++++++++++---
 src/Makefile.am           |   23 ++++++++++++-----------
 3 files changed, 36 insertions(+), 19 deletions(-)
---
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index 55e3a35..09bf37e 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -59,18 +59,27 @@ EXTRA_HFILES=
 # Header files or dirs to ignore when scanning. Use base file/dir names
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h private_code
 IGNORE_HFILES= \
+       eog-application-service.h \
+       eog-close-confirmation-dialog.h \
+       eog-enum-types.h \
        eog-image-private.h \
        eog-image-jpeg.h \
        eog-marshal.h \
-       eog-application-service.h \
-       eog-enum-types.h \
-       eog-module.h
+       eog-metadata-details.h \
+       eog-metadata-reader.h \
+       eog-metadata-reader-jpg.h \
+       eog-metadata-reader-png.h \
+       eog-metadata-sidebar.h \
+       eog-module.h \
+       eog-plugin-engine.h \
+       eog-preferences-dialog.h \
+       eog-print-image-setup.h \
+       eog-print-preview.h
 
 if !HAVE_EXIF
 if !HAVE_EXEMPI
 IGNORE_HFILES +=                       \
-       eog-exif-util.h                 \
-       eog-metadata-details.h
+       eog-exif-util.h
 endif
 endif
 
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8dbf3f1..8852905 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -23,14 +23,18 @@ fullscreen_libfullscreen_la_SOURCES = \
        fullscreen/eog-fullscreen-plugin.h  \
        fullscreen/eog-fullscreen-plugin.c
 
-fullscreen_libfullscreen_la_LIBADD = $(EOG_LIBS)
+fullscreen_libfullscreen_la_LIBADD = \
+       $(top_builddir)/src/libeog.la   \
+       $(EOG_LIBS)
 
 # Reload plugin
 reload_libreload_la_SOURCES = \
        reload/eog-reload-plugin.h  \
        reload/eog-reload-plugin.c
 
-reload_libreload_la_LIBADD = $(EOG_LIBS)
+reload_libreload_la_LIBADD = \
+       $(top_builddir)/src/libeog.la   \
+       $(EOG_LIBS)
 
 # Statusbar Date Plugin
 if HAVE_EXIF
@@ -40,7 +44,10 @@ 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)
+statusbar_date_libstatusbar_date_la_LIBADD = \
+       $(top_builddir)/src/libeog.la   \
+       $(EOG_LIBS)
+
 plugins_in_files += statusbar-date/statusbar-date.plugin.desktop.in
 endif
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7afe655..ed87b5a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,11 +4,11 @@ endif
 
 toolbar_LIB = $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la
 
-noinst_LTLIBRARIES = libeog.la
+pkglib_LTLIBRARIES = libeog.la
 
 bin_PROGRAMS = eog
 
-headerdir = $(prefix)/include/eog- EOG_API_VERSION@/eog
+headerdir = $(includedir)/eog- EOG_API_VERSION@/eog
 header_DATA = $(INST_H_FILES)
 
 MARSHAL_OUTPUT =       \
@@ -120,15 +120,16 @@ libeog_c_files +=                 \
 endif
 
 if HAVE_EXEMPI
-# We need to make sure eog-metadata-details.h
-# is only listed once in INST_H_FILES
+# We need to make sure eog-metadata-details
+# is only listed once
 # or the build will break with automake-1.11
 if !HAVE_EXIF
 NOINST_H_FILES +=                              \
        eog-metadata-details.h
-endif !HAVE_EXIF
+
 libeog_la_SOURCES +=                   \
        eog-metadata-details.c
+endif !HAVE_EXIF
 endif HAVE_EXEMPI
 
 libeog_la_CPPFLAGS =                                           \
@@ -147,7 +148,10 @@ libeog_la_CFLAGS =                                         \
        $(WARN_CFLAGS)
 
 libeog_la_LIBADD = \
-       $(EOG_LIBS) \
+       $(EOG_LIBS)     \
+       $(toolbar_LIB)  \
+       $(jpeg_LIB)     \
+       $(LIBJPEG)      \
        $(LIBM)
 
 if HAVE_LCMS
@@ -158,9 +162,9 @@ libeog_la_LIBADD += \
        $(X11_LIBS)
 endif
 
-libeog_la_LDFLAGS = -export-dynamic -no-undefined
+libeog_la_LDFLAGS = -avoid-version -export-dynamic -no-undefined
 
-eog_SOURCES = eog-resources.c main.c
+eog_SOURCES = main.c
 
 eog_CFLAGS =                                                   \
        -I$(top_srcdir)/cut-n-paste/toolbar-editor              \
@@ -172,9 +176,6 @@ eog_CFLAGS =                                                        \
 eog_LDADD =                            \
        libeog.la                       \
        $(EOG_LIBS)                     \
-       $(LIBJPEG)                      \
-       $(toolbar_LIB)                  \
-       $(jpeg_LIB)                     \
        $(INTROSPECTION_LIBS)
 
 eog_LDFLAGS = -export-dynamic -no-undefined