* 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

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ethumb@43567 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index ef931cd..71f7fe7 100644 (file)
--- a/configure.ac
+++ b/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.]
-)
-
-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.])
+#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])
 
 EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
 

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 949fa04..a3795de 100644 (file)
--- a/src/lib/Makefile.am
+++ b/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/src/plugins/emotion/Makefile.am b/src/plugins/emotion/Makefile.am
index 3b0f5bf..27ae219 100644 (file)
--- a/src/plugins/emotion/Makefile.am
+++ b/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/src/plugins/epdf/Makefile.am b/src/plugins/epdf/Makefile.am
index db28d26..c7fcb5c 100644 (file)
--- a/src/plugins/epdf/Makefile.am
+++ b/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