summaryrefslogtreecommitdiff
path: root/legacy/ethumb/src
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-12-06 06:31:45 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-12-06 06:31:45 +0000
commit4d5063985b28cd26c79bfef23c4945694885ed8f (patch)
tree72ba845b171b18c971c649f57c5443729bb97a9a /legacy/ethumb/src
parenta10fb296c4368faa6a71b3d5e0ffef352c4c55b5 (diff)
Ethumb: formatting, fix future compilation on Windows
SVN revision: 65946
Diffstat (limited to '')
-rw-r--r--legacy/ethumb/src/bin/Makefile.am53
-rw-r--r--legacy/ethumb/src/bin/ethumbd.c3
-rw-r--r--legacy/ethumb/src/bin/ethumbd_child.c3
-rw-r--r--legacy/ethumb/src/bin/ethumbd_client.c4
-rw-r--r--legacy/ethumb/src/lib/Makefile.am35
-rw-r--r--legacy/ethumb/src/lib/client/Makefile.am23
6 files changed, 69 insertions, 52 deletions
diff --git a/legacy/ethumb/src/bin/Makefile.am b/legacy/ethumb/src/bin/Makefile.am
index bb49ff55ff..2558cfff74 100644
--- a/legacy/ethumb/src/bin/Makefile.am
+++ b/legacy/ethumb/src/bin/Makefile.am
@@ -1,47 +1,54 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4 -I$(top_srcdir)/src/lib \ 4-I$(top_srcdir)/src/lib \
5 -I$(top_srcdir)/src/lib/client \ 5-I$(top_srcdir)/src/lib/client \
6 @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @ECORE_EVAS_CFLAGS@ \ 6@EINA_CFLAGS@ \
7 @EDJE_CFLAGS@ @ECORE_FILE_CFLAGS@ 7@ECORE_CFLAGS@ \
8@EDBUS_CFLAGS@
9
10if USE_MODULE_ETHUMBD
11
12AM_CPPFLAGS += \
13@EDBUS_CFLAGS@ \
14-DETHUMB_LIBEXEC_DIR=\"$(libexecdir)\"
15
16endif
8 17
9bin_PROGRAMS = ethumb 18bin_PROGRAMS = ethumb
10noinst_HEADERS =
11 19
12ethumb_SOURCES = ethumb.c 20ethumb_SOURCES = ethumb.c
13ethumb_LDADD = \ 21ethumb_LDADD = \
14 @EINA_LIBS@ @ECORE_LIBS@ \ 22$(top_builddir)/src/lib/libethumb.la \
15 $(top_builddir)/src/lib/libethumb.la 23@ECORE_LIBS@ \
16ethumb_DEPENDENCIES = $(top_builddir)/config.h 24@EINA_LIBS@
17
18 25
19 26
20if USE_MODULE_ETHUMBD 27if USE_MODULE_ETHUMBD
21 28
22AM_CPPFLAGS += @EDBUS_CFLAGS@ \
23 -DETHUMB_LIBEXEC_DIR=\"$(libexecdir)\"
24bin_PROGRAMS += ethumbd ethumbd_client 29bin_PROGRAMS += ethumbd ethumbd_client
25noinst_HEADERS += ethumbd_private.h
26 30
27libexec_PROGRAMS = ethumbd_slave 31libexec_PROGRAMS = ethumbd_slave
28 32
29ethumbd_SOURCES = ethumbd.c 33ethumbd_SOURCES = ethumbd.c ethumbd_private.h
30ethumbd_LDADD = \ 34ethumbd_LDADD = \
31 @EINA_LIBS@ @ECORE_LIBS@ @EDBUS_LIBS@ \ 35$(top_builddir)/src/lib/libethumb.la \
32 $(top_builddir)/src/lib/libethumb.la 36@EDBUS_LIBS@ \
33ethumbd_DEPENDENCIES = $(top_builddir)/config.h 37@ECORE_LIBS@ \
38@EINA_LIBS@
34 39
35ethumbd_slave_SOURCES = ethumbd_child.c 40ethumbd_slave_SOURCES = ethumbd_child.c ethumbd_private.h
36ethumbd_slave_LDADD = \ 41ethumbd_slave_LDADD = \
37 @EINA_LIBS@ @ECORE_LIBS@ @EDBUS_LIBS@ \ 42$(top_builddir)/src/lib/libethumb.la \
38 $(top_builddir)/src/lib/libethumb.la 43@EDBUS_LIBS@ \
44@ECORE_LIBS@ \
45@EINA_LIBS@
39 46
40ethumbd_client_SOURCES = ethumbd_client.c 47ethumbd_client_SOURCES = ethumbd_client.c
41ethumbd_client_LDADD = \ 48ethumbd_client_LDADD = \
42 @EINA_LIBS@ @ECORE_LIBS@ \ 49$(top_builddir)/src/lib/client/libethumb_client.la \
43 $(top_builddir)/src/lib/libethumb.la \ 50$(top_builddir)/src/lib/libethumb.la \
44 $(top_builddir)/src/lib/client/libethumb_client.la 51@ECORE_LIBS@ \
45ethumbd_client_DEPENDENCIES = $(top_builddir)/config.h 52@EINA_LIBS@
46 53
47endif 54endif
diff --git a/legacy/ethumb/src/bin/ethumbd.c b/legacy/ethumb/src/bin/ethumbd.c
index f9508cdb27..d3ca7c386d 100644
--- a/legacy/ethumb/src/bin/ethumbd.c
+++ b/legacy/ethumb/src/bin/ethumbd.c
@@ -23,6 +23,7 @@
23#ifdef HAVE_CONFIG_H 23#ifdef HAVE_CONFIG_H
24#include "config.h" 24#include "config.h"
25#endif 25#endif
26
26#include <stdio.h> 27#include <stdio.h>
27#include <stdlib.h> 28#include <stdlib.h>
28#include <string.h> 29#include <string.h>
@@ -30,11 +31,11 @@
30#include <unistd.h> 31#include <unistd.h>
31#include <errno.h> 32#include <errno.h>
32 33
33#include <Ethumb.h>
34#include <Eina.h> 34#include <Eina.h>
35#include <Ecore_Getopt.h> 35#include <Ecore_Getopt.h>
36#include <Ecore.h> 36#include <Ecore.h>
37#include <E_DBus.h> 37#include <E_DBus.h>
38#include <Ethumb.h>
38 39
39#include "ethumbd_private.h" 40#include "ethumbd_private.h"
40 41
diff --git a/legacy/ethumb/src/bin/ethumbd_child.c b/legacy/ethumb/src/bin/ethumbd_child.c
index 3d6acaccd9..a11c90ca16 100644
--- a/legacy/ethumb/src/bin/ethumbd_child.c
+++ b/legacy/ethumb/src/bin/ethumbd_child.c
@@ -23,15 +23,16 @@
23#ifdef HAVE_CONFIG_H 23#ifdef HAVE_CONFIG_H
24#include "config.h" 24#include "config.h"
25#endif 25#endif
26
26#include <stdlib.h> 27#include <stdlib.h>
27#include <unistd.h> 28#include <unistd.h>
28#include <limits.h> 29#include <limits.h>
29#include <string.h> 30#include <string.h>
30#include <errno.h> 31#include <errno.h>
31 32
33#include <Eina.h>
32#include <Ecore.h> 34#include <Ecore.h>
33#include <Ethumb.h> 35#include <Ethumb.h>
34#include <Eina.h>
35 36
36#include "ethumbd_private.h" 37#include "ethumbd_private.h"
37 38
diff --git a/legacy/ethumb/src/bin/ethumbd_client.c b/legacy/ethumb/src/bin/ethumbd_client.c
index 57950e3884..dab9e3b0ca 100644
--- a/legacy/ethumb/src/bin/ethumbd_client.c
+++ b/legacy/ethumb/src/bin/ethumbd_client.c
@@ -22,14 +22,16 @@
22#ifdef HAVE_CONFIG_H 22#ifdef HAVE_CONFIG_H
23#include "config.h" 23#include "config.h"
24#endif 24#endif
25
25#include <stdio.h> 26#include <stdio.h>
26#include <stdlib.h> 27#include <stdlib.h>
27#include <string.h> 28#include <string.h>
28#include <limits.h> 29#include <limits.h>
29#include <Ethumb_Client.h> 30
30#include <Eina.h> 31#include <Eina.h>
31#include <Ecore_Getopt.h> 32#include <Ecore_Getopt.h>
32#include <Ecore.h> 33#include <Ecore.h>
34#include <Ethumb_Client.h>
33 35
34const char *aspect_opt[] = { "keep", "ignore", "crop", NULL }; 36const char *aspect_opt[] = { "keep", "ignore", "crop", NULL };
35const char *format_opt[] = { "png", "jpg", "eet", NULL }; 37const char *format_opt[] = { "png", "jpg", "eet", NULL };
diff --git a/legacy/ethumb/src/lib/Makefile.am b/legacy/ethumb/src/lib/Makefile.am
index 74effdc52f..8157efe1c1 100644
--- a/legacy/ethumb/src/lib/Makefile.am
+++ b/legacy/ethumb/src/lib/Makefile.am
@@ -2,12 +2,21 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3SUBDIRS = . 3SUBDIRS = .
4 4
5if USE_MODULE_ETHUMBD
6SUBDIRS += client
7endif
8
5AM_CPPFLAGS = \ 9AM_CPPFLAGS = \
6 -I$(top_srcdir) \ 10-I$(top_srcdir) \
7 -I$(top_builddir) \ 11-I$(top_builddir) \
8 -DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \ 12-DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \
9 @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \ 13@EFL_ETHUMB_BUILD@ \
10 @EFL_ETHUMB_BUILD@ 14@EINA_CFLAGS@ \
15@EVAS_CFLAGS@ \
16@ECORE_CFLAGS@ \
17@ECORE_EVAS_CFLAGS@ \
18@ECORE_FILE_CFLAGS@ \
19@EDJE_CFLAGS@
11 20
12if HAVE_LIBEXIF 21if HAVE_LIBEXIF
13AM_CPPFLAGS += @LIBEXIF_CFLAGS@ 22AM_CPPFLAGS += @LIBEXIF_CFLAGS@
@@ -21,17 +30,17 @@ noinst_HEADERS = md5.h ethumb_private.h
21lib_LTLIBRARIES = libethumb.la 30lib_LTLIBRARIES = libethumb.la
22 31
23 32
24libethumb_la_SOURCES = \ 33libethumb_la_SOURCES = Ethumb.c md5.c
25 Ethumb.c \
26 md5.c
27libethumb_la_LIBADD = \ 34libethumb_la_LIBADD = \
28 @EDJE_LIBS@ @ECORE_FILE_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@ 35@EDJE_LIBS@ \
29libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 36@ECORE_FILE_LIBS@ \
37@ECORE_EVAS_LIBS@ \
38@ECORE_LIBS@ \
39@EVAS_LIBS@ \
40@EINA_LIBS@
30 41
31if HAVE_LIBEXIF 42if HAVE_LIBEXIF
32libethumb_la_LIBADD += @LIBEXIF_LIBS@ 43libethumb_la_LIBADD += @LIBEXIF_LIBS@
33endif 44endif
34 45
35if USE_MODULE_ETHUMBD 46libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
36SUBDIRS += client
37endif
diff --git a/legacy/ethumb/src/lib/client/Makefile.am b/legacy/ethumb/src/lib/client/Makefile.am
index b568e210f5..549f8f04df 100644
--- a/legacy/ethumb/src/lib/client/Makefile.am
+++ b/legacy/ethumb/src/lib/client/Makefile.am
@@ -1,24 +1,21 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3AM_CPPFLAGS = \ 3AM_CPPFLAGS = \
4 -I$(top_srcdir) \ 4-I$(top_srcdir) \
5 -I$(top_builddir) \ 5-I$(top_builddir) \
6 -I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7 @EDBUS_CFLAGS@ \ 7@EFL_ETHUMB_CLIENT_BUILD@ \
8 @EINA_CFLAGS@ \ 8@EDBUS_CFLAGS@ \
9 @EFL_ETHUMB_CLIENT_BUILD@ 9@EINA_CFLAGS@
10 10
11includes_HEADERS = Ethumb_Client.h 11includes_HEADERS = Ethumb_Client.h
12includesdir = $(includedir)/ethumb-@VMAJ@ 12includesdir = $(includedir)/ethumb-@VMAJ@
13 13
14lib_LTLIBRARIES = libethumb_client.la 14lib_LTLIBRARIES = libethumb_client.la
15 15
16libethumb_client_la_SOURCES = \ 16libethumb_client_la_SOURCES = Ethumb_Client.c
17 Ethumb_Client.c
18libethumb_client_la_DEPENDENCIES = $(top_builddir)/config.h
19libethumb_client_la_LIBADD = \ 17libethumb_client_la_LIBADD = \
20 $(top_builddir)/src/lib/libethumb.la \ 18$(top_builddir)/src/lib/libethumb.la \
21 @EDBUS_LIBS@ 19@EDBUS_LIBS@ \
20@EINA_LIBS@
22libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ 21libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
23
24# @EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@