summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2010-08-16 08:03:21 +0000
committerCarsten Haitzler <raster@rasterman.com>2010-08-16 08:03:21 +0000
commitaee8014df642d1890a91a18226fb140cd682c2b6 (patch)
tree5681ea6a3ff66b2cc4bddef1c1813341b3e98f9c
parentf00427bdf143661467eeacbe7977e949ed75d329 (diff)
actually fix - eina.pc should now be used. consistency with the rest
of efl. SVN revision: 51160
-rw-r--r--legacy/eina/Makefile.am4
-rw-r--r--legacy/eina/configure.ac2
-rw-r--r--legacy/eina/eina-1.pc.in12
-rw-r--r--legacy/eina/eina.pc.in4
4 files changed, 5 insertions, 17 deletions
diff --git a/legacy/eina/Makefile.am b/legacy/eina/Makefile.am
index 0afa8ad32a..13a622194d 100644
--- a/legacy/eina/Makefile.am
+++ b/legacy/eina/Makefile.am
@@ -19,7 +19,7 @@ ltmain.sh \
19missing 19missing
20 20
21pkgconfigdir = $(libdir)/pkgconfig 21pkgconfigdir = $(libdir)/pkgconfig
22pkgconfig_DATA = eina-1.pc 22pkgconfig_DATA = eina.pc
23 23
24EXTRA_DIST = \ 24EXTRA_DIST = \
25AUTHORS \ 25AUTHORS \
@@ -27,7 +27,7 @@ COPYING \
27README \ 27README \
28$(pkgconfig_DATA) \ 28$(pkgconfig_DATA) \
29autogen.sh \ 29autogen.sh \
30eina-1.pc.in \ 30eina.pc.in \
31eina.spec \ 31eina.spec \
32eina.spec.in \ 32eina.spec.in \
33m4/ac_attribute.m4 \ 33m4/ac_attribute.m4 \
diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac
index d4870ad9fd..7c88fad84b 100644
--- a/legacy/eina/configure.ac
+++ b/legacy/eina/configure.ac
@@ -555,7 +555,7 @@ AC_SUBST(requirement_eina)
555 555
556AC_CONFIG_FILES([ 556AC_CONFIG_FILES([
557Makefile 557Makefile
558eina-1.pc 558eina.pc
559eina.spec 559eina.spec
560doc/Makefile 560doc/Makefile
561src/Makefile 561src/Makefile
diff --git a/legacy/eina/eina-1.pc.in b/legacy/eina/eina-1.pc.in
deleted file mode 100644
index 1a5a745253..0000000000
--- a/legacy/eina/eina-1.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
1prefix=@prefix@
2exec_prefix=@exec_prefix@
3libdir=@libdir@
4includedir=@includedir@
5
6Name: Eina
7Description: A Library that implements fast data types and miscellaneous tools
8@pkgconfig_requires_private@: @requirement_eina@
9Version: @VERSION@
10Libs: -L${libdir} -leina
11Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl
12Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina
diff --git a/legacy/eina/eina.pc.in b/legacy/eina/eina.pc.in
index 6089ac6bce..1a5a745253 100644
--- a/legacy/eina/eina.pc.in
+++ b/legacy/eina/eina.pc.in
@@ -4,9 +4,9 @@ libdir=@libdir@
4includedir=@includedir@ 4includedir=@includedir@
5 5
6Name: Eina 6Name: Eina
7Description: Eina 7Description: A Library that implements fast data types and miscellaneous tools
8@pkgconfig_requires_private@: @requirement_eina@ 8@pkgconfig_requires_private@: @requirement_eina@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -leina 10Libs: -L${libdir} -leina
11Libs.private: -ldl 11Libs.private: @EFL_FNMATCH_LIBS@ @EFL_PTHREAD_LIBS@ -ldl
12Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina 12Cflags: -I${includedir}/eina-@VMAJ@ -I${includedir}/eina-@VMAJ@/eina