Move Ecore.h (and associated headers) to own dir.

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@50142 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 27421f4..20261eb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -52,6 +52,8 @@ AC_SUBST(version_info)
 AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
 m4_ifdef([AM_GNU_GETTEXT_VERSION], [
 AM_GNU_GETTEXT_VERSION([0.12.1])

diff --git a/ecore-cocoa.pc.in b/ecore-cocoa.pc.in
index 2194818..91fc4ee 100644 (file)
--- a/ecore-cocoa.pc.in
+++ b/ecore-cocoa.pc.in
@@ -8,4 +8,4 @@ Description: E core library, Cocoa module
 @pkgconfig_requires_private@: @requirements_ecore_cocoa@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_cocoa
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-con.pc.in b/ecore-con.pc.in
index 64f6178..9b188aa 100644 (file)
--- a/ecore-con.pc.in
+++ b/ecore-con.pc.in
@@ -8,4 +8,4 @@ Description: E core library, Con module
 @pkgconfig_requires_private@: @requirements_ecore_con@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_con
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-config.pc.in b/ecore-config.pc.in
index dccdee0..0235eb8 100644 (file)
--- a/ecore-config.pc.in
+++ b/ecore-config.pc.in
@@ -8,4 +8,4 @@ Description: E core library, Config module
 @pkgconfig_requires_private@: @requirements_ecore_config@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_config
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-directfb.pc.in b/ecore-directfb.pc.in
index f91a8df..9eb104a 100644 (file)
--- a/ecore-directfb.pc.in
+++ b/ecore-directfb.pc.in
@@ -8,4 +8,4 @@ Description: E core library, DirectFB module
 @pkgconfig_requires_private@: @requirements_ecore_directfb@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_directfb
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-evas.pc.in b/ecore-evas.pc.in
index 0a21393..155abbe 100644 (file)
--- a/ecore-evas.pc.in
+++ b/ecore-evas.pc.in
@@ -8,4 +8,4 @@ Description: E core library, Evas module
 @pkgconfig_requires_private@: @requirements_ecore_evas@
 Version: @VERSION@
 Libs: -L${libdir} @ecore_evas_libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-fb.pc.in b/ecore-fb.pc.in
index 3adc295..4e70c48 100644 (file)
--- a/ecore-fb.pc.in
+++ b/ecore-fb.pc.in
@@ -8,4 +8,4 @@ Description: E core library, FB module
 @pkgconfig_requires_private@: @requirements_ecore_fb@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_fb
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-file.pc.in b/ecore-file.pc.in
index 84c10e8..833ff1e 100644 (file)
--- a/ecore-file.pc.in
+++ b/ecore-file.pc.in
@@ -8,4 +8,4 @@ Description: E core library, File module
 @pkgconfig_requires_private@: @requirements_ecore_file@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_file
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-imf-evas.pc.in b/ecore-imf-evas.pc.in
index 0b160ec..23451c8 100644 (file)
--- a/ecore-imf-evas.pc.in
+++ b/ecore-imf-evas.pc.in
@@ -8,4 +8,4 @@ Description: E core library, IMF Evas module
 @pkgconfig_requires_private@: @requirements_ecore_imf_evas@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_imf_evas
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-imf.pc.in b/ecore-imf.pc.in
index 926172a..cc155ed 100644 (file)
--- a/ecore-imf.pc.in
+++ b/ecore-imf.pc.in
@@ -8,4 +8,4 @@ Description: E core library, IMF module
 @pkgconfig_requires_private@: @requirements_ecore_imf@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_imf
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-input-evas.pc.in b/ecore-input-evas.pc.in
index 148060a..f95325c 100644 (file)
--- a/ecore-input-evas.pc.in
+++ b/ecore-input-evas.pc.in
@@ -8,4 +8,4 @@ Description: E core library, Input module Evas extension
 @pkgconfig_requires_private@: @requirements_ecore_input_evas@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_input_evas
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-input.pc.in b/ecore-input.pc.in
index 81d09b8..b670b71 100644 (file)
--- a/ecore-input.pc.in
+++ b/ecore-input.pc.in
@@ -8,4 +8,4 @@ Description: E core library, Input module
 @pkgconfig_requires_private@: @requirements_ecore_input@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_input
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-ipc.pc.in b/ecore-ipc.pc.in
index 5b63f43..d66f404 100644 (file)
--- a/ecore-ipc.pc.in
+++ b/ecore-ipc.pc.in
@@ -8,4 +8,4 @@ Description: E core library, IPC module
 @pkgconfig_requires_private@: @requirements_ecore_ipc@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_ipc
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-sdl.pc.in b/ecore-sdl.pc.in
index 123c8d8..78170c1 100644 (file)
--- a/ecore-sdl.pc.in
+++ b/ecore-sdl.pc.in
@@ -8,4 +8,4 @@ Description: E core library, SDL module
 @pkgconfig_requires_private@: @requirements_ecore_sdl@
 Version: @VERSION@
 Libs: -L${libdir} -lecore_sdl
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-win32.pc.in b/ecore-win32.pc.in
index b9bf64f..148a073 100644 (file)
--- a/ecore-win32.pc.in
+++ b/ecore-win32.pc.in
@@ -9,4 +9,4 @@ Description: E core library, Win32 module
 Version: @VERSION@
 Libs: -L${libdir} -lecore_win32
 Libs.private: @ddraw_libs@ @direct3d_libs@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-wince.pc.in b/ecore-wince.pc.in
index 3f5bdc4..c937e88 100644 (file)
--- a/ecore-wince.pc.in
+++ b/ecore-wince.pc.in
@@ -9,4 +9,4 @@ Description: E core library, WinCE module
 Version: @VERSION@
 Libs: -L${libdir} -lecore_wince
 Libs.private: @WIN32_LIBS@
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/ecore-x.pc.in b/ecore-x.pc.in
index 454a9c3..a02b42b 100644 (file)
--- a/ecore-x.pc.in
+++ b/ecore-x.pc.in
@@ -9,4 +9,4 @@ Description: E core library, X module
 Version: @VERSION@
 Libs: -L${libdir} -lecore_x
 Libs.private: @x_libs@ @ecore_x_libs_private@
-Cflags: -I${includedir} @have_ecore_x_xcb_define@
+Cflags: -I${includedir}/ecore-@VMAJ@ @have_ecore_x_xcb_define@

diff --git a/ecore.pc.in b/ecore.pc.in
index 87ecb6e..950a96b 100644 (file)
--- a/ecore.pc.in
+++ b/ecore.pc.in
@@ -9,4 +9,4 @@ Description: Ecore event abstraction library
 Version: @VERSION@
 Libs: -L${libdir} -lecore
 Libs.private: -lm
-Cflags: -I${includedir}
+Cflags: -I${includedir}/ecore-@VMAJ@

diff --git a/src/lib/ecore/Makefile.am b/src/lib/ecore/Makefile.am
index f852281..960e9dc 100644 (file)
--- a/src/lib/ecore/Makefile.am
+++ b/src/lib/ecore/Makefile.am
@@ -4,9 +4,10 @@ AM_CPPFLAGS = @GLIB_CFLAGS@ @EVIL_CFLAGS@ @EINA_CFLAGS@ @WIN32_CPPFLAGS@ @EFL_EC
 AM_CFLAGS = @WIN32_CFLAGS@ @EFL_PTHREAD_CFLAGS@
 
 lib_LTLIBRARIES = libecore.la
-include_HEADERS = \
+includes_HEADERS = \
 Ecore.h \
 Ecore_Getopt.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_la_SOURCES = \
 ecore.c \

diff --git a/src/lib/ecore_cocoa/Makefile.am b/src/lib/ecore_cocoa/Makefile.am
index ed05cdf..ba9c8fd 100644 (file)
--- a/src/lib/ecore_cocoa/Makefile.am
+++ b/src/lib/ecore_cocoa/Makefile.am
@@ -11,9 +11,10 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_COCOA
 
 lib_LTLIBRARIES = libecore_cocoa.la
-include_HEADERS = \
+includes_HEADERS = \
 Ecore_Cocoa.h \
 Ecore_Cocoa_Keys.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_cocoa_la_SOURCES = \
 ecore_cocoa.m \

diff --git a/src/lib/ecore_con/Makefile.am b/src/lib/ecore_con/Makefile.am
index 5fe2ed2..bd9a083 100644 (file)
--- a/src/lib/ecore_con/Makefile.am
+++ b/src/lib/ecore_con/Makefile.am
@@ -15,8 +15,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_CON
 
 lib_LTLIBRARIES = libecore_con.la
-include_HEADERS = \
-Ecore_Con.h
+includes_HEADERS = Ecore_Con.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_con_la_SOURCES = \
 ecore_con.c \

diff --git a/src/lib/ecore_config/Makefile.am b/src/lib/ecore_config/Makefile.am
index 30bbd20..80fe04f 100644 (file)
--- a/src/lib/ecore_config/Makefile.am
+++ b/src/lib/ecore_config/Makefile.am
@@ -27,7 +27,8 @@ if BUILD_ECORE_CONFIG
 
 lib_LTLIBRARIES = libecore_config.la
 
-include_HEADERS = Ecore_Config.h
+includes_HEADERS = Ecore_Config.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_config_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
 

diff --git a/src/lib/ecore_directfb/Makefile.am b/src/lib/ecore_directfb/Makefile.am
index 458170a..7761e7b 100644 (file)
--- a/src/lib/ecore_directfb/Makefile.am
+++ b/src/lib/ecore_directfb/Makefile.am
@@ -8,8 +8,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_DIRECTFB
 
 lib_LTLIBRARIES = libecore_directfb.la
-include_HEADERS = \
-Ecore_DirectFB.h
+includes_HEADERS = Ecore_DirectFB.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_directfb_la_SOURCES = \
 ecore_directfb.c \

diff --git a/src/lib/ecore_evas/Makefile.am b/src/lib/ecore_evas/Makefile.am
index 65f8956..78a3b21 100644 (file)
--- a/src/lib/ecore_evas/Makefile.am
+++ b/src/lib/ecore_evas/Makefile.am
@@ -85,8 +85,8 @@ AM_CFLAGS = @WIN32_CFLAGS@
 if BUILD_ECORE_EVAS
 
 lib_LTLIBRARIES = libecore_evas.la
-include_HEADERS = \
-Ecore_Evas.h
+includes_HEADERS = Ecore_Evas.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_evas_la_SOURCES = \
 ecore_evas.c \

diff --git a/src/lib/ecore_fb/Makefile.am b/src/lib/ecore_fb/Makefile.am
index 035d6bc..696f6cb 100644 (file)
--- a/src/lib/ecore_fb/Makefile.am
+++ b/src/lib/ecore_fb/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_FB
 
 lib_LTLIBRARIES = libecore_fb.la
-include_HEADERS = \
-Ecore_Fb.h
+includes_HEADERS = Ecore_Fb.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_fb_la_SOURCES = \
 ecore_fb.c \

diff --git a/src/lib/ecore_file/Makefile.am b/src/lib/ecore_file/Makefile.am
index d2b6c66..55c8097 100644 (file)
--- a/src/lib/ecore_file/Makefile.am
+++ b/src/lib/ecore_file/Makefile.am
@@ -19,7 +19,8 @@ endif
 if BUILD_ECORE_FILE
 
 lib_LTLIBRARIES = libecore_file.la
-include_HEADERS = Ecore_File.h
+includes_HEADERS = Ecore_File.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_file_la_SOURCES = \
 ecore_file.c \

diff --git a/src/lib/ecore_imf/Makefile.am b/src/lib/ecore_imf/Makefile.am
index 929cc41..1efe763 100644 (file)
--- a/src/lib/ecore_imf/Makefile.am
+++ b/src/lib/ecore_imf/Makefile.am
@@ -11,8 +11,8 @@ AM_CPPFLAGS = \
 AM_CFLAGS = @WIN32_CFLAGS@
 
 lib_LTLIBRARIES = libecore_imf.la
-include_HEADERS = \
-Ecore_IMF.h
+includes_HEADERS = Ecore_IMF.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_imf_la_SOURCES = \
 ecore_imf.c \

diff --git a/src/lib/ecore_imf_evas/Makefile.am b/src/lib/ecore_imf_evas/Makefile.am
index ba5b192..ab21665 100644 (file)
--- a/src/lib/ecore_imf_evas/Makefile.am
+++ b/src/lib/ecore_imf_evas/Makefile.am
@@ -9,8 +9,8 @@ AM_CPPFLAGS = \
 @EINA_CFLAGS@
 
 lib_LTLIBRARIES = libecore_imf_evas.la
-include_HEADERS = \
-Ecore_IMF_Evas.h
+includes_HEADERS = Ecore_IMF_Evas.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_imf_evas_la_SOURCES = \
 ecore_imf_evas.c

diff --git a/src/lib/ecore_input/Makefile.am b/src/lib/ecore_input/Makefile.am
index 297d88f..f9ff7c8 100644 (file)
--- a/src/lib/ecore_input/Makefile.am
+++ b/src/lib/ecore_input/Makefile.am
@@ -10,7 +10,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_INPUT
 
 lib_LTLIBRARIES = libecore_input.la
-include_HEADERS = Ecore_Input.h
+includes_HEADERS = Ecore_Input.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_input_la_SOURCES = \
 ecore_input.c

diff --git a/src/lib/ecore_input_evas/Makefile.am b/src/lib/ecore_input_evas/Makefile.am
index 1e3e77f..4749ec9 100644 (file)
--- a/src/lib/ecore_input_evas/Makefile.am
+++ b/src/lib/ecore_input_evas/Makefile.am
@@ -13,7 +13,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_INPUT_EVAS
 
 lib_LTLIBRARIES = libecore_input_evas.la
-include_HEADERS = Ecore_Input_Evas.h
+includes_HEADERS = Ecore_Input_Evas.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_input_evas_la_SOURCES = \
 ecore_input_evas.c

diff --git a/src/lib/ecore_ipc/Makefile.am b/src/lib/ecore_ipc/Makefile.am
index 99dd9c1..0ed48c8 100644 (file)
--- a/src/lib/ecore_ipc/Makefile.am
+++ b/src/lib/ecore_ipc/Makefile.am
@@ -12,8 +12,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_IPC
 
 lib_LTLIBRARIES = libecore_ipc.la
-include_HEADERS = \
-Ecore_Ipc.h
+includes_HEADERS = Ecore_Ipc.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_ipc_la_SOURCES = \
 ecore_ipc.c

diff --git a/src/lib/ecore_sdl/Makefile.am b/src/lib/ecore_sdl/Makefile.am
index a2bd2c8..3948bc4 100644 (file)
--- a/src/lib/ecore_sdl/Makefile.am
+++ b/src/lib/ecore_sdl/Makefile.am
@@ -15,8 +15,8 @@ AM_CPPFLAGS = \
 if BUILD_ECORE_SDL
 
 lib_LTLIBRARIES = libecore_sdl.la
-include_HEADERS = \
-Ecore_Sdl.h
+includes_HEADERS = Ecore_Sdl.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_sdl_la_SOURCES = \
 ecore_sdl.c

diff --git a/src/lib/ecore_win32/Makefile.am b/src/lib/ecore_win32/Makefile.am
index 5cf8bfa..027313a 100644 (file)
--- a/src/lib/ecore_win32/Makefile.am
+++ b/src/lib/ecore_win32/Makefile.am
@@ -15,8 +15,8 @@ if BUILD_ECORE_WIN32
 
 lib_LTLIBRARIES = libecore_win32.la
 
-include_HEADERS = \
-Ecore_Win32.h
+includes_HEADERS = Ecore_Win32.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_win32_la_SOURCES = \
 ecore_win32.c \

diff --git a/src/lib/ecore_wince/Makefile.am b/src/lib/ecore_wince/Makefile.am
index d99b729..f349763 100644 (file)
--- a/src/lib/ecore_wince/Makefile.am
+++ b/src/lib/ecore_wince/Makefile.am
@@ -17,8 +17,8 @@ if BUILD_ECORE_WINCE
 
 lib_LTLIBRARIES = libecore_wince.la
 
-include_HEADERS = \
-Ecore_WinCE.h
+includes_HEADERS = Ecore_WinCE.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 libecore_wince_la_SOURCES = \
 ecore_wince.c \

diff --git a/src/lib/ecore_x/Makefile.am b/src/lib/ecore_x/Makefile.am
index 2cfa4aa..c3a5d96 100644 (file)
--- a/src/lib/ecore_x/Makefile.am
+++ b/src/lib/ecore_x/Makefile.am
@@ -23,10 +23,11 @@ libecore_x_la_LIBADD = $(DEP) @EINA_LIBS@
 libecore_x_la_LDFLAGS = -version-info @version_info@ @release_info@
 libecore_x_la_DEPENDENCIES = $(DEP)
 
-include_HEADERS = \
+includes_HEADERS = \
 Ecore_X.h \
 Ecore_X_Atoms.h \
 Ecore_X_Cursor.h
+includesdir = $(includedir)/ecore-@VMAJ@
 
 endif