moved eet.h to its own dir - pkgconfig handles all the right stuff.

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

diff --git a/ChangeLog b/ChangeLog
index 0fa13cc..92c5797 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -394,3 +394,8 @@
 
        * Add eet_alias support.
        * Fix possible dead lock in eet_write_cipher.
+
+2010-07-08  Carsten Haitzler (The Rasterman)
+
+        * Moved Eet.h into $includedir/eet-MAJOR_VERSION/
+

diff --git a/configure.ac b/configure.ac
index c80439b..80639c0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,8 @@ AC_SUBST(version_info)
 AC_SUBST(release_info)
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
 ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
-
+VMAJ=v_maj
+AC_SUBST(VMAJ)
 
 ### Default options with respect to host
 

diff --git a/eet.pc.in b/eet.pc.in
index df841e2..f7a3bf1 100644 (file)
--- a/eet.pc.in
+++ b/eet.pc.in
@@ -9,5 +9,5 @@ Description: Library for speedy data storage, retrieval, and compression
 Version: @VERSION@
 Libs: -L${libdir} -leet
 Libs.private: @EET_LIBS@ @EFL_FNMATCH_LIBS@ @LIBGCRYPT_LIBS@ -ljpeg -lz -lm
-Cflags: -I${includedir}
+Cflags: -I${includedir}/eet-@VMAJ@
 Cflags.private: @LIBGCRYPT_CFLAGS@

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 388b73d..9f8bcab 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 @OPENSSL_CFLAGS@ \
 @GNUTLS_CFLAGS@
 
-include_HEADERS = Eet.h
+includes_HEADERS = Eet.h
+includesdir = $(includedir)/eet-@VMAJ@
 
 lib_LTLIBRARIES = libeet.la