summaryrefslogtreecommitdiff
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
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
-rw-r--r--configure.ac2
-rw-r--r--data/Makefile.am6
-rw-r--r--data/ethumb_client/checkme2
-rw-r--r--m4/efl.m44
-rw-r--r--pc/ethumb_client.pc.in2
-rw-r--r--src/Makefile.am3
-rw-r--r--src/Makefile_Ethumb.am50
-rw-r--r--src/Makefile_Ethumb_Client.am51
-rw-r--r--src/bin/ethumb_client/ethumbd.c (renamed from src/bin/ethumb/ethumbd.c)10
-rw-r--r--src/bin/ethumb_client/ethumbd_client.c (renamed from src/bin/ethumb/ethumbd_client.c)0
-rw-r--r--src/bin/ethumb_client/ethumbd_private.h (renamed from src/bin/ethumb/ethumbd_private.h)0
-rw-r--r--src/bin/ethumb_client/ethumbd_slave.c (renamed from src/bin/ethumb/ethumbd_slave.c)0
-rw-r--r--src/examples/ethumb_client/Makefile.am (renamed from src/examples/ethumb/Makefile.am)16
-rw-r--r--src/examples/ethumb_client/ethumb_dbus.c (renamed from src/examples/ethumb/ethumb_dbus.c)0
-rw-r--r--src/lib/ethumb_client/Ethumb_Client.h (renamed from src/lib/ethumb/client/Ethumb_Client.h)0
-rw-r--r--src/lib/ethumb_client/ethumb_client.c (renamed from src/lib/ethumb/client/ethumb_client.c)0
16 files changed, 80 insertions, 66 deletions
diff --git a/configure.ac b/configure.ac
index 43e288883c..1a8ae6c82f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3460,7 +3460,7 @@ src/examples/edbus/Makefile
3460src/examples/ephysics/Makefile 3460src/examples/ephysics/Makefile
3461src/examples/edje/Makefile 3461src/examples/edje/Makefile
3462src/examples/emotion/Makefile 3462src/examples/emotion/Makefile
3463src/examples/ethumb/Makefile 3463src/examples/ethumb_client/Makefile
3464src/lib/eina/eina_config.h 3464src/lib/eina/eina_config.h
3465src/lib/ecore_x/ecore_x_version.h 3465src/lib/ecore_x/ecore_x_version.h
3466spec/efl.spec 3466spec/efl.spec
diff --git a/data/Makefile.am b/data/Makefile.am
index e00b0512ef..03801598e6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -96,3 +96,9 @@ ethumb/frames/default.edj: ethumb/frames/default.edc
96EXTRA_DIST += \ 96EXTRA_DIST += \
97ethumb/frames/default.edc \ 97ethumb/frames/default.edc \
98ethumb/frames/border-0.jpg 98ethumb/frames/border-0.jpg
99
100########################################################################
101# Ethumb_Client
102ethumb_clientfilesdir = $(datadir)/ethumb_client
103ethumb_clientfiles_DATA = ethumb_client/checkme
104EXTRA_DIST += $(ethumb_clientfiles_DATA)
diff --git a/data/ethumb_client/checkme b/data/ethumb_client/checkme
new file mode 100644
index 0000000000..20730effa4
--- /dev/null
+++ b/data/ethumb_client/checkme
@@ -0,0 +1,2 @@
1This is just a test file used to help ethumb_client determine its
2prefix location.
diff --git a/m4/efl.m4 b/m4/efl.m4
index 65fa893c84..ec324364ac 100644
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -29,7 +29,6 @@ case "m4_defn([DOWNOTHER])" in
29 ;; 29 ;;
30 ethumb_client) 30 ethumb_client)
31 depname="ethumb_client" 31 depname="ethumb_client"
32 libdirname="ethumb/client"
33 ;; 32 ;;
34 ecore_input_evas) 33 ecore_input_evas)
35 libdirname="ecore_input" 34 libdirname="ecore_input"
@@ -204,9 +203,6 @@ case "m4_defn([DOWN])" in
204 edbus) 203 edbus)
205 libname="edbus2" 204 libname="edbus2"
206 ;; 205 ;;
207 ethumb_client)
208 libdirname="ethumb/client"
209 ;;
210 ecore_input_evas) 206 ecore_input_evas)
211 libdirname="ecore_input" 207 libdirname="ecore_input"
212 ;; 208 ;;
diff --git a/pc/ethumb_client.pc.in b/pc/ethumb_client.pc.in
index 796cae6e95..25e5e25244 100644
--- a/pc/ethumb_client.pc.in
+++ b/pc/ethumb_client.pc.in
@@ -8,4 +8,4 @@ Description: Thumbnail Client Library
8Version: @VERSION@ 8Version: @VERSION@
9Requires.private: @requirements_pc_ethumb_client@ 9Requires.private: @requirements_pc_ethumb_client@
10Libs: -L${libdir} -lethumb_client 10Libs: -L${libdir} -lethumb_client
11Cflags: -I${includedir}/ethumb-@VMAJ@ 11Cflags: -I${includedir}/ethumb-client-@VMAJ@
diff --git a/src/Makefile.am b/src/Makefile.am
index bc218e0a21..e286b92fb9 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,6 +45,7 @@ include Makefile_EPhysics.am
45include Makefile_Edje.am 45include Makefile_Edje.am
46include Makefile_Emotion.am 46include Makefile_Emotion.am
47include Makefile_Ethumb.am 47include Makefile_Ethumb.am
48include Makefile_Ethumb_Client.am
48 49
49.PHONY: benchmark examples 50.PHONY: benchmark examples
50 51
@@ -70,7 +71,7 @@ examples/edbus \
70examples/ephysics \ 71examples/ephysics \
71examples/edje \ 72examples/edje \
72examples/emotion \ 73examples/emotion \
73examples/ethumb 74examples/ethumb_client
74if ALWAYS_BUILD_EXAMPLES 75if ALWAYS_BUILD_EXAMPLES
75SUBDIRS += $(EXAMPLES_SUBDIRS) 76SUBDIRS += $(EXAMPLES_SUBDIRS)
76else 77else
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
diff --git a/src/Makefile_Ethumb_Client.am b/src/Makefile_Ethumb_Client.am
new file mode 100644
index 0000000000..e8afe297f9
--- /dev/null
+++ b/src/Makefile_Ethumb_Client.am
@@ -0,0 +1,51 @@
1### Library
2
3lib_LTLIBRARIES += \
4lib/ethumb_client/libethumb_client.la
5
6installed_ethumbclientmainheadersdir = $(includedir)/ethumb-client-@VMAJ@
7dist_installed_ethumbclientmainheaders_DATA = \
8lib/ethumb_client/Ethumb_Client.h
9
10# libethumb_client.la
11lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c
12lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
13lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
14lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
15lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
16
17
18### Binary
19
20bin_PROGRAMS += \
21bin/ethumb_client/ethumbd \
22bin/ethumb_client/ethumbd_client
23
24ethumbclientinternal_bindir=$(libdir)/ethumb_client/utils/$(MODULE_ARCH)
25ethumbclientinternal_bin_PROGRAMS = \
26bin/ethumb_client/ethumbd_slave
27
28bin_ethumb_client_ethumbd_SOURCES = \
29bin/ethumb_client/ethumbd_private.h \
30bin/ethumb_client/ethumbd.c
31bin_ethumb_client_ethumbd_CPPFLAGS = \
32-DPACKAGE_BIN_DIR=\"$(bindir)\" \
33-DPACKAGE_LIB_DIR=\"$(libdir)\" \
34-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
35-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
36@ETHUMB_CLIENT_CFLAGS@
37bin_ethumb_client_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
38bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
39
40bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
41bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
42bin_ethumb_client_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
43bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
44
45# slave does not use dbus, it's a simple ethumb application
46bin_ethumb_client_ethumbd_slave_SOURCES = \
47bin/ethumb_client/ethumbd_private.h \
48bin/ethumb_client/ethumbd_slave.c
49bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
50bin_ethumb_client_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
51bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
diff --git a/src/bin/ethumb/ethumbd.c b/src/bin/ethumb_client/ethumbd.c
index f0f0d9b44a..a68aed618c 100644
--- a/src/bin/ethumb/ethumbd.c
+++ b/src/bin/ethumb_client/ethumbd.c
@@ -35,6 +35,7 @@
35#include <Ecore.h> 35#include <Ecore.h>
36#include <EDBus.h> 36#include <EDBus.h>
37#include <Ethumb.h> 37#include <Ethumb.h>
38#include <Ethumb_Client.h>
38 39
39#include "ethumbd_private.h" 40#include "ethumbd_private.h"
40 41
@@ -1665,7 +1666,8 @@ _ethumbd_slave_spawn(Ethumbd_Slave *slave, Ethumbd *ed)
1665 slave->bufcmd = NULL; 1666 slave->bufcmd = NULL;
1666 slave->scmd = 0; 1667 slave->scmd = 0;
1667 1668
1668 snprintf(buf, sizeof(buf), "%s/ethumb/utils/"MODULE_ARCH"/ethumbd_slave", 1669 snprintf(buf, sizeof(buf),
1670 "%s/ethumb_client/utils/"MODULE_ARCH"/ethumbd_slave",
1669 eina_prefix_lib_get(_pfx)); 1671 eina_prefix_lib_get(_pfx));
1670 1672
1671 slave->exe = ecore_exe_pipe_run(buf, 1673 slave->exe = ecore_exe_pipe_run(buf,
@@ -1706,13 +1708,13 @@ main(int argc, char *argv[])
1706 } 1708 }
1707 } 1709 }
1708 1710
1709 _pfx = eina_prefix_new(argv[0], ethumb_init, 1711 _pfx = eina_prefix_new(argv[0], ethumb_client_init,
1710 "ETHUMB", "ethumb", "checkme", 1712 "ETHUMB_CLIENT", "ethumb_client", "checkme",
1711 PACKAGE_BIN_DIR, PACKAGE_LIB_DIR, 1713 PACKAGE_BIN_DIR, PACKAGE_LIB_DIR,
1712 PACKAGE_DATA_DIR, PACKAGE_DATA_DIR); 1714 PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
1713 if (!_pfx) 1715 if (!_pfx)
1714 { 1716 {
1715 ERR("Could not get ethumb installation prefix."); 1717 ERR("Could not get ethumb_client installation prefix.");
1716 exit_value = -7; 1718 exit_value = -7;
1717 goto finish; 1719 goto finish;
1718 } 1720 }
diff --git a/src/bin/ethumb/ethumbd_client.c b/src/bin/ethumb_client/ethumbd_client.c
index e81fc2e9a7..e81fc2e9a7 100644
--- a/src/bin/ethumb/ethumbd_client.c
+++ b/src/bin/ethumb_client/ethumbd_client.c
diff --git a/src/bin/ethumb/ethumbd_private.h b/src/bin/ethumb_client/ethumbd_private.h
index 688eaddd6b..688eaddd6b 100644
--- a/src/bin/ethumb/ethumbd_private.h
+++ b/src/bin/ethumb_client/ethumbd_private.h
diff --git a/src/bin/ethumb/ethumbd_slave.c b/src/bin/ethumb_client/ethumbd_slave.c
index b1d319a305..b1d319a305 100644
--- a/src/bin/ethumb/ethumbd_slave.c
+++ b/src/bin/ethumb_client/ethumbd_slave.c
diff --git a/src/examples/ethumb/Makefile.am b/src/examples/ethumb_client/Makefile.am
index e317d39caa..a7f81e113e 100644
--- a/src/examples/ethumb/Makefile.am
+++ b/src/examples/ethumb_client/Makefile.am
@@ -17,9 +17,9 @@ AM_CPPFLAGS = \
17-I$(top_builddir)/src/lib/edje \ 17-I$(top_builddir)/src/lib/edje \
18-I$(top_srcdir)/src/lib/ethumb \ 18-I$(top_srcdir)/src/lib/ethumb \
19-I$(top_builddir)/src/lib/ethumb \ 19-I$(top_builddir)/src/lib/ethumb \
20-I$(top_srcdir)/src/lib/ethumb/client \ 20-I$(top_srcdir)/src/lib/ethumb_client \
21-I$(top_builddir)/src/lib/ethumb/client \ 21-I$(top_builddir)/src/lib/ethumb_client \
22@ETHUMB_CFLAGS@ 22@ETHUMB_CLIENT_CFLAGS@
23 23
24LDADD = \ 24LDADD = \
25$(top_builddir)/src/lib/eina/libeina.la \ 25$(top_builddir)/src/lib/eina/libeina.la \
@@ -30,8 +30,8 @@ $(top_builddir)/src/lib/ecore_file/libecore_file.la \
30$(top_builddir)/src/lib/evas/libevas.la \ 30$(top_builddir)/src/lib/evas/libevas.la \
31$(top_builddir)/src/lib/edje/libedje.la \ 31$(top_builddir)/src/lib/edje/libedje.la \
32$(top_builddir)/src/lib/ethumb/libethumb.la \ 32$(top_builddir)/src/lib/ethumb/libethumb.la \
33$(top_builddir)/src/lib/ethumb/client/libethumb_client.la \ 33$(top_builddir)/src/lib/ethumb_client/libethumb_client.la \
34@ETHUMB_LDFLAGS@ 34@ETHUMB_CLIENT_LDFLAGS@
35 35
36EXTRA_PROGRAMS = \ 36EXTRA_PROGRAMS = \
37ethumb_dbus 37ethumb_dbus
@@ -45,12 +45,12 @@ clean-local:
45 rm -f $(EXTRA_PROGRAMS) 45 rm -f $(EXTRA_PROGRAMS)
46 46
47install-examples: 47install-examples:
48 mkdir -p $(datadir)/ethumb/examples 48 mkdir -p $(datadir)/ethumb_client/examples
49 $(install_sh_DATA) -c $(SRCS) $(datadir)/ethumb/examples 49 $(install_sh_DATA) -c $(SRCS) $(datadir)/ethumb_client/examples
50 50
51uninstall-local: 51uninstall-local:
52 for f in $(SRCS); do \ 52 for f in $(SRCS); do \
53 rm -f $(datadir)/ethumb/examples/$$f ; \ 53 rm -f $(datadir)/ethumb_client/examples/$$f ; \
54 done 54 done
55 55
56if ALWAYS_BUILD_EXAMPLES 56if ALWAYS_BUILD_EXAMPLES
diff --git a/src/examples/ethumb/ethumb_dbus.c b/src/examples/ethumb_client/ethumb_dbus.c
index 2f613e93ea..2f613e93ea 100644
--- a/src/examples/ethumb/ethumb_dbus.c
+++ b/src/examples/ethumb_client/ethumb_dbus.c
diff --git a/src/lib/ethumb/client/Ethumb_Client.h b/src/lib/ethumb_client/Ethumb_Client.h
index 3c3f95d87e..3c3f95d87e 100644
--- a/src/lib/ethumb/client/Ethumb_Client.h
+++ b/src/lib/ethumb_client/Ethumb_Client.h
diff --git a/src/lib/ethumb/client/ethumb_client.c b/src/lib/ethumb_client/ethumb_client.c
index 9c2530323c..9c2530323c 100644
--- a/src/lib/ethumb/client/ethumb_client.c
+++ b/src/lib/ethumb_client/ethumb_client.c