Make ecore depend on eina. No change in the code yet, so just fix your build system and no bug must show up.

SVN revision: 36622
2008-10-13 15:59:19 +00:00 · 2008-10-13 15:59:19 +00:00 · 3d49d88a32
parent ad1525e5f9
commit 3d49d88a32
21 changed files with 74 additions and 39 deletions
--- a/legacy/ecore/configure.ac
+++ b/legacy/ecore/configure.ac
@ -62,6 +62,8 @@ dnl The first call to PKG_CHECK_MODULES is done conditionally,
 dnl so we should include this here:
 PKG_PROG_PKG_CONFIG

+PKG_CHECK_MODULES([EINA], [eina-0])
+
 dnl add windows requirements
 WIN32_CFLAGS=""
 WIN32_LIBS=""
--- a/legacy/ecore/src/lib/ecore/Makefile.am
+++ b/legacy/ecore/src/lib/ecore/Makefile.am
@ -1,6 +1,6 @@
 MAINTAINERCLEANFILES = Makefile.in

-AM_CFLAGS = @WIN32_CFLAGS@
+AM_CFLAGS = @WIN32_CFLAGS@ @EINA_CFLAGS@

 lib_LTLIBRARIES = libecore.la
 include_HEADERS = \
@ -34,5 +34,5 @@ ecore_value.c \
 ecore_poll.c \
 ecore_private.h

-libecore_la_LIBADD = @dlopen_libs@ @EVIL_LIBS@ @WIN32_LIBS@ -lm
+libecore_la_LIBADD = @dlopen_libs@ @EVIL_LIBS@ @EINA_LIBS@ @WIN32_LIBS@ -lm
 libecore_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
--- a/legacy/ecore/src/lib/ecore_con/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_con/Makefile.am
@ -5,7 +5,7 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_con \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_con \
-@SSL_CFLAGS@ @CURL_CFLAGS@
+@SSL_CFLAGS@ @CURL_CFLAGS@ @EINA_CFLAGS@

 if BUILD_ECORE_CON

@ -22,7 +22,7 @@ ecore_con_private.h

 libecore_con_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-@SSL_LIBS@ @CURL_LIBS@
+@SSL_LIBS@ @CURL_LIBS@ @EINA_LIBS@

 libecore_con_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_config/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_config/Makefile.am
@ -10,7 +10,7 @@ AM_CPPFLAGS = \
 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-@EVAS_CFLAGS@ @EET_CFLAGS@
+@EVAS_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@

 CLEANFILES = $(DB)

@ -47,6 +47,7 @@ ecore_config_private.h
 libecore_config_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 $(top_builddir)/src/lib/ecore_ipc/libecore_ipc.la \
+@EINA_LIBS@ \
@EET_LIBS@ \
@EVAS_LIBS@

@ -67,6 +68,7 @@ ecore_config_private.h
 libecore_config_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
@EET_LIBS@ \
+@EINA_LIBS@ \
@EVAS_LIBS@

 libecore_config_la_DEPENDENCIES = \
--- a/legacy/ecore/src/lib/ecore_desktop/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_desktop/Makefile.am
@ -6,7 +6,8 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore_desktop \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_file \
-I$(top_srcdir)/src/lib/ecore_desktop
+-I$(top_srcdir)/src/lib/ecore_desktop \
+@EINA_CFLAGS@

 if BUILD_ECORE_DESKTOP

@ -25,7 +26,8 @@ ecore_desktop_private.h

 libecore_desktop_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_file/libecore_file.la
+$(top_builddir)/src/lib/ecore_file/libecore_file.la \
+@EINA_LIBS@

 libecore_desktop_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_directfb/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_directfb/Makefile.am
@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
-@DIRECTFB_CFLAGS@
+@DIRECTFB_CFLAGS@ @EINA_CFLAGS@

 if BUILD_ECORE_DIRECTFB

@ -18,7 +18,8 @@ ecore_directfb_private.h

 libecore_directfb_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-@DIRECTFB_LIBS@
+@DIRECTFB_LIBS@ \
+@EINA_LIBS@

 libecore_directfb_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_evas/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_evas/Makefile.am
@ -69,7 +69,8 @@ $(ECORE_SDL_INC) \
 $(ECORE_QUARTZ_INC) \
 $(ECORE_WINCE_INC) \
@EVAS_CFLAGS@ \
-@XCB_CFLAGS@
+@XCB_CFLAGS@ \
+@EINA_CFLAGS@

 AM_CFLAGS = @WIN32_CFLAGS@

@ -103,7 +104,8 @@ $(top_builddir)/src/lib/ecore/libecore.la \
@XCB_LIBS@ \
@SDL_LIBS@ \
@QUARTZ_LIBS@ \
-@EVIL_LIBS@
+@EVIL_LIBS@ \
+@EINA_LIBS@

 libecore_evas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_fb/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_fb/Makefile.am
@ -2,7 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in

 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
+-I$(top_builddir)/src/lib/ecore \
+@EINA_CFLAGS@

 if BUILD_ECORE_FB

@ -22,7 +23,8 @@ ecore_fb_private.h

 libecore_fb_la_LIBADD = \
@tslib_libs@ \
-$(top_builddir)/src/lib/ecore/libecore.la
+$(top_builddir)/src/lib/ecore/libecore.la \
+@EINA_LIBS@

 libecore_fb_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_file/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_file/Makefile.am
@ -5,7 +5,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_con \
 -I$(top_builddir)/src/lib/ecore \
@CURL_CFLAGS@ \
-@EVIL_CFLAGS@
+@EVIL_CFLAGS@ \
+@EINA_CFLAGS@

 AM_CFLAGS = @WIN32_CFLAGS@

@ -30,7 +31,8 @@ ecore_file_download.c
 libecore_file_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 $(lib_ecore_con_la) \
-@EVIL_LIBS@
+@EVIL_LIBS@ \
+@EINA_LIBS@

 libecore_file_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_imf/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_imf/Makefile.am
@ -3,7 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 if BUILD_ECORE_IMF
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
-DPACKAGE_LIB_DIR=\"$(libdir)\"
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+@EINA_CFLAGS@

 AM_CFLAGS = @WIN32_CFLAGS@

@ -18,7 +19,8 @@ ecore_imf_module.c \
 ecore_imf_private.h

 libecore_imf_la_LIBADD = \
-$(top_builddir)/src/lib/ecore/libecore.la
+$(top_builddir)/src/lib/ecore/libecore.la \
+@EINA_LIBS@

 libecore_imf_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@
 endif
--- a/legacy/ecore/src/lib/ecore_imf_evas/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_imf_evas/Makefile.am
@ -4,7 +4,8 @@ if BUILD_ECORE_IMF_EVAS
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_imf \
-@EVAS_CFLAGS@
+@EVAS_CFLAGS@ \
+@EINA_CFLAGS@

 lib_LTLIBRARIES = libecore_imf_evas.la
 include_HEADERS = \
@ -15,7 +16,8 @@ ecore_imf_evas.c

 libecore_imf_evas_la_LIBADD = \
 $(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
-@EVAS_LIBS@
+@EVAS_LIBS@ \
+@EINA_LIBS@

 libecore_imf_evas_la_DEPENDENCIES = \
 $(top_builddir)/src/lib/ecore_imf/libecore_imf.la
--- a/legacy/ecore/src/lib/ecore_ipc/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_ipc/Makefile.am
@ -7,7 +7,7 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_con \
 -I$(top_srcdir)/src/lib/ecore_ipc \
-@SSL_CFLAGS@
+@SSL_CFLAGS@ @EINA_CFLAGS@

 if BUILD_ECORE_IPC

@ -22,7 +22,8 @@ ecore_ipc_private.h
 libecore_ipc_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
 $(top_builddir)/src/lib/ecore_con/libecore_con.la \
-@SSL_LIBS@
+@SSL_LIBS@ \
+@EINA_LIBS@

 libecore_ipc_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_job/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_job/Makefile.am
@ -2,7 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in

 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
+-I$(top_builddir)/src/lib/ecore \
+@EINA_CFLAGS@

 AM_CFLAGS = @WIN32_CFLAGS@

@ -17,7 +18,8 @@ ecore_job.c \
 ecore_job_private.h

 libecore_job_la_LIBADD = \
-$(top_builddir)/src/lib/ecore/libecore.la
+$(top_builddir)/src/lib/ecore/libecore.la \
+@EINA_LIBS@

 libecore_job_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_quartz/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_quartz/Makefile.am
@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
-@QUARTZ_CFLAGS@
+@QUARTZ_CFLAGS@ @EINA_CFLAGS@

 if BUILD_ECORE_QUARTZ

@ -21,7 +21,8 @@ Ecore_Quartz.h

 libecore_quartz_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-@QUARTZ_LIBS@
+@QUARTZ_LIBS@ \
+@EINA_LIBS@

 libecore_quartz_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_sdl/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_sdl/Makefile.am
@ -3,7 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
-@SDL_CFLAGS@
+@SDL_CFLAGS@ \
+@EINA_CFLAGS@

 if BUILD_ECORE_SDL

@ -17,7 +18,8 @@ Ecore_Sdl_Keys.h

 libecore_sdl_la_LIBADD = \
 $(top_builddir)/src/lib/ecore/libecore.la \
-@SDL_LIBS@
+@SDL_LIBS@ \
+@EINA_LIBS@

 libecore_sdl_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_txt/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_txt/Makefile.am
@ -3,7 +3,8 @@ MAINTAINERCLEANFILES = Makefile.in
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore \
-@iconv_cflags@
+@iconv_cflags@ \
+@EINA_CFLAGS@

 if BUILD_ECORE_TXT

@ -16,7 +17,8 @@ libecore_txt_la_SOURCES = \
 ecore_txt.c \
 ecore_txt_private.h

-libecore_txt_la_LIBADD = @iconv_libs@
+libecore_txt_la_LIBADD = @iconv_libs@ \
+@EINA_LIBS@

 libecore_txt_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_win32/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_win32/Makefile.am
@ -2,7 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in

 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
+-I$(top_builddir)/src/lib/ecore \
+@EINA_CFLAGS@


 if BUILD_ECORE_WIN32
@ -21,7 +22,8 @@ ecore_win32_window.c
 libecore_win32_la_LIBADD = \
@ecore_win32_libs@ \
@WIN32_LIBS@ \
-$(top_builddir)/src/lib/ecore/libecore.la
+$(top_builddir)/src/lib/ecore/libecore.la \
+@EINA_LIBS@

 libecore_win32_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_wince/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_wince/Makefile.am
@ -2,7 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in

 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore
+-I$(top_builddir)/src/lib/ecore \
+@EINA_CFLAGS@

 AM_CFLAGS = @WIN32_CFLAGS@

@ -21,7 +22,8 @@ ecore_wince_window.c

 libecore_wince_la_LIBADD = \
@WIN32_LIBS@ \
-$(top_builddir)/src/lib/ecore/libecore.la
+$(top_builddir)/src/lib/ecore/libecore.la \
+@EINA_LIBS@

 libecore_wince_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_x/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/Makefile.am
@ -14,13 +14,15 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_txt \
 -I$(top_builddir)/src/lib/ecore \
-I$(top_builddir)/src/lib/ecore_txt
+-I$(top_builddir)/src/lib/ecore_txt \
+@EINA_CFLAGS@

 lib_LTLIBRARIES = libecore_x.la

 libecore_x_la_SOURCES =

-libecore_x_la_LIBADD = $(DEP)
+libecore_x_la_LIBADD = $(DEP) \
+@EINA_LIBS@

 libecore_x_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_x/xcb/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/xcb/Makefile.am
@ -22,7 +22,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_x \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_txt \
-I$(top_builddir)/src/lib/ecore_x
+-I$(top_builddir)/src/lib/ecore_x \
+@EINA_CFLAGS@

 noinst_LTLIBRARIES      = libecore_x_xcb.la

@ -69,7 +70,8 @@ libecore_x_xcb_la_LIBADD = \
@XCB_XTEST_LIBS@ \
@XCB_LIBS@ \
 $(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
+$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
+@EINA_LIBS@

 libecore_x_xcb_la_LDFLAGS = -version-info @version_info@

--- a/legacy/ecore/src/lib/ecore_x/xlib/Makefile.am
+++ b/legacy/ecore/src/lib/ecore_x/xlib/Makefile.am
@ -21,7 +21,8 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_x \
 -I$(top_builddir)/src/lib/ecore \
 -I$(top_builddir)/src/lib/ecore_txt \
-I$(top_builddir)/src/lib/ecore_x
+-I$(top_builddir)/src/lib/ecore_x \
+@EINA_CFLAGS@

 noinst_LTLIBRARIES      = libecore_x_xlib.la

@ -67,7 +68,8 @@ libecore_x_xlib_la_LIBADD = \
@XTEST_LIBS@ \
@x_libs@ \
 $(top_builddir)/src/lib/ecore/libecore.la \
-$(top_builddir)/src/lib/ecore_txt/libecore_txt.la
+$(top_builddir)/src/lib/ecore_txt/libecore_txt.la \
+@EINA_LIBS@

 libecore_x_xlib_la_LDFLAGS = -version-info @version_info@