Ethumb: formatting, fix future compilation on Windows

SVN revision: 65946
devs/devilhorns/wayland_egl
Vincent Torri 11 years ago
parent a10fb296c4
commit 4d5063985b
  1. 53
      legacy/ethumb/src/bin/Makefile.am
  2. 3
      legacy/ethumb/src/bin/ethumbd.c
  3. 3
      legacy/ethumb/src/bin/ethumbd_child.c
  4. 4
      legacy/ethumb/src/bin/ethumbd_client.c
  5. 35
      legacy/ethumb/src/lib/Makefile.am
  6. 23
      legacy/ethumb/src/lib/client/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

@ -23,6 +23,7 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -30,11 +31,11 @@
#include <unistd.h>
#include <errno.h>
#include <Ethumb.h>
#include <Eina.h>
#include <Ecore_Getopt.h>
#include <Ecore.h>
#include <E_DBus.h>
#include <Ethumb.h>
#include "ethumbd_private.h"

@ -23,15 +23,16 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
#include <string.h>
#include <errno.h>
#include <Eina.h>
#include <Ecore.h>
#include <Ethumb.h>
#include <Eina.h>
#include "ethumbd_private.h"

@ -22,14 +22,16 @@
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <Ethumb_Client.h>
#include <Eina.h>
#include <Ecore_Getopt.h>
#include <Ecore.h>
#include <Ethumb_Client.h>
const char *aspect_opt[] = { "keep", "ignore", "crop", NULL };
const char *format_opt[] = { "png", "jpg", "eet", NULL };

@ -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@

@ -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@

Loading…
Cancel
Save