From edcdb94a30e9f053f3ae3cd0b5bbb0a2d280acb1 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Tue, 5 Apr 2016 20:10:17 +0900 Subject: [PATCH] Makefile: Add efl as internal dependency for ecore This commit broke the build: - 7c8b2da2863bb734236f5758288a00eb0d8c047a Each and every single library including ecore now must also include efl as well (for Efl.h). --- configure.ac | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/configure.ac b/configure.ac index 9d305f1c6d..3ad927387f 100644 --- a/configure.ac +++ b/configure.ac @@ -1206,6 +1206,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Js], [test "x${have_js}" = "xyes"]) EFL_INTERNAL_DEPEND_PKG([ECORE_JS], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_JS], [ecore_file]) +EFL_INTERNAL_DEPEND_PKG([ECORE_JS], [efl]) EFL_ADD_CFLAGS([ECORE_JS], [${EFL_PTHREAD_CFLAGS}]) EFL_EVAL_PKGS([ECORE_JS]) @@ -2833,6 +2834,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eina_Cxx]) EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_CXX], [Efl]) EFL_EVAL_PKGS([ECORE_CXX]) @@ -2877,6 +2879,7 @@ if test "$build_crypto" != "none" ; then EFL_CRYPTO_DEPEND([ECORE_CON]) fi EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eet]) EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_CON], [ecore]) @@ -2963,6 +2966,7 @@ EFL_PLATFORM_DEPEND([ECORE_IPC], [evil]) EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore-con]) EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_IPC], [eina]) EFL_ADD_LIBS([ECORE_IPC], [-lm]) @@ -3003,6 +3007,7 @@ EFL_PLATFORM_DEPEND([ECORE_FILE], [escape]) EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore-con]) EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_FILE], [eina]) ### Checks for header files @@ -3036,6 +3041,7 @@ EFL_PLATFORM_DEPEND([ECORE_INPUT], [evil]) ### Checks for libraries EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_INPUT], [eina]) ### Checks for header files @@ -3104,6 +3110,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Cocoa], [test "${want_cocoa}" = "yes"]) EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [evas]) EFL_INTERNAL_DEPEND_PKG([ECORE_COCOA], [emile]) @@ -3148,6 +3155,7 @@ AC_ARG_ENABLE([tslib], EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_FB], [eina]) EFL_OPTIONAL_DEPEND_PKG([ECORE_FB], [${want_tslib}], [TSLIB], [tslib]) @@ -3193,6 +3201,7 @@ EFL_PLATFORM_DEPEND([ECORE_PSL1GHT], [escape]) EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_PSL1GHT], [eina]) EFL_ADD_LIBS([ECORE_PSL1GHT], [-lio -lsysutil -lgem -lcamera -lspurs]) @@ -3227,6 +3236,7 @@ EFL_PLATFORM_DEPEND([ECORE_SDL], [all]) EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_SDL], [eina]) EFL_DEPEND_PKG([ECORE_SDL], [SDL], [sdl2 >= 2.0.0]) @@ -3266,6 +3276,7 @@ fi EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_WAYLAND], [eina]) EFL_DEPEND_PKG([ECORE_WAYLAND], [WAYLAND], @@ -3305,6 +3316,7 @@ fi EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_WL2], [eina]) EFL_DEPEND_PKG([ECORE_WL2], [WAYLAND], @@ -3391,6 +3403,7 @@ AC_ARG_WITH([eject], EFL_INTERNAL_DEPEND_PKG([EEZE], [eina]) EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore]) EFL_INTERNAL_DEPEND_PKG([EEZE], [eo]) +EFL_INTERNAL_DEPEND_PKG([EEZE], [efl]) EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-file]) EFL_INTERNAL_DEPEND_PKG([EEZE], [ecore-con]) EFL_INTERNAL_DEPEND_PKG([EEZE], [eet]) @@ -3513,6 +3526,7 @@ EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eldbus]) EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eeze]) EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_DRM], [eina]) EFL_DEPEND_PKG([ECORE_DRM], [DRM], [libdrm >= 2.4 xkbcommon >= 0.3.0 gbm]) @@ -3650,6 +3664,7 @@ EFL_PLATFORM_DEPEND([ECORE_AUDIO], [evil]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eet]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_AUDIO], [emile]) @@ -3707,6 +3722,7 @@ EFL_PLATFORM_DEPEND([ECORE_WIN32], [evil]) EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_WIN32], [eina]) EFL_ADD_LIBS([ECORE_WIN32], [-lole32 -lgdi32]) @@ -3758,6 +3774,7 @@ EFL_PLATFORM_DEPEND([ECORE_AVAHI], [evil]) EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_AVAHI], [efl]) EFL_OPTIONAL_DEPEND_PKG([ECORE_AVAHI], [${want_avahi}], [AVAHI], [avahi-client], [have_avahi=yes], [have_avahi=no]) @@ -3880,6 +3897,7 @@ AC_ARG_ENABLE([ibus], EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_X], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_X], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_X], [eina]) ## Xlib @@ -4102,6 +4120,7 @@ EFL_PLATFORM_DEPEND([ECORE_IMF], [escape]) EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore]) EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [ecore-input]) EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_IMF], [eina]) if test "x${want_ecore_imf}" = "xyes" ; then @@ -4482,6 +4501,7 @@ EFL_INTERNAL_DEPEND_PKG([EFREET], [eet]) EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore]) EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-file]) EFL_INTERNAL_DEPEND_PKG([EFREET], [eo]) +EFL_INTERNAL_DEPEND_PKG([EFREET], [efl]) EFL_INTERNAL_DEPEND_PKG([EFREET], [eina]) EFL_INTERNAL_DEPEND_PKG([EFREET], [emile]) EFL_INTERNAL_DEPEND_PKG([EFREET], [ecore-ipc]) @@ -4881,6 +4901,7 @@ EFL_PLATFORM_DEPEND([ELUA], [evil]) ### Checks for libraries EFL_INTERNAL_DEPEND_PKG([ELUA], [eina]) EFL_INTERNAL_DEPEND_PKG([ELUA], [eo]) +EFL_INTERNAL_DEPEND_PKG([ELUA], [efl]) EFL_INTERNAL_DEPEND_PKG([ELUA], [ecore]) EFL_INTERNAL_DEPEND_PKG([ELUA], [ecore_file]) @@ -4919,6 +4940,7 @@ EFL_LIB_START([Elocation]) EFL_PLATFORM_DEPEND([ELOCATION], [evil]) EFL_INTERNAL_DEPEND_PKG([ELOCATION], [eina]) EFL_INTERNAL_DEPEND_PKG([ELOCATION], [eo]) +EFL_INTERNAL_DEPEND_PKG([ELOCATION], [efl]) EFL_INTERNAL_DEPEND_PKG([ELOCATION], [ecore]) EFL_INTERNAL_DEPEND_PKG([ELOCATION], [eldbus]) @@ -5036,6 +5058,7 @@ EFL_LIB_START_OPTIONAL([Ecore_Buffer], [test "${want_ecore_buffer}" = "yes"]) ### Checks for libraries EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [eina]) EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [eo]) +EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [efl]) EFL_INTERNAL_DEPEND_PKG([ECORE_BUFFER], [ecore]) EFL_DEPEND_PKG([ECORE_BUFFER], [WAYLAND], [wayland-server >= 1.5.0 wayland-client >= 1.5.0])