From ef80c62311e2e514fac3fa120232808c8b0aaeaa Mon Sep 17 00:00:00 2001 From: devilhorns Date: Fri, 9 Jul 2010 06:35:02 +0000 Subject: [PATCH] Move Edje (and associated headers) to own dir. git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@50146 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- configure.ac | 2 ++ edje.pc.in | 2 +- src/lib/Makefile.am | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8179b4c..e5469eb 100644 --- a/configure.ac +++ b/configure.ac @@ -50,6 +50,8 @@ AC_SUBST(version_info) AC_SUBST(release_info) ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## ##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## +VMAJ=v_maj +AC_SUBST(VMAJ) AC_DEFINE_UNQUOTED([SHARED_LIB_SUFFIX], ["$shrext_cmds"], [Suffix for shared objects]) diff --git a/edje.pc.in b/edje.pc.in index 3166082..815730f 100644 --- a/edje.pc.in +++ b/edje.pc.in @@ -11,4 +11,4 @@ Description: Enlightened graphical design and layout engine. Version: @VERSION@ Libs: -L${libdir} -ledje Libs.private: @lua_libs@ -Cflags: -I${includedir} +Cflags: -I${includedir}/edje-@VMAJ@ diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am index 4d91325..80a3e4e 100644 --- a/src/lib/Makefile.am +++ b/src/lib/Makefile.am @@ -16,7 +16,8 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libedje.la -include_HEADERS = Edje.h Edje_Edit.h edje_convert.h +includes_HEADERS = Edje.h Edje_Edit.h edje_convert.h +includesdir = $(includedir)/edje-@VMAJ@ base_sources = \ edje_calc.c \ -- 2.7.4