summaryrefslogtreecommitdiff
path: root/legacy/ethumb
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-12-06 06:12:15 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-12-06 06:12:15 +0000
commita10fb296c4368faa6a71b3d5e0ffef352c4c55b5 (patch)
treef807aa244087f323268b8201157ad055ac42359f /legacy/ethumb
parentbb3f0ffa4bf86c1ef94893d8e5380c4931fabde9 (diff)
Ethumb: fix future compilation on Windows, formatting
SVN revision: 65945
Diffstat (limited to 'legacy/ethumb')
-rw-r--r--legacy/ethumb/src/plugins/emotion/Makefile.am23
-rw-r--r--legacy/ethumb/src/plugins/epdf/Makefile.am16
-rw-r--r--legacy/ethumb/src/plugins/epdf/epdf.c8
3 files changed, 34 insertions, 13 deletions
diff --git a/legacy/ethumb/src/plugins/emotion/Makefile.am b/legacy/ethumb/src/plugins/emotion/Makefile.am
index 3c7be5e7ca..495a9a3790 100644
--- a/legacy/ethumb/src/plugins/emotion/Makefile.am
+++ b/legacy/ethumb/src/plugins/emotion/Makefile.am
@@ -11,16 +11,27 @@ files_DATA = emotion_template.edj
11EXTRA_DIST= \ 11EXTRA_DIST= \
12 template.edc 12 template.edc
13 13
14AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/emotion \ 14AM_CPPFLAGS = \
15 -DPLUGINSDIR=\"$(pluginsdir)\" \ 15-I$(top_srcdir)/src/lib \
16 @EVAS_CFLAGS@ @EINA_CFLAGS@ @EMOTION_CFLAGS@ @ECORE_FILE_CFLAGS@ \ 16-I$(top_srcdir)/src/plugins/emotion \
17 @EDJE_CFLAGS@ 17-DPLUGINSDIR=\"$(pluginsdir)\" \
18@EFL_ETHUMB_BUILD@ \
19@EVAS_CFLAGS@ \
20@EINA_CFLAGS@ \
21@EMOTION_CFLAGS@ \
22@ECORE_FILE_CFLAGS@ \
23@EDJE_CFLAGS@
18 24
19pkgdir = $(pluginsdir) 25pkgdir = $(pluginsdir)
20pkg_LTLIBRARIES = emotion.la 26pkg_LTLIBRARIES = emotion.la
21emotion_la_SOURCES = emotion.c 27emotion_la_SOURCES = emotion.c
22emotion_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \ 28emotion_la_LIBADD = \
23 @EMOTION_LIBS@ @EDJE_LIBS@ @ECORE_FILE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@ 29$(top_builddir)/src/lib/libethumb.la \
30@EMOTION_LIBS@ \
31@EDJE_LIBS@ \
32@ECORE_FILE_LIBS@ \
33@EVAS_LIBS@ \
34@EINA_LIBS@
24emotion_la_LDFLAGS = -module -avoid-version 35emotion_la_LDFLAGS = -module -avoid-version
25emotion_la_LIBTOOLFLAGS = --tag=disable-static 36emotion_la_LIBTOOLFLAGS = --tag=disable-static
26 37
diff --git a/legacy/ethumb/src/plugins/epdf/Makefile.am b/legacy/ethumb/src/plugins/epdf/Makefile.am
index 5cca82c5f9..497c198870 100644
--- a/legacy/ethumb/src/plugins/epdf/Makefile.am
+++ b/legacy/ethumb/src/plugins/epdf/Makefile.am
@@ -1,13 +1,21 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/plugins/epdf \ 3AM_CPPFLAGS = \
4 @EINA_CFLAGS@ @EVAS_CFLAGS@ @EPDF_CFLAGS@ 4-I$(top_srcdir)/src/lib \
5-I$(top_srcdir)/src/plugins/epdf \
6@EFL_ETHUMB_BUILD@ \
7@EINA_CFLAGS@ \
8@EVAS_CFLAGS@ \
9@EPDF_CFLAGS@
5 10
6pluginsdir = $(libdir)/ethumb/plugins 11pluginsdir = $(libdir)/ethumb/plugins
7pkgdir = $(pluginsdir) 12pkgdir = $(pluginsdir)
8pkg_LTLIBRARIES = epdf.la 13pkg_LTLIBRARIES = epdf.la
9epdf_la_SOURCES = epdf.c 14epdf_la_SOURCES = epdf.c
10epdf_la_LIBADD = $(top_builddir)/src/lib/libethumb.la \ 15epdf_la_LIBADD = \
11 @EPDF_LIBS@ @EVAS_LIBS@ @EINA_LIBS@ 16$(top_builddir)/src/lib/libethumb.la \
17@EPDF_LIBS@ \
18@EVAS_LIBS@ \
19@EINA_LIBS@
12epdf_la_LDFLAGS = -module -avoid-version 20epdf_la_LDFLAGS = -module -avoid-version
13epdf_la_LIBTOOLFLAGS = --tag=disable-static 21epdf_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/legacy/ethumb/src/plugins/epdf/epdf.c b/legacy/ethumb/src/plugins/epdf/epdf.c
index c3fad4fdb2..82e3b8cf3b 100644
--- a/legacy/ethumb/src/plugins/epdf/epdf.c
+++ b/legacy/ethumb/src/plugins/epdf/epdf.c
@@ -1,16 +1,18 @@
1#include "Ethumb.h"
2#include "Ethumb_Plugin.h"
3
4#ifdef HAVE_CONFIG_H 1#ifdef HAVE_CONFIG_H
5#include "config.h" 2#include "config.h"
6#endif 3#endif
7 4
8#include <stdio.h> 5#include <stdio.h>
9#include <stdlib.h> 6#include <stdlib.h>
7
10#include <Eina.h> 8#include <Eina.h>
11#include <Evas.h> 9#include <Evas.h>
12#include <Epdf.h> 10#include <Epdf.h>
13 11
12#include "Ethumb.h"
13#include "Ethumb_Plugin.h"
14
15
14static void 16static void
15_generate_thumb(Ethumb *e) 17_generate_thumb(Ethumb *e)
16{ 18{