summaryrefslogtreecommitdiff
path: root/src/Makefile_Ethumb.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 18:10:58 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-15 18:10:58 +0000
commitd97c63e4c69d0a8c3cb29b22927b5b53c7bf46c4 (patch)
tree4309480b1cb48058bdac139f6eb14cbeaf515fd6 /src/Makefile_Ethumb.am
parent028e7e9ed2ca4aad0dd04493019d495f68fa6a31 (diff)
fix directory structure: move ethumd_client out of ethumb.
it's another library, do not mix stuff as it used to be. SVN revision: 82835
Diffstat (limited to 'src/Makefile_Ethumb.am')
-rw-r--r--src/Makefile_Ethumb.am50
1 files changed, 3 insertions, 47 deletions
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index b7a8552fa6..f81d858901 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -1,15 +1,12 @@
1### Library 1### Library
2 2
3lib_LTLIBRARIES += \ 3lib_LTLIBRARIES += \
4lib/ethumb/libethumb.la \ 4lib/ethumb/libethumb.la
5lib/ethumb/client/libethumb_client.la
6 5
7installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@ 6installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
8dist_installed_ethumbmainheaders_DATA = \ 7dist_installed_ethumbmainheaders_DATA = \
9lib/ethumb/Ethumb.h \ 8lib/ethumb/Ethumb.h
10lib/ethumb/client/Ethumb_Client.h
11 9
12# libethumb.la
13lib_ethumb_libethumb_la_SOURCES = \ 10lib_ethumb_libethumb_la_SOURCES = \
14lib/ethumb/Ethumb_Plugin.h \ 11lib/ethumb/Ethumb_Plugin.h \
15lib/ethumb/ethumb_private.h \ 12lib/ethumb/ethumb_private.h \
@@ -27,14 +24,6 @@ lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
27lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@ 24lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
28lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 25lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
29 26
30# TODO: fix directory!
31# libethumb_client.la
32lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb/client/ethumb_client.c
33lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
34lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
35lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
36lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
37
38## Modules 27## Modules
39 28
40# Emotion 29# Emotion
@@ -72,42 +61,9 @@ modules/ethumb/emotion/placeholder.png
72### Binary 61### Binary
73 62
74bin_PROGRAMS += \ 63bin_PROGRAMS += \
75bin/ethumb/ethumb \ 64bin/ethumb/ethumb
76bin/ethumb/ethumbd \
77bin/ethumb/ethumbd_client
78
79ethumbinternal_bindir=$(libdir)/ethumb/utils/$(MODULE_ARCH)
80ethumbinternal_bin_PROGRAMS = \
81bin/ethumb/ethumbd_slave
82 65
83bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c 66bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
84bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@ 67bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
85bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@ 68bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
86bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@ 69bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
87
88# TODO: review why ethumd (master) links to libethumb! shouldn't
89bin_ethumb_ethumbd_SOURCES = \
90bin/ethumb/ethumbd_private.h \
91bin/ethumb/ethumbd.c
92bin_ethumb_ethumbd_CPPFLAGS = \
93-DPACKAGE_BIN_DIR=\"$(bindir)\" \
94-DPACKAGE_LIB_DIR=\"$(libdir)\" \
95-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
96-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
97@ETHUMB_CLIENT_CFLAGS@
98bin_ethumb_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
99bin_ethumb_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
100
101bin_ethumb_ethumbd_client_SOURCES = bin/ethumb/ethumbd_client.c
102bin_ethumb_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
103bin_ethumb_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
104bin_ethumb_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
105
106# slave does not use dbus, it's a simple ethumb application
107bin_ethumb_ethumbd_slave_SOURCES = \
108bin/ethumb/ethumbd_private.h \
109bin/ethumb/ethumbd_slave.c
110bin_ethumb_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
111bin_ethumb_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
112bin_ethumb_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
113