From d4d1a53181cb7e664ba27da8c7adf0dab4d302d9 Mon Sep 17 00:00:00 2001
From: Vincent Torri <vincent.torri@gmail.com>
Date: Mon, 9 Nov 2009 05:41:41 +0000
Subject: [PATCH]  * fix order of libraries during link (fix windows
 compilation)  * paths based on $prefix are not set at configure time. The
 correct    way is to use them in Makefile.am.  * $themesdir and $sysconfdir
 does not seem to be used

SVN revision: 43567
---
 legacy/ethumb/configure.ac                    | 19 +++++++------------
 legacy/ethumb/src/lib/Makefile.am             |  4 ++--
 legacy/ethumb/src/plugins/emotion/Makefile.am |  7 +++++--
 legacy/ethumb/src/plugins/epdf/Makefile.am    |  5 +++--
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/legacy/ethumb/configure.ac b/legacy/ethumb/configure.ac
index ef931cdd5a..71f7fe71f3 100644
--- a/legacy/ethumb/configure.ac
+++ b/legacy/ethumb/configure.ac
@@ -27,19 +27,14 @@ VMIN=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $2);}'`
 version_info=`expr $VMAJ + $VMIN`
 AC_SUBST(version_info)
 
-themesdir="${datadir}/ethumb/data/frames"
-AC_SUBST(themesdir)
-AS_AC_EXPAND(THEMESDIR, $themesdir)
-AC_DEFINE_UNQUOTED(THEMESDIR, ["$THEMESDIR"], [Where frame theme files are installed.]
-)
+#themesdir="${datadir}/ethumb/data/frames"
+#AC_SUBST(themesdir)
+#AS_AC_EXPAND(THEMESDIR, $themesdir)
+#AC_DEFINE_UNQUOTED(THEMESDIR, ["$THEMESDIR"], [Where frame theme files are installed.]
+#)
 
-AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-AC_DEFINE_UNQUOTED(SYSCONFDIR, ["$SYSCONFDIR"], [Where system configuration is stored])
-
-pluginsdir="${libdir}/ethumb/plugins"
-AC_SUBST(pluginsdir)
-AS_AC_EXPAND(PLUGINSDIR, $pluginsdir)
-AC_DEFINE_UNQUOTED(PLUGINSDIR, ["$PLUGINSDIR"], [Where plugins are installed.])
+#AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
+#AC_DEFINE_UNQUOTED(SYSCONFDIR, ["$SYSCONFDIR"], [Where system configuration is stored])
 
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 
diff --git a/legacy/ethumb/src/lib/Makefile.am b/legacy/ethumb/src/lib/Makefile.am
index 949fa040c8..a3795def6c 100644
--- a/legacy/ethumb/src/lib/Makefile.am
+++ b/legacy/ethumb/src/lib/Makefile.am
@@ -5,6 +5,7 @@ SUBDIRS = .
 AM_CPPFLAGS = \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
+	-DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \
 	@EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \
 	@EFL_ETHUMB_BUILD@
 
@@ -17,9 +18,8 @@ lib_LTLIBRARIES = libethumb.la
 libethumb_la_SOURCES = \
 	Ethumb.c \
 	md5.c
-libethumb_la_DEPENDENCIES = $(top_builddir)/config.h
 libethumb_la_LIBADD = \
-	@EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@
+	@EDJE_LIBS@ @ECORE_FILE_LIBS@ @ECORE_EVAS_LIBS@ @EVAS_LIBS@
 libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
 
 
diff --git a/legacy/ethumb/src/plugins/emotion/Makefile.am b/legacy/ethumb/src/plugins/emotion/Makefile.am
index 3b0f5bffd4..27ae219476 100644
--- a/legacy/ethumb/src/plugins/emotion/Makefile.am
+++ b/legacy/ethumb/src/plugins/emotion/Makefile.am
@@ -1,8 +1,10 @@
+
 MAINTAINERCLEANFILES = Makefile.in
 
 EDJE_CC = edje_cc
 EDJE_FLAGS = -v
 
+pluginsdir = $(libdir)/ethumb/plugins
 filesdir = $(pluginsdir)/data
 files_DATA = emotion_template.edj
 
@@ -10,16 +12,17 @@ EXTRA_DIST= \
       template.edc
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/emotion \
+	-DPLUGINSDIR=\"$(pluginsdir)\" \
 	@EVAS_CFLAGS@ @EINA_CFLAGS@ @EMOTION_CFLAGS@ @ECORE_CFLAGS@ \
 	@EDJE_CFLAGS@
 
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = emotion.la
 emotion_la_SOURCES = emotion.c
-emotion_la_DEPENDENCIES = $(top_builddir)/config.h
 emotion_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \
-	@EVAS_LIBS@ @EINA_LIBS@ @EMOTION_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@
+	@EMOTION_LIBS@ @EDJE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@
 emotion_la_LDFLAGS = -module -avoid-version
+emotion_la_LIBTOOLFLAGS = --tag=disable-static
 
 
 emotion_template.edj: Makefile $(EXTRADIST)
diff --git a/legacy/ethumb/src/plugins/epdf/Makefile.am b/legacy/ethumb/src/plugins/epdf/Makefile.am
index db28d261d2..c7fcb5c875 100644
--- a/legacy/ethumb/src/plugins/epdf/Makefile.am
+++ b/legacy/ethumb/src/plugins/epdf/Makefile.am
@@ -3,10 +3,11 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/epdf \
 	@EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @EPDF_CFLAGS@
 
+pluginsdir = $(libdir)/ethumb/plugins
 pkgdir = $(pluginsdir)
 pkg_LTLIBRARIES = epdf.la
 epdf_la_SOURCES = epdf.c
-epdf_la_DEPENDENCIES = $(top_builddir)/config.h
 epdf_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \
-	@EINA_LIBS@ @EVAS_LIBS@ @ECORE_LIBS@ @EPDF_LIBS@
+	@EPDF_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@
 epdf_la_LDFLAGS = -module -avoid-version
+epdf_la_LIBTOOLFLAGS = --tag=disable-static