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
devs/devilhorns/wayland_egl
Gustavo Sverzut Barbieri 10 years ago
parent 028e7e9ed2
commit d97c63e4c6
  1. 2
      configure.ac
  2. 6
      data/Makefile.am
  3. 2
      data/ethumb_client/checkme
  4. 4
      m4/efl.m4
  5. 2
      pc/ethumb_client.pc.in
  6. 3
      src/Makefile.am
  7. 50
      src/Makefile_Ethumb.am
  8. 51
      src/Makefile_Ethumb_Client.am
  9. 10
      src/bin/ethumb_client/ethumbd.c
  10. 0
      src/bin/ethumb_client/ethumbd_client.c
  11. 0
      src/bin/ethumb_client/ethumbd_private.h
  12. 0
      src/bin/ethumb_client/ethumbd_slave.c
  13. 16
      src/examples/ethumb_client/Makefile.am
  14. 0
      src/examples/ethumb_client/ethumb_dbus.c
  15. 0
      src/lib/ethumb_client/Ethumb_Client.h
  16. 0
      src/lib/ethumb_client/ethumb_client.c

@ -3460,7 +3460,7 @@ src/examples/edbus/Makefile
src/examples/ephysics/Makefile
src/examples/edje/Makefile
src/examples/emotion/Makefile
src/examples/ethumb/Makefile
src/examples/ethumb_client/Makefile
src/lib/eina/eina_config.h
src/lib/ecore_x/ecore_x_version.h
spec/efl.spec

@ -96,3 +96,9 @@ ethumb/frames/default.edj: ethumb/frames/default.edc
EXTRA_DIST += \
ethumb/frames/default.edc \
ethumb/frames/border-0.jpg
########################################################################
# Ethumb_Client
ethumb_clientfilesdir = $(datadir)/ethumb_client
ethumb_clientfiles_DATA = ethumb_client/checkme
EXTRA_DIST += $(ethumb_clientfiles_DATA)

@ -0,0 +1,2 @@
This is just a test file used to help ethumb_client determine its
prefix location.

@ -29,7 +29,6 @@ case "m4_defn([DOWNOTHER])" in
;;
ethumb_client)
depname="ethumb_client"
libdirname="ethumb/client"
;;
ecore_input_evas)
libdirname="ecore_input"
@ -204,9 +203,6 @@ case "m4_defn([DOWN])" in
edbus)
libname="edbus2"
;;
ethumb_client)
libdirname="ethumb/client"
;;
ecore_input_evas)
libdirname="ecore_input"
;;

@ -8,4 +8,4 @@ Description: Thumbnail Client Library
Version: @VERSION@
Requires.private: @requirements_pc_ethumb_client@
Libs: -L${libdir} -lethumb_client
Cflags: -I${includedir}/ethumb-@VMAJ@
Cflags: -I${includedir}/ethumb-client-@VMAJ@

@ -45,6 +45,7 @@ include Makefile_EPhysics.am
include Makefile_Edje.am
include Makefile_Emotion.am
include Makefile_Ethumb.am
include Makefile_Ethumb_Client.am
.PHONY: benchmark examples
@ -70,7 +71,7 @@ examples/edbus \
examples/ephysics \
examples/edje \
examples/emotion \
examples/ethumb
examples/ethumb_client
if ALWAYS_BUILD_EXAMPLES
SUBDIRS += $(EXAMPLES_SUBDIRS)
else

@ -1,15 +1,12 @@
### Library
lib_LTLIBRARIES += \
lib/ethumb/libethumb.la \
lib/ethumb/client/libethumb_client.la
lib/ethumb/libethumb.la
installed_ethumbmainheadersdir = $(includedir)/ethumb-@VMAJ@
dist_installed_ethumbmainheaders_DATA = \
lib/ethumb/Ethumb.h \
lib/ethumb/client/Ethumb_Client.h
lib/ethumb/Ethumb.h
# libethumb.la
lib_ethumb_libethumb_la_SOURCES = \
lib/ethumb/Ethumb_Plugin.h \
lib/ethumb/ethumb_private.h \
@ -27,14 +24,6 @@ lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
lib_ethumb_libethumb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
# TODO: fix directory!
# libethumb_client.la
lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb/client/ethumb_client.c
lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
## Modules
# Emotion
@ -72,42 +61,9 @@ modules/ethumb/emotion/placeholder.png
### Binary
bin_PROGRAMS += \
bin/ethumb/ethumb \
bin/ethumb/ethumbd \
bin/ethumb/ethumbd_client
ethumbinternal_bindir=$(libdir)/ethumb/utils/$(MODULE_ARCH)
ethumbinternal_bin_PROGRAMS = \
bin/ethumb/ethumbd_slave
bin/ethumb/ethumb
bin_ethumb_ethumb_SOURCES = bin/ethumb/ethumb.c
bin_ethumb_ethumb_CPPFLAGS = @ETHUMB_CFLAGS@
bin_ethumb_ethumb_LDADD = @USE_ETHUMB_LIBS@
bin_ethumb_ethumb_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@
# TODO: review why ethumd (master) links to libethumb! shouldn't
bin_ethumb_ethumbd_SOURCES = \
bin/ethumb/ethumbd_private.h \
bin/ethumb/ethumbd.c
bin_ethumb_ethumbd_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@ETHUMB_CLIENT_CFLAGS@
bin_ethumb_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
bin_ethumb_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
bin_ethumb_ethumbd_client_SOURCES = bin/ethumb/ethumbd_client.c
bin_ethumb_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
bin_ethumb_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
bin_ethumb_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
# slave does not use dbus, it's a simple ethumb application
bin_ethumb_ethumbd_slave_SOURCES = \
bin/ethumb/ethumbd_private.h \
bin/ethumb/ethumbd_slave.c
bin_ethumb_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
bin_ethumb_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
bin_ethumb_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@

@ -0,0 +1,51 @@
### Library
lib_LTLIBRARIES += \
lib/ethumb_client/libethumb_client.la
installed_ethumbclientmainheadersdir = $(includedir)/ethumb-client-@VMAJ@
dist_installed_ethumbclientmainheaders_DATA = \
lib/ethumb_client/Ethumb_Client.h
# libethumb_client.la
lib_ethumb_client_libethumb_client_la_SOURCES = lib/ethumb_client/ethumb_client.c
lib_ethumb_client_libethumb_client_la_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
lib_ethumb_client_libethumb_client_la_LIBADD = @ETHUMB_CLIENT_LIBS@
lib_ethumb_client_libethumb_client_la_DEPENDENCIES = @ETHUMB_CLIENT_INTERNAL_LIBS@
lib_ethumb_client_libethumb_client_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
### Binary
bin_PROGRAMS += \
bin/ethumb_client/ethumbd \
bin/ethumb_client/ethumbd_client
ethumbclientinternal_bindir=$(libdir)/ethumb_client/utils/$(MODULE_ARCH)
ethumbclientinternal_bin_PROGRAMS = \
bin/ethumb_client/ethumbd_slave
bin_ethumb_client_ethumbd_SOURCES = \
bin/ethumb_client/ethumbd_private.h \
bin/ethumb_client/ethumbd.c
bin_ethumb_client_ethumbd_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
@ETHUMB_CLIENT_CFLAGS@
bin_ethumb_client_ethumbd_LDADD = @USE_ETHUMB_CLIENT_LIBS@
bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
bin_ethumb_client_ethumbd_client_SOURCES = bin/ethumb_client/ethumbd_client.c
bin_ethumb_client_ethumbd_client_CPPFLAGS = @ETHUMB_CLIENT_CFLAGS@
bin_ethumb_client_ethumbd_client_LDADD = @USE_ETHUMB_CLIENT_LIBS@
bin_ethumb_client_ethumbd_client_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@
# slave does not use dbus, it's a simple ethumb application
bin_ethumb_client_ethumbd_slave_SOURCES = \
bin/ethumb_client/ethumbd_private.h \
bin/ethumb_client/ethumbd_slave.c
bin_ethumb_client_ethumbd_slave_CPPFLAGS = @ETHUMB_CFLAGS@
bin_ethumb_client_ethumbd_slave_LDADD = @USE_ETHUMB_LIBS@
bin_ethumb_client_ethumbd_slave_DEPENDENCIES = @USE_ETHUMB_INTERNAL_LIBS@

@ -35,6 +35,7 @@
#include <Ecore.h>
#include <EDBus.h>
#include <Ethumb.h>
#include <Ethumb_Client.h>
#include "ethumbd_private.h"
@ -1665,7 +1666,8 @@ _ethumbd_slave_spawn(Ethumbd_Slave *slave, Ethumbd *ed)
slave->bufcmd = NULL;
slave->scmd = 0;
snprintf(buf, sizeof(buf), "%s/ethumb/utils/"MODULE_ARCH"/ethumbd_slave",
snprintf(buf, sizeof(buf),
"%s/ethumb_client/utils/"MODULE_ARCH"/ethumbd_slave",
eina_prefix_lib_get(_pfx));
slave->exe = ecore_exe_pipe_run(buf,
@ -1706,13 +1708,13 @@ main(int argc, char *argv[])
}
}
_pfx = eina_prefix_new(argv[0], ethumb_init,
"ETHUMB", "ethumb", "checkme",
_pfx = eina_prefix_new(argv[0], ethumb_client_init,
"ETHUMB_CLIENT", "ethumb_client", "checkme",
PACKAGE_BIN_DIR, PACKAGE_LIB_DIR,
PACKAGE_DATA_DIR, PACKAGE_DATA_DIR);
if (!_pfx)
{
ERR("Could not get ethumb installation prefix.");
ERR("Could not get ethumb_client installation prefix.");
exit_value = -7;
goto finish;
}

@ -17,9 +17,9 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/edje \
-I$(top_srcdir)/src/lib/ethumb \
-I$(top_builddir)/src/lib/ethumb \
-I$(top_srcdir)/src/lib/ethumb/client \
-I$(top_builddir)/src/lib/ethumb/client \
@ETHUMB_CFLAGS@
-I$(top_srcdir)/src/lib/ethumb_client \
-I$(top_builddir)/src/lib/ethumb_client \
@ETHUMB_CLIENT_CFLAGS@
LDADD = \
$(top_builddir)/src/lib/eina/libeina.la \
@ -30,8 +30,8 @@ $(top_builddir)/src/lib/ecore_file/libecore_file.la \
$(top_builddir)/src/lib/evas/libevas.la \
$(top_builddir)/src/lib/edje/libedje.la \
$(top_builddir)/src/lib/ethumb/libethumb.la \
$(top_builddir)/src/lib/ethumb/client/libethumb_client.la \
@ETHUMB_LDFLAGS@
$(top_builddir)/src/lib/ethumb_client/libethumb_client.la \
@ETHUMB_CLIENT_LDFLAGS@
EXTRA_PROGRAMS = \
ethumb_dbus
@ -45,12 +45,12 @@ clean-local:
rm -f $(EXTRA_PROGRAMS)
install-examples:
mkdir -p $(datadir)/ethumb/examples
$(install_sh_DATA) -c $(SRCS) $(datadir)/ethumb/examples
mkdir -p $(datadir)/ethumb_client/examples
$(install_sh_DATA) -c $(SRCS) $(datadir)/ethumb_client/examples
uninstall-local:
for f in $(SRCS); do \
rm -f $(datadir)/ethumb/examples/$$f ; \
rm -f $(datadir)/ethumb_client/examples/$$f ; \
done
if ALWAYS_BUILD_EXAMPLES
Loading…
Cancel
Save