From 4d5063985b28cd26c79bfef23c4945694885ed8f Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Tue, 6 Dec 2011 06:31:45 +0000 Subject: [PATCH] Ethumb: formatting, fix future compilation on Windows SVN revision: 65946 --- legacy/ethumb/src/bin/Makefile.am | 53 ++++++++++++++---------- legacy/ethumb/src/bin/ethumbd.c | 3 +- legacy/ethumb/src/bin/ethumbd_child.c | 3 +- legacy/ethumb/src/bin/ethumbd_client.c | 4 +- legacy/ethumb/src/lib/Makefile.am | 35 ++++++++++------ legacy/ethumb/src/lib/client/Makefile.am | 23 +++++----- 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 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ - -I$(top_srcdir)/src/lib \ - -I$(top_srcdir)/src/lib/client \ - @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @ECORE_EVAS_CFLAGS@ \ - @EDJE_CFLAGS@ @ECORE_FILE_CFLAGS@ +-I$(top_srcdir)/src/lib \ +-I$(top_srcdir)/src/lib/client \ +@EINA_CFLAGS@ \ +@ECORE_CFLAGS@ \ +@EDBUS_CFLAGS@ + +if USE_MODULE_ETHUMBD + +AM_CPPFLAGS += \ +@EDBUS_CFLAGS@ \ +-DETHUMB_LIBEXEC_DIR=\"$(libexecdir)\" + +endif bin_PROGRAMS = ethumb -noinst_HEADERS = ethumb_SOURCES = ethumb.c ethumb_LDADD = \ - @EINA_LIBS@ @ECORE_LIBS@ \ - $(top_builddir)/src/lib/libethumb.la -ethumb_DEPENDENCIES = $(top_builddir)/config.h - +$(top_builddir)/src/lib/libethumb.la \ +@ECORE_LIBS@ \ +@EINA_LIBS@ if USE_MODULE_ETHUMBD -AM_CPPFLAGS += @EDBUS_CFLAGS@ \ - -DETHUMB_LIBEXEC_DIR=\"$(libexecdir)\" bin_PROGRAMS += ethumbd ethumbd_client -noinst_HEADERS += ethumbd_private.h libexec_PROGRAMS = ethumbd_slave -ethumbd_SOURCES = ethumbd.c +ethumbd_SOURCES = ethumbd.c ethumbd_private.h ethumbd_LDADD = \ - @EINA_LIBS@ @ECORE_LIBS@ @EDBUS_LIBS@ \ - $(top_builddir)/src/lib/libethumb.la -ethumbd_DEPENDENCIES = $(top_builddir)/config.h +$(top_builddir)/src/lib/libethumb.la \ +@EDBUS_LIBS@ \ +@ECORE_LIBS@ \ +@EINA_LIBS@ -ethumbd_slave_SOURCES = ethumbd_child.c +ethumbd_slave_SOURCES = ethumbd_child.c ethumbd_private.h ethumbd_slave_LDADD = \ - @EINA_LIBS@ @ECORE_LIBS@ @EDBUS_LIBS@ \ - $(top_builddir)/src/lib/libethumb.la +$(top_builddir)/src/lib/libethumb.la \ +@EDBUS_LIBS@ \ +@ECORE_LIBS@ \ +@EINA_LIBS@ ethumbd_client_SOURCES = ethumbd_client.c ethumbd_client_LDADD = \ - @EINA_LIBS@ @ECORE_LIBS@ \ - $(top_builddir)/src/lib/libethumb.la \ - $(top_builddir)/src/lib/client/libethumb_client.la -ethumbd_client_DEPENDENCIES = $(top_builddir)/config.h +$(top_builddir)/src/lib/client/libethumb_client.la \ +$(top_builddir)/src/lib/libethumb.la \ +@ECORE_LIBS@ \ +@EINA_LIBS@ endif 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 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include #include #include @@ -30,11 +31,11 @@ #include #include -#include #include #include #include #include +#include #include "ethumbd_private.h" 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 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include #include #include #include #include +#include #include #include -#include #include "ethumbd_private.h" 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 @@ #ifdef HAVE_CONFIG_H #include "config.h" #endif + #include #include #include #include -#include + #include #include #include +#include const char *aspect_opt[] = { "keep", "ignore", "crop", NULL }; const 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 SUBDIRS = . +if USE_MODULE_ETHUMBD +SUBDIRS += client +endif + AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \ - @EINA_CFLAGS@ @EVAS_CFLAGS@ @ECORE_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \ - @EFL_ETHUMB_BUILD@ +-I$(top_srcdir) \ +-I$(top_builddir) \ +-DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \ +@EFL_ETHUMB_BUILD@ \ +@EINA_CFLAGS@ \ +@EVAS_CFLAGS@ \ +@ECORE_CFLAGS@ \ +@ECORE_EVAS_CFLAGS@ \ +@ECORE_FILE_CFLAGS@ \ +@EDJE_CFLAGS@ if HAVE_LIBEXIF AM_CPPFLAGS += @LIBEXIF_CFLAGS@ @@ -21,17 +30,17 @@ noinst_HEADERS = md5.h ethumb_private.h lib_LTLIBRARIES = libethumb.la -libethumb_la_SOURCES = \ - Ethumb.c \ - md5.c +libethumb_la_SOURCES = Ethumb.c md5.c libethumb_la_LIBADD = \ - @EDJE_LIBS@ @ECORE_FILE_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_LIBS@ @EVAS_LIBS@ @EINA_LIBS@ -libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ +@EDJE_LIBS@ \ +@ECORE_FILE_LIBS@ \ +@ECORE_EVAS_LIBS@ \ +@ECORE_LIBS@ \ +@EVAS_LIBS@ \ +@EINA_LIBS@ if HAVE_LIBEXIF libethumb_la_LIBADD += @LIBEXIF_LIBS@ endif -if USE_MODULE_ETHUMBD -SUBDIRS += client -endif +libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ 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 @@ MAINTAINERCLEANFILES = Makefile.in AM_CPPFLAGS = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ - -I$(top_srcdir)/src/lib \ - @EDBUS_CFLAGS@ \ - @EINA_CFLAGS@ \ - @EFL_ETHUMB_CLIENT_BUILD@ +-I$(top_srcdir) \ +-I$(top_builddir) \ +-I$(top_srcdir)/src/lib \ +@EFL_ETHUMB_CLIENT_BUILD@ \ +@EDBUS_CFLAGS@ \ +@EINA_CFLAGS@ includes_HEADERS = Ethumb_Client.h includesdir = $(includedir)/ethumb-@VMAJ@ lib_LTLIBRARIES = libethumb_client.la -libethumb_client_la_SOURCES = \ - Ethumb_Client.c -libethumb_client_la_DEPENDENCIES = $(top_builddir)/config.h +libethumb_client_la_SOURCES = Ethumb_Client.c libethumb_client_la_LIBADD = \ - $(top_builddir)/src/lib/libethumb.la \ - @EDBUS_LIBS@ +$(top_builddir)/src/lib/libethumb.la \ +@EDBUS_LIBS@ \ +@EINA_LIBS@ libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ - -# @EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@