diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 3e7684a62f..7e00c3e5e3 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -51,9 +51,6 @@ lib_ecore_libecore_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/ecore \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ -DEFL_ECORE_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @@ -61,14 +58,12 @@ lib_ecore_libecore_la_CPPFLAGS = \ if HAVE_WINDOWS lib_ecore_libecore_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif if HAVE_PS3 lib_ecore_libecore_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/escape \ --I$(top_builddir)/src/lib/escape +-I$(top_srcdir)/src/lib/escape endif lib_ecore_libecore_la_LIBADD = \ @@ -108,13 +103,6 @@ tests_ecore_ecore_suite_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_srcdir)/src/lib/ecore_file \ -I$(top_srcdir)/src/lib/ecore_x \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_audio \ --I$(top_builddir)/src/lib/ecore_con \ --I$(top_builddir)/src/lib/ecore_file \ --I$(top_builddir)/src/lib/ecore_x \ -DTESTS_SRC_DIR=\"`pwd`/$(top_srcdir)\" \ @CHECK_CFLAGS@ diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index 7862ad9c73..7b211586e5 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -21,10 +21,6 @@ lib_ecore_audio_libecore_audio_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ -I$(top_srcdir)/src/lib/ecore \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/eet \ --I$(top_builddir)/src/lib/ecore \ -DEFL_ECORE_AUDIO_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am index f7f82918a1..6229130889 100644 --- a/src/Makefile_Ecore_Cocoa.am +++ b/src/Makefile_Ecore_Cocoa.am @@ -19,11 +19,6 @@ lib_ecore_cocoa_libecore_cocoa_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_cocoa \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_cocoa \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index f2e6ee8537..72bf9b8e0b 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -39,11 +39,6 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eet \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_con \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/eet \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_con \ -DEFL_ECORE_CON_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @@ -51,8 +46,7 @@ lib_ecore_con_libecore_con_la_CPPFLAGS = \ if HAVE_WINDOWS lib_ecore_con_libecore_con_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif lib_ecore_con_libecore_con_la_LIBADD = \ diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am index f0f5aa8c52..6f437df465 100644 --- a/src/Makefile_Ecore_Evas.am +++ b/src/Makefile_Ecore_Evas.am @@ -26,15 +26,6 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input_evas \ -I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/modules/evas/engines/buffer \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/evas \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_ipc \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_input_evas \ --I$(top_builddir)/src/lib/ecore_evas \ --I$(top_builddir)/src/modules/evas/engines/buffer \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DEFL_ECORE_EVAS_BUILD \ @EFL_CFLAGS@ \ @@ -42,8 +33,7 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = \ if HAVE_WINDOWS lib_ecore_evas_libecore_evas_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif lib_ecore_evas_libecore_evas_la_LIBADD = \ @@ -86,9 +76,6 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_x \ -I$(top_srcdir)/src/modules/evas/engines/software_x11 \ -I$(top_srcdir)/src/modules/evas/engines/gl_x11 \ --I$(top_builddir)/src/lib/ecore_x \ --I$(top_builddir)/src/modules/evas/engines/software_x11 \ --I$(top_builddir)/src/modules/evas/engines/gl_x11 modules_ecore_evas_engines_x_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ lib/ecore_x/libecore_x.la @@ -105,8 +92,6 @@ modules_ecore_evas_engines_cocoa_module_la_CPPFLAGS = \ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_cocoa \ -I$(top_srcdir)/src/modules/evas/engines/gl_cocoa \ --I$(top_builddir)/src/lib/ecore_cocoa \ --I$(top_builddir)/src/modules/evas/engines/gl_cocoa modules_ecore_evas_engines_cocoa_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ lib/ecore_cocoa/libecore_cocoa.la @@ -123,8 +108,6 @@ modules_ecore_evas_engines_fb_module_la_CPPFLAGS = \ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_fb \ -I$(top_srcdir)/src/modules/evas/engines/fb \ --I$(top_builddir)/src/lib/ecore_fb \ --I$(top_builddir)/src/modules/evas/engines/fb modules_ecore_evas_engines_fb_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ lib/ecore_fb/libecore_fb.la @@ -141,8 +124,6 @@ modules_ecore_evas_engines_psl1ght_module_la_CPPFLAGS = \ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_psl1ght \ -I$(top_srcdir)/src/modules/evas/engines/psl1ght \ --I$(top_builddir)/src/lib/ecore_psl1ght \ --I$(top_builddir)/src/modules/evas/engines/psl1ght modules_ecore_evas_engines_psl1ght_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ lib/ecore_psl1ght/libecore_psl1ght.la @@ -164,9 +145,6 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_wayland \ -I$(top_srcdir)/src/modules/evas/engines/wayland_shm \ -I$(top_srcdir)/src/modules/evas/engines/wayland_egl \ --I$(top_builddir)/src/lib/ecore_wayland \ --I$(top_builddir)/src/modules/evas/engines/wayland_shm \ --I$(top_builddir)/src/modules/evas/engines/wayland_egl \ @ECORE_WAYLAND_CFLAGS@ modules_ecore_evas_engines_wayland_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ @@ -185,8 +163,6 @@ modules_ecore_evas_engines_sdl_module_la_CPPFLAGS = \ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_sdl \ -I$(top_srcdir)/src/modules/evas/engines/gl_sdl \ --I$(top_builddir)/src/lib/ecore_sdl \ --I$(top_builddir)/src/modules/evas/engines/gl_sdl modules_ecore_evas_engines_sdl_module_la_LIBADD = \ lib/ecore_evas/libecore_evas.la @EFL_LIBS@ \ lib/ecore_sdl/libecore_sdl.la @@ -205,9 +181,6 @@ $(lib_ecore_evas_libecore_evas_la_CPPFLAGS) \ -I$(top_srcdir)/src/lib/ecore_win32 \ -I$(top_srcdir)/src/modules/evas/engines/software_ddraw \ -I$(top_srcdir)/src/modules/evas/engines/software_gdi \ --I$(top_builddir)/src/lib/ecore_win32 \ --I$(top_builddir)/src/modules/evas/engines/software_ddraw \ --I$(top_builddir)/src/modules/evas/engines/software_gdi modules_ecore_evas_engines_win32_module_la_LIBADD = \ lib/ecore/libeecore_evas.la @EFL_LIBS@ \ lib/ecore_win32/libecore_win32.la diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am index 97748f83ec..8944546eec 100644 --- a/src/Makefile_Ecore_FB.am +++ b/src/Makefile_Ecore_FB.am @@ -24,11 +24,6 @@ lib_ecore_fb_libecore_fb_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_fb \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_fb \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_FB_CFLAGS@ diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am index cd98246782..145a716c15 100644 --- a/src/Makefile_Ecore_File.am +++ b/src/Makefile_Ecore_File.am @@ -33,11 +33,6 @@ lib_ecore_file_libecore_file_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_srcdir)/src/lib/ecore_file \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_con \ --I$(top_builddir)/src/lib/ecore_file \ -DEFL_ECORE_FILE_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am index 5634b909cd..d1407935c3 100644 --- a/src/Makefile_Ecore_Imf.am +++ b/src/Makefile_Ecore_Imf.am @@ -20,10 +20,6 @@ lib_ecore_imf_libecore_imf_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_imf \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_imf \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DEFL_ECORE_IMF_BUILD \ @EFL_CFLAGS@ \ @@ -50,12 +46,6 @@ lib_ecore_imf_libecore_imf_evas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_imf_evas \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/evas \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_imf \ --I$(top_builddir)/src/lib/ecore_imf_evas \ -DEFL_ECORE_IMF_EVAS_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ @@ -90,13 +80,6 @@ modules_ecore_immodules_ibus_ibus_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_x \ --I$(top_builddir)/src/lib/ecore_imf \ --I$(top_builddir)/src/lib/ecore_evas \ -DEFL_ECORE_IMF_EVAS_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @@ -131,13 +114,6 @@ modules_ecore_immodules_scim_scim_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_imf \ -I$(top_srcdir)/src/lib/ecore_evas \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_x \ --I$(top_builddir)/src/lib/ecore_imf \ --I$(top_builddir)/src/lib/ecore_evas \ -DEFL_ECORE_IMF_EVAS_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @@ -168,12 +144,6 @@ modules_ecore_immodules_xim_xim_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_x \ -I$(top_srcdir)/src/lib/ecore_imf \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_x \ --I$(top_builddir)/src/lib/ecore_imf \ -DEFL_ECORE_IMF_EVAS_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am index e199380d6b..33eda3d315 100644 --- a/src/Makefile_Ecore_Input.am +++ b/src/Makefile_Ecore_Input.am @@ -20,10 +20,6 @@ lib_ecore_input_libecore_input_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ -DEFL_ECORE_INPUT_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ @@ -52,12 +48,6 @@ lib_ecore_input_libecore_input_evas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_input_evas \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/evas \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_input_evas \ -DEFL_ECORE_INPUT_EVAS_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am index ba09f374b7..08f2bab700 100644 --- a/src/Makefile_Ecore_Ipc.am +++ b/src/Makefile_Ecore_Ipc.am @@ -17,11 +17,6 @@ lib_ecore_ipc_libecore_ipc_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_con \ -I$(top_srcdir)/src/lib/ecore_ipc \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_con \ --I$(top_builddir)/src/lib/ecore_ipc \ -DEFL_ECORE_IPC_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am index 9ac146c63d..f06baaf318 100644 --- a/src/Makefile_Ecore_Psl1ght.am +++ b/src/Makefile_Ecore_Psl1ght.am @@ -20,11 +20,6 @@ lib_ecore_psl1ght_libecore_psl1ght_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_psl1ght \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_psl1ght \ -DEFL_ECORE_PSL1GHT_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am index 62e7a10266..dc592b30ca 100644 --- a/src/Makefile_Ecore_SDL.am +++ b/src/Makefile_Ecore_SDL.am @@ -18,11 +18,6 @@ lib_ecore_sdl_libecore_sdl_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_sdl \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_sdl \ -DEFL_ECORE_SDL_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am index 696342fa8d..220da2a5e9 100644 --- a/src/Makefile_Ecore_Wayland.am +++ b/src/Makefile_Ecore_Wayland.am @@ -21,11 +21,6 @@ lib_ecore_wayland_libecore_wayland_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_wayland \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_wayland \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ @ECORE_WAYLAND_CFLAGS@ diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am index 2491ca5aa7..6183155074 100644 --- a/src/Makefile_Ecore_Win32.am +++ b/src/Makefile_Ecore_Win32.am @@ -30,12 +30,6 @@ lib_ecore_win32_libecore_win32_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_win32 \ --I$(top_builddir)/src/lib/evil \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_win32 \ -DEFL_ECORE_WIN32_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am index 7bf526411d..3f73c641e9 100644 --- a/src/Makefile_Ecore_WinCE.am +++ b/src/Makefile_Ecore_WinCE.am @@ -20,12 +20,6 @@ lib_ecore_wince_libecore_wince_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_wince \ --I$(top_builddir)/src/lib/evil \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_wince \ -DEFL_ECORE_WINCE_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index d5e1979d6d..ae53091d47 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -101,11 +101,6 @@ lib_ecore_x_libecore_x_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/ecore_input \ -I$(top_srcdir)/src/lib/ecore_x \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/ecore_input \ --I$(top_builddir)/src/lib/ecore_x \ -DEFL_ECORE_X_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ \ diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am index 79d9a625a7..44fbfe9c79 100644 --- a/src/Makefile_Eet.am +++ b/src/Makefile_Eet.am @@ -26,9 +26,6 @@ lib_eet_libeet_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eet \ -I$(top_srcdir)/src/static_libs/lz4 \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eet \ --I$(top_builddir)/src/static_libs/lz4 \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/eet\" \ @@ -39,8 +36,7 @@ lib_eet_libeet_la_CPPFLAGS = \ if HAVE_WINDOWS lib_eet_libeet_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif lib_eet_libeet_la_LIBADD = lib/eina/libeina.la @@ -64,8 +60,6 @@ bin_eet_eet_SOURCES = bin/eet/eet_main.c bin_eet_eet_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eet \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @@ -75,8 +69,7 @@ bin_eet_eet_CPPFLAGS = \ if HAVE_WINDOWS bin_eet_eet_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif bin_eet_eet_LDADD = \ @@ -103,8 +96,6 @@ tests/eet/eet_suite.h tests_eet_eet_suite_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eet \ -DTESTS_SRC_DIR=\"$(top_srcdir)\" \ @CHECK_CFLAGS@ \ @EET_CFLAGS@ diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am index d3f5738818..c8b0af401e 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -159,7 +159,6 @@ einampchainedpool_LTLIBRARIES = chained_pool_module.la chained_pool_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DEFL_EINA_BUILD chained_pool_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ chained_pool_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c @@ -176,7 +175,6 @@ einamponebig_LTLIBRARIES = one_big_module.la one_big_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DEFL_EINA_BUILD one_big_module_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ one_big_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c @@ -193,7 +191,6 @@ einamppassthrough_LTLIBRARIES = pass_through_module.la pass_through_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DEFL_EINA_BUILD pass_through_module_la_CFLAGS = @EINA_CFLAGS@ pass_through_module_la_SOURCES = modules/eina/mp/chained_pool/eina_chained_mempool.c @@ -204,7 +201,6 @@ endif lib_eina_libeina_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ @@ -216,8 +212,7 @@ lib_eina_libeina_la_CPPFLAGS = \ if HAVE_WINDOWS lib_eina_libeina_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @@ -284,7 +279,6 @@ tests/eina/eina_test_value.c tests_eina_eina_suite_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ @CHECK_CFLAGS@ \ @EINA_CFLAGS@ @@ -299,7 +293,6 @@ tests_eina_cxx_compile_test_SOURCES = tests/eina/cxx_compile_test.cxx tests_eina_cxx_compile_test_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ @CHECK_CFLAGS@ \ @EINA_CFLAGS@ @@ -315,7 +308,6 @@ tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c tests_eina_module_dummy_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \ @CHECK_CFLAGS@ \ @EINA_CFLAGS@ \ diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am index 626756fa68..3f3346c3dc 100644 --- a/src/Makefile_Eio.am +++ b/src/Makefile_Eio.am @@ -32,11 +32,6 @@ lib_eio_libeio_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eet \ -I$(top_srcdir)/src/lib/ecore \ -I$(top_srcdir)/src/lib/eio \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/eet \ --I$(top_builddir)/src/lib/ecore \ --I$(top_builddir)/src/lib/eio \ -DEFL_EIO_BUILD \ @EFL_CFLAGS@ \ @EFL_COV_CFLAGS@ diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am index 32f6b14079..600b51c6b6 100644 --- a/src/Makefile_Embryo.am +++ b/src/Makefile_Embryo.am @@ -18,7 +18,6 @@ lib/embryo/embryo_private.h lib_embryo_libembryo_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ @@ -27,8 +26,7 @@ lib_embryo_libembryo_la_CPPFLAGS = \ if HAVE_WINDOWS lib_embryo_libembryo_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif lib_embryo_libembryo_la_LIBADD = lib/eina/libeina.la @@ -64,8 +62,6 @@ bin/embryo/embryo_cc_prefix.h bin_embryo_embryo_cc_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/embryo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/embryo \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \ @@ -73,8 +69,7 @@ bin_embryo_embryo_cc_CPPFLAGS = \ if HAVE_WINDOWS bin_embryo_embryo_cc_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif bin_embryo_embryo_cc_LDADD = \ diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index 22fa8faa82..65d21913db 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -14,8 +14,6 @@ lib/eo/eo_private.h lib_eo_libeo_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ -DNDEBUG \ -DEFL_EO_BUILD \ @EFL_CFLAGS@ \ @@ -24,8 +22,7 @@ lib_eo_libeo_la_CPPFLAGS = \ if HAVE_WINDOWS lib_eo_libeo_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ @@ -58,8 +55,6 @@ tests/eo/access/access_simple_protected.h tests_eo_test_access_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -77,8 +72,6 @@ tests/eo/composite_objects/composite_objects_simple.h tests_eo_test_composite_objects_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -108,8 +101,6 @@ tests/eo/constructors/constructors_simple7.h tests_eo_test_constructors_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -131,8 +122,6 @@ tests/eo/suite/eo_test_init.c tests_eo_eo_suite_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ -DNDEBUG \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -158,8 +147,6 @@ tests/eo/function_overrides/function_overrides_simple.h tests_eo_test_function_overrides_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -179,8 +166,6 @@ tests/eo/interface/interface_simple.h tests_eo_test_interface_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -206,8 +191,6 @@ tests/eo/mixin/mixin_simple.h tests_eo_test_mixin_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ @@ -223,8 +206,6 @@ tests/eo/signals/signals_simple.h tests_eo_test_signals_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ @CHECK_CFLAGS@ \ @EO_CFLAGS@ diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am index d237d184a2..4b8ffb2d9a 100644 --- a/src/Makefile_Escape.am +++ b/src/Makefile_Escape.am @@ -19,7 +19,6 @@ lib/escape/escape_mman.c \ lib/escape/escape_unistd.c lib_escape_libescape_la_CPPFLAGS = \ --I$(top_srcdir)/src/lib/escape \ --I$(top_builddir)/src/lib/escape +-I$(top_srcdir)/src/lib/escape lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 8774ae1203..83a6578e8a 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -190,23 +190,14 @@ lib/evas/common/evas_font_ot.h lib_evas_libevas_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/lib/evas/file \ --I$(top_builddir)/src/lib/evas/file \ -I$(top_srcdir)/src/static_libs/liblinebreak \ --I$(top_builddir)/src/static_libs/liblinebreak \ -I$(top_srcdir)/src/lib/evas/common \ --I$(top_builddir)/src/lib/evas/common \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -DEFL_EVAS_BUILD \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @@ -232,7 +223,6 @@ lib_evas_common_libevas_op_blend_sse3_la_LIBADD = @EFL_COV_LIBS@ if HAVE_WINDOWS lib_evas_libevas_la_CPPFLAGS += \ -I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil endif lib_evas_libevas_la_CXXFLAGS = @@ -383,15 +373,10 @@ enginesoftwaregenericpkg_LTLIBRARIES = modules/evas/engines/software_generic/mod modules_evas_engines_software_generic_module_la_SOURCES = modules/evas/engines/software_generic/evas_engine.c modules_evas_engines_software_generic_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -414,22 +399,16 @@ enginebufferpkg_LTLIBRARIES = modules/evas/engines/buffer/module.la modules_evas_engines_buffer_module_la_SOURCES = $(BUFFER_SOURCES) modules_evas_engines_buffer_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ if HAVE_WINDOWS modules_evas_engines_buffer_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif modules_evas_engines_buffer_module_la_LIBADD = lib/evas/libevas.la @EFL_LIBS@ modules_evas_engines_buffer_module_la_LDFLAGS = -no-undefined -module -avoid-version @@ -455,15 +434,10 @@ enginefbpkg_LTLIBRARIES = modules/evas/engines/fb/module.la modules_evas_engines_fb_module_la_SOURCES = $(FB_SOURCES) modules_evas_engines_fb_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_fb_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -575,17 +549,11 @@ noinst_LTLIBRARIES += modules/evas/engines/gl_common/libevas_engine_gl_common.la modules_evas_engines_gl_common_libevas_engine_gl_common_la_SOURCES = $(GL_COMMON_SOURCES) modules_evas_engines_gl_common_libevas_engine_gl_common_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -617,19 +585,12 @@ engineglcocoapkg_LTLIBRARIES = modules/evas/engines/gl_cocoa/module.la modules_evas_engines_gl_cocoa_module_la_SOURCES = $(GL_COCOA_SOURCES) modules_evas_engines_gl_cocoa_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ --I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_cocoa_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -666,19 +627,12 @@ engineglsdlpkg_LTLIBRARIES = modules/evas/engines/gl_sdl/module.la modules_evas_engines_gl_sdl_module_la_SOURCES = $(GL_SDL_SOURCES) modules_evas_engines_gl_sdl_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ --I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_sdl_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -715,19 +669,12 @@ engineglx11pkg_LTLIBRARIES = modules/evas/engines/gl_x11/module.la modules_evas_engines_gl_x11_module_la_SOURCES = $(GL_X11_SOURCES) modules_evas_engines_gl_x11_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ --I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_gl_xlib_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -763,15 +710,10 @@ enginepsl1ghtpkg_LTLIBRARIES = modules/evas/engines/psl1ght/module.la modules_evas_engines_psl1ght_module_la_SOURCES = $(PSL1GHT_SOURCES) modules_evas_engines_psl1ght_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_psl1ght_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -803,23 +745,17 @@ enginesoftwareddrawpkg_LTLIBRARIES = modules/evas/engines/software_ddraw/module. modules_evas_engines_software_ddraw_module_la_SOURCES = $(SOFTWARE_DDRAW_SOURCES) modules_evas_engines_software_ddraw_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @evas_engine_software_ddraw_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ if HAVE_WINDOWS modules_evas_engines_software_ddraw_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif modules_evas_engines_software_ddraw_module_la_CXXFLAGS = -fno-rtti -fno-exceptions modules_evas_engines_software_ddraw_module_la_LIBADD = \ @@ -849,23 +785,17 @@ enginesoftwaregdipkg_LTLIBRARIES = modules/evas/engines/software_gdi/module.la modules_evas_engines_software_gdi_module_la_SOURCES = $(SOFTWARE_GDI_SOURCES) modules_evas_engines_software_gdi_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -DEFL_EVAS_BUILD \ @evas_engine_software_gdi_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ if HAVE_WINDOWS modules_evas_engines_software_gdi_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif modules_evas_engines_software_gdi_module_la_LIBADD = \ lib/evas/libevas.la \ @@ -885,15 +815,10 @@ modules/evas/engines/software_x11/evas_x_egl.c \ modules/evas/engines/software_x11/evas_x_egl.h SOFTWARE_X11_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ SOFTWARE_X11_LIBADD = @@ -960,19 +885,12 @@ enginewaylandeglpkg_LTLIBRARIES = modules/evas/engines/wayland_egl/module.la modules_evas_engines_wayland_egl_module_la_SOURCES = $(WAYLAND_EGL_SOURCES) modules_evas_engines_wayland_egl_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/modules/evas/engines/gl_common \ --I$(top_builddir)/src/modules/evas/engines/gl_common \ @evas_engine_wayland_egl_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1003,15 +921,10 @@ enginewaylandshmpkg_LTLIBRARIES = modules/evas/engines/wayland_shm/module.la modules_evas_engines_wayland_shm_module_la_SOURCES = $(WAYLAND_SHM_SOURCES) modules_evas_engines_wayland_shm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @evas_engine_wayland_shm_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1037,13 +950,9 @@ loaderbmppkg_LTLIBRARIES = modules/evas/loaders/bmp/module.la modules_evas_loaders_bmp_module_la_SOURCES = modules/evas/loaders/bmp/evas_image_load_bmp.c modules_evas_loaders_bmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_bmp_cflags@ \ @EFL_CFLAGS@ \ @@ -1069,15 +978,10 @@ loadereetpkg_LTLIBRARIES = modules/evas/loaders/eet/module.la modules_evas_loaders_eet_module_la_SOURCES = modules/evas/loaders/eet/evas_image_load_eet.c modules_evas_loaders_eet_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_eet_cflags@ \ @EFL_CFLAGS@ \ @@ -1102,13 +1006,9 @@ loadergenericpkg_LTLIBRARIES = modules/evas/loaders/generic/module.la modules_evas_loaders_generic_module_la_SOURCES = modules/evas/loaders/generic/evas_image_load_generic.c modules_evas_loaders_generic_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_generic_cflags@ \ @EFL_CFLAGS@ \ @@ -1133,13 +1033,9 @@ loadergifpkg_LTLIBRARIES = modules/evas/loaders/gif/module.la modules_evas_loaders_gif_module_la_SOURCES = modules/evas/loaders/gif/evas_image_load_gif.c modules_evas_loaders_gif_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_gif_cflags@ \ @EFL_CFLAGS@ \ @@ -1164,13 +1060,9 @@ loadericopkg_LTLIBRARIES = modules/evas/loaders/ico/module.la modules_evas_loaders_ico_module_la_SOURCES = modules/evas/loaders/ico/evas_image_load_ico.c modules_evas_loaders_ico_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_ico_cflags@ \ @EFL_CFLAGS@ \ @@ -1198,13 +1090,9 @@ loaderjpegpkg_LTLIBRARIES = modules/evas/loaders/jpeg/module.la modules_evas_loaders_jpeg_module_la_SOURCES = modules/evas/loaders/jpeg/evas_image_load_jpeg.c modules_evas_loaders_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_jpeg_cflags@ \ @EFL_CFLAGS@ \ @@ -1221,13 +1109,9 @@ saverjpegpkg_LTLIBRARIES = modules/evas/savers/jpeg/module.la modules_evas_savers_jpeg_module_la_SOURCES = modules/evas/savers/jpeg/evas_image_save_jpeg.c modules_evas_savers_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ @evas_image_loader_jpeg_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1252,13 +1136,9 @@ loaderpmapspkg_LTLIBRARIES = modules/evas/loaders/pmaps/module.la modules_evas_loaders_pmaps_module_la_SOURCES = modules/evas/loaders/pmaps/evas_image_load_pmaps.c modules_evas_loaders_pmaps_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_pmaps_cflags@ \ @EFL_CFLAGS@ \ @@ -1283,13 +1163,9 @@ loaderpngpkg_LTLIBRARIES = modules/evas/loaders/png/module.la modules_evas_loaders_png_module_la_SOURCES = modules/evas/loaders/png/evas_image_load_png.c modules_evas_loaders_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_png_cflags@ \ @EFL_CFLAGS@ \ @@ -1306,13 +1182,9 @@ saverpngpkg_LTLIBRARIES = modules/evas/savers/png/module.la modules_evas_savers_png_module_la_SOURCES = modules/evas/savers/png/evas_image_save_png.c modules_evas_savers_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_png_cflags@ \ @EFL_CFLAGS@ \ @@ -1337,13 +1209,9 @@ loaderpsdpkg_LTLIBRARIES = modules/evas/loaders/psd/module.la modules_evas_loaders_psd_module_la_SOURCES = modules/evas/loaders/psd/evas_image_load_psd.c modules_evas_loaders_psd_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_psd_cflags@ \ @EFL_CFLAGS@ \ @@ -1368,13 +1236,9 @@ loadersvgpkg_LTLIBRARIES = modules/evas/loaders/svg/module.la modules_evas_loaders_svg_module_la_SOURCES = modules/evas/loaders/svg/evas_image_load_esvg.c modules_evas_loaders_svg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_svg_cflags@ \ @EFL_CFLAGS@ \ @@ -1399,13 +1263,9 @@ loadertgapkg_LTLIBRARIES = modules/evas/loaders/tga/module.la modules_evas_loaders_tga_module_la_SOURCES = modules/evas/loaders/tga/evas_image_load_tga.c modules_evas_loaders_tga_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_tga_cflags@ \ @EFL_CFLAGS@ \ @@ -1430,21 +1290,16 @@ loadertiffpkg_LTLIBRARIES = modules/evas/loaders/tiff/module.la modules_evas_loaders_tiff_module_la_SOURCES = modules/evas/loaders/tiff/evas_image_load_tiff.c modules_evas_loaders_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ if HAVE_WINDOWS modules_evas_loaders_tiff_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif modules_evas_loaders_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @@ -1458,21 +1313,16 @@ savertiffpkg_LTLIBRARIES = modules/evas/savers/tiff/module.la modules_evas_savers_tiff_module_la_SOURCES = modules/evas/savers/tiff/evas_image_save_tiff.c modules_evas_savers_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ if HAVE_WINDOWS modules_evas_savers_tiff_module_la_CPPFLAGS += \ --I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil +-I$(top_srcdir)/src/lib/evil endif modules_evas_savers_tiff_module_la_LIBADD = \ lib/evas/libevas.la \ @@ -1494,13 +1344,9 @@ loaderwbmppkg_LTLIBRARIES = modules/evas/loaders/wbmp/module.la modules_evas_loaders_wbmp_module_la_SOURCES = modules/evas/loaders/wbmp/evas_image_load_wbmp.c modules_evas_loaders_wbmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_wbmp_cflags@ \ @EFL_CFLAGS@ \ @@ -1525,13 +1371,9 @@ loaderwebppkg_LTLIBRARIES = modules/evas/loaders/webp/module.la modules_evas_loaders_webp_module_la_SOURCES = modules/evas/loaders/webp/evas_image_load_webp.c modules_evas_loaders_webp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_webp_cflags@ \ @EFL_CFLAGS@ \ @@ -1556,13 +1398,9 @@ loaderxpmpkg_LTLIBRARIES = modules/evas/loaders/xpm/module.la modules_evas_loaders_xpm_module_la_SOURCES = modules/evas/loaders/xpm/evas_image_load_xpm.c modules_evas_loaders_xpm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -DEFL_EVAS_BUILD \ @evas_image_loader_xpm_cflags@ \ @EFL_CFLAGS@ \ @@ -1607,22 +1445,11 @@ lib/evas/cserve2/evas_cs2_utils.c bin_evas_evas_cserve2_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/eet \ -DPACKAGE_LIBEXEC_DIR=\"$(libexecdir)\" \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1639,15 +1466,10 @@ bin/evas/evas_cserve2_client.c bin_evas_evas_cserve2_client_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1656,15 +1478,10 @@ bin/evas/evas_cserve2_usage.c bin_evas_evas_cserve2_usage_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1678,15 +1495,10 @@ bin/evas/evas_cserve2_debug.c bin_evas_evas_cserve2_debug_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1701,15 +1513,10 @@ bin/evas/evas_cserve2_utils.c bin_evas_evas_cserve2_slave_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1726,15 +1533,10 @@ bin/evas/dummy_slave.c bin_evas_dummy_slave_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ @EVAS_CFLAGS@ \ @EFL_CFLAGS@ @@ -1750,17 +1552,11 @@ cserve2bmppkg_LTLIBRARIES = bin/evas/loaders/bmp/module.la bin_evas_loaders_bmp_module_la_SOURCES = bin/evas/loaders/bmp/evas_image_load_bmp.c bin_evas_loaders_bmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ bin_evas_loaders_bmp_module_la_LIBADD = @EFL_LIBS@ -lm @@ -1774,19 +1570,12 @@ cserve2eetpkg_LTLIBRARIES = bin/evas/loaders/eet/module.la bin_evas_loaders_eet_module_la_SOURCES = bin/evas/loaders/eet/evas_image_load_eet.c bin_evas_loaders_eet_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/eet \ --I$(top_builddir)/src/lib/eet \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_eet_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1803,17 +1592,11 @@ cserve2icopkg_LTLIBRARIES = bin/evas/loaders/ico/module.la bin_evas_loaders_ico_module_la_SOURCES = bin/evas/loaders/ico/evas_image_load_ico.c bin_evas_loaders_ico_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_ico_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1828,17 +1611,11 @@ cserve2jpegpkg_LTLIBRARIES = bin/evas/loaders/jpeg/module.la bin_evas_loaders_jpeg_module_la_SOURCES = bin/evas/loaders/jpeg/evas_image_load_jpeg.c bin_evas_loaders_jpeg_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_jpeg_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1853,17 +1630,11 @@ cserve2pmapspkg_LTLIBRARIES = bin/evas/loaders/pmaps/module.la bin_evas_loaders_pmaps_module_la_SOURCES = bin/evas/loaders/pmaps/evas_image_load_pmaps.c bin_evas_loaders_pmaps_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_pmaps_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1878,17 +1649,11 @@ cserve2pngpkg_LTLIBRARIES = bin/evas/loaders/png/module.la bin_evas_loaders_png_module_la_SOURCES = bin/evas/loaders/png/evas_image_load_png.c bin_evas_loaders_png_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_png_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1903,17 +1668,11 @@ cserve2psdpkg_LTLIBRARIES = bin/evas/loaders/psd/module.la bin_evas_loaders_psd_module_la_SOURCES = bin/evas/loaders/psd/evas_image_load_psd.c bin_evas_loaders_psd_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_psd_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1928,17 +1687,11 @@ cserve2tgapkg_LTLIBRARIES = bin/evas/loaders/tga/module.la bin_evas_loaders_tga_module_la_SOURCES = bin/evas/loaders/tga/evas_image_load_tga.c bin_evas_loaders_tga_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_tga_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1953,17 +1706,11 @@ cserve2tiffpkg_LTLIBRARIES = bin/evas/loaders/tiff/module.la bin_evas_loaders_tiff_module_la_SOURCES = bin/evas/loaders/tiff/evas_image_load_tiff.c bin_evas_loaders_tiff_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_tiff_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -1978,17 +1725,11 @@ cserve2wbmppkg_LTLIBRARIES = bin/evas/loaders/wbmp/module.la bin_evas_loaders_wbmp_module_la_SOURCES = bin/evas/loaders/wbmp/evas_image_load_wbmp.c bin_evas_loaders_wbmp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_wbmp_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -2003,17 +1744,11 @@ cserve2webppkg_LTLIBRARIES = bin/evas/loaders/webp/module.la bin_evas_loaders_webp_module_la_SOURCES = bin/evas/loaders/webp/evas_image_load_webp.c bin_evas_loaders_webp_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_webp_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -2028,17 +1763,11 @@ cserve2xpmpkg_LTLIBRARIES = bin/evas/loaders/xpm/module.la bin_evas_loaders_xpm_module_la_SOURCES = bin/evas/loaders/xpm/evas_image_load_xpm.c bin_evas_loaders_xpm_module_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ --I$(top_builddir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ --I$(top_builddir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/evas \ -I$(top_srcdir)/src/lib/evas/include \ --I$(top_builddir)/src/lib/evas/include \ -I$(top_srcdir)/src/lib/evas/cserve2 \ --I$(top_builddir)/src/lib/evas/cserve2 \ -I$(top_srcdir)/src/bin/evas \ --I$(top_builddir)/src/bin/evas \ @evas_image_loader_xpm_cflags@ \ @EFL_CFLAGS@ \ @EVAS_CFLAGS@ @@ -2068,9 +1797,6 @@ tests_evas_evas_suite_CPPFLAGS = \ -I$(top_srcdir)/src/lib/eina \ -I$(top_srcdir)/src/lib/eo \ -I$(top_srcdir)/src/lib/evas \ --I$(top_builddir)/src/lib/eina \ --I$(top_builddir)/src/lib/eo \ --I$(top_builddir)/src/lib/evas \ @CHECK_CFLAGS@ \ @EVAS_CFLAGS@ diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am index 531f5b048f..44afbdfba4 100644 --- a/src/Makefile_Evil.am +++ b/src/Makefile_Evil.am @@ -96,7 +96,6 @@ endif lib_evil_libevil_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil \ @EVIL_CPPFLAGS@ lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ @@ -113,7 +112,6 @@ lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c lib_evil_libdl_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/evil \ --I$(top_builddir)/src/lib/evil \ @EVIL_DLFCN_CPPFLAGS@ lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@