summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-11-09 05:41:41 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-11-09 05:41:41 +0000
commitd4d1a53181cb7e664ba27da8c7adf0dab4d302d9 (patch)
tree7b3462cf26b2aff82519ffedb403748bc2a47959 /legacy/ethumb
parent2198c8a70a49b64fba5cbecb1f70d657cd3be4e2 (diff)
* 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
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/configure.ac21
-rw-r--r--legacy/ethumb/src/lib/Makefile.am4
-rw-r--r--legacy/ethumb/src/plugins/emotion/Makefile.am7
-rw-r--r--legacy/ethumb/src/plugins/epdf/Makefile.am5
4 files changed, 18 insertions, 19 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);}'`
27version_info=`expr $VMAJ + $VMIN` 27version_info=`expr $VMAJ + $VMIN`
28AC_SUBST(version_info) 28AC_SUBST(version_info)
29 29
30themesdir="${datadir}/ethumb/data/frames" 30#themesdir="${datadir}/ethumb/data/frames"
31AC_SUBST(themesdir) 31#AC_SUBST(themesdir)
32AS_AC_EXPAND(THEMESDIR, $themesdir) 32#AS_AC_EXPAND(THEMESDIR, $themesdir)
33AC_DEFINE_UNQUOTED(THEMESDIR, ["$THEMESDIR"], [Where frame theme files are installed.] 33#AC_DEFINE_UNQUOTED(THEMESDIR, ["$THEMESDIR"], [Where frame theme files are installed.]
34) 34#)
35 35
36AS_AC_EXPAND(SYSCONFDIR, $sysconfdir) 36#AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
37AC_DEFINE_UNQUOTED(SYSCONFDIR, ["$SYSCONFDIR"], [Where system configuration is stored]) 37#AC_DEFINE_UNQUOTED(SYSCONFDIR, ["$SYSCONFDIR"], [Where system configuration is stored])
38
39pluginsdir="${libdir}/ethumb/plugins"
40AC_SUBST(pluginsdir)
41AS_AC_EXPAND(PLUGINSDIR, $pluginsdir)
42AC_DEFINE_UNQUOTED(PLUGINSDIR, ["$PLUGINSDIR"], [Where plugins are installed.])
43 38
44EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"]) 39EFL_CHECK_DOXYGEN([build_doc="yes"], [build_doc="no"])
45 40
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 = .
5AM_CPPFLAGS = \ 5AM_CPPFLAGS = \
6 -I$(top_srcdir) \ 6 -I$(top_srcdir) \
7 -I$(top_builddir) \ 7 -I$(top_builddir) \
8 -DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \
8 @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \ 9 @EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \
9 @EFL_ETHUMB_BUILD@ 10 @EFL_ETHUMB_BUILD@
10 11
@@ -17,9 +18,8 @@ lib_LTLIBRARIES = libethumb.la
17libethumb_la_SOURCES = \ 18libethumb_la_SOURCES = \
18 Ethumb.c \ 19 Ethumb.c \
19 md5.c 20 md5.c
20libethumb_la_DEPENDENCIES = $(top_builddir)/config.h
21libethumb_la_LIBADD = \ 21libethumb_la_LIBADD = \
22 @EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@ 22 @EDJE_LIBS@ @ECORE_FILE_LIBS@ @ECORE_EVAS_LIBS@ @EVAS_LIBS@
23libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ 23libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
24 24
25 25
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 @@
1
1MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
2 3
3EDJE_CC = edje_cc 4EDJE_CC = edje_cc
4EDJE_FLAGS = -v 5EDJE_FLAGS = -v
5 6
7pluginsdir = $(libdir)/ethumb/plugins
6filesdir = $(pluginsdir)/data 8filesdir = $(pluginsdir)/data
7files_DATA = emotion_template.edj 9files_DATA = emotion_template.edj
8 10
@@ -10,16 +12,17 @@ EXTRA_DIST= \
10 template.edc 12 template.edc
11 13
12AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/emotion \ 14AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/emotion \
15 -DPLUGINSDIR=\"$(pluginsdir)\" \
13 @EVAS_CFLAGS@ @EINA_CFLAGS@ @EMOTION_CFLAGS@ @ECORE_CFLAGS@ \ 16 @EVAS_CFLAGS@ @EINA_CFLAGS@ @EMOTION_CFLAGS@ @ECORE_CFLAGS@ \
14 @EDJE_CFLAGS@ 17 @EDJE_CFLAGS@
15 18
16pkgdir = $(pluginsdir) 19pkgdir = $(pluginsdir)
17pkg_LTLIBRARIES = emotion.la 20pkg_LTLIBRARIES = emotion.la
18emotion_la_SOURCES = emotion.c 21emotion_la_SOURCES = emotion.c
19emotion_la_DEPENDENCIES = $(top_builddir)/config.h
20emotion_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \ 22emotion_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \
21 @EVAS_LIBS@ @EINA_LIBS@ @EMOTION_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ 23 @EMOTION_LIBS@ @EDJE_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@
22emotion_la_LDFLAGS = -module -avoid-version 24emotion_la_LDFLAGS = -module -avoid-version
25emotion_la_LIBTOOLFLAGS = --tag=disable-static
23 26
24 27
25emotion_template.edj: Makefile $(EXTRADIST) 28emotion_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
3AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/epdf \ 3AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/epdf \
4 @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @EPDF_CFLAGS@ 4 @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @EPDF_CFLAGS@
5 5
6pluginsdir = $(libdir)/ethumb/plugins
6pkgdir = $(pluginsdir) 7pkgdir = $(pluginsdir)
7pkg_LTLIBRARIES = epdf.la 8pkg_LTLIBRARIES = epdf.la
8epdf_la_SOURCES = epdf.c 9epdf_la_SOURCES = epdf.c
9epdf_la_DEPENDENCIES = $(top_builddir)/config.h
10epdf_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \ 10epdf_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \
11 @EINA_LIBS@ @EVAS_LIBS@ @ECORE_LIBS@ @EPDF_LIBS@ 11 @EPDF_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@
12epdf_la_LDFLAGS = -module -avoid-version 12epdf_la_LDFLAGS = -module -avoid-version
13epdf_la_LIBTOOLFLAGS = --tag=disable-static