From 972e8d2acf260c3864bb341a18a0bd02d55da22b Mon Sep 17 00:00:00 2001 From: raster Date: Mon, 20 Oct 2008 04:25:13 +0000 Subject: [PATCH] make eina able to do automake 1.9 and before... :) git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/eina@36833 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- Makefile.am | 11 ++++------- configure.ac | 4 ++-- eina-0.pc.in | 12 ++++++++++++ 3 files changed, 18 insertions(+), 9 deletions(-) create mode 100644 eina-0.pc.in diff --git a/Makefile.am b/Makefile.am index 8df3d5f..b906b01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,9 +4,6 @@ ACLOCAL_AMFLAGS = -I m4 SUBDIRS = src doc -DISTCLEANFILES = \ -eina-@VMAJ@.pc.in - MAINTAINERCLEANFILES = \ Makefile.in \ aclocal.m4 \ @@ -21,15 +18,15 @@ ltconfig \ ltmain.sh \ missing +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = eina-0.pc + EXTRA_DIST = \ AUTHORS \ COPYING \ OLD-COPYING.PLAIN \ README \ -eina-@VMAJ@.pc.in - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = eina-@VMAJ@.pc +$(pkgconfig_DATA) .PHONY: doc coverage benchmark diff --git a/configure.ac b/configure.ac index 29f6416..449aff1 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(1.10 dist-bzip2) +AM_INIT_AUTOMAKE(1.6 dist-bzip2) AM_CONFIG_HEADER(config.h) AC_LIBTOOL_WIN32_DLL @@ -307,7 +307,7 @@ EOF AC_CONFIG_FILES([ Makefile -eina-${VMAJ}.pc +eina-0.pc doc/Makefile src/Makefile src/include/Makefile diff --git a/eina-0.pc.in b/eina-0.pc.in new file mode 100644 index 0000000..f619c47 --- /dev/null +++ b/eina-0.pc.in @@ -0,0 +1,12 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: Eina +Description: A Library that implements fast data types and miscellaneous tools +Requires: +Version: @VERSION@ +Libs: -L${exec_prefix}/lib -leina +Libs.private: -ldl +Cflags: -I${prefix}/include/eina-@VMAJ@ -I${prefix}/include/eina-@VMAJ@/eina -- 2.7.4