summaryrefslogtreecommitdiff
path: root/legacy/emotion
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2010-07-09 06:38:12 +0000
committerChristopher Michael <cpmichael1@comcast.net>2010-07-09 06:38:12 +0000
commitf503b5f75b6db6f0588d4eead9738b4bc19a4b2a (patch)
tree8ac3137d23c4c5df8b3ca29a557ed53ee805495d /legacy/emotion
parent5cf875426f5125b0d3d3a313da17012bafb28a03 (diff)
Move Emotion.h to own dir.
SVN revision: 50147
Diffstat (limited to 'legacy/emotion')
-rw-r--r--legacy/emotion/configure.ac2
-rw-r--r--legacy/emotion/emotion.pc.in2
-rw-r--r--legacy/emotion/src/lib/Makefile.am4
3 files changed, 5 insertions, 3 deletions
diff --git a/legacy/emotion/configure.ac b/legacy/emotion/configure.ac
index 66c1f8ea72..c1dec661c0 100644
--- a/legacy/emotion/configure.ac
+++ b/legacy/emotion/configure.ac
@@ -24,7 +24,7 @@ VMIC=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $3);}'`
24SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'` 24SNAP=`echo $PACKAGE_VERSION | awk -F. '{printf("%s", $4);}'`
25version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN" 25version_info=`expr $VMAJ + $VMIN`":$VMIC:$VMIN"
26AC_SUBST(version_info) 26AC_SUBST(version_info)
27 27AC_SUBST(VMAJ)
28 28
29### Needed information 29### Needed information
30 30
diff --git a/legacy/emotion/emotion.pc.in b/legacy/emotion/emotion.pc.in
index a0b1cfad04..5126c3b0bc 100644
--- a/legacy/emotion/emotion.pc.in
+++ b/legacy/emotion/emotion.pc.in
@@ -8,4 +8,4 @@ Description: Emotion evas based multimedia library
8@pkgconfig_requires_private@: @requirement_emotion@ 8@pkgconfig_requires_private@: @requirement_emotion@
9Version: @VERSION@ 9Version: @VERSION@
10Libs: -L${libdir} -lemotion 10Libs: -L${libdir} -lemotion
11Cflags: -I${includedir} 11Cflags: -I${includedir}/emotion-@VMAJ@
diff --git a/legacy/emotion/src/lib/Makefile.am b/legacy/emotion/src/lib/Makefile.am
index 76e69ab52f..862df5dc9d 100644
--- a/legacy/emotion/src/lib/Makefile.am
+++ b/legacy/emotion/src/lib/Makefile.am
@@ -24,7 +24,9 @@ AM_CPPFLAGS += @VLC_CFLAGS@
24endif 24endif
25 25
26lib_LTLIBRARIES = libemotion.la 26lib_LTLIBRARIES = libemotion.la
27include_HEADERS = Emotion.h 27includes_HEADERS = Emotion.h
28includesdir = $(includedir)/emotion-@VMAJ@
29
28libemotion_la_SOURCES = emotion_smart.c 30libemotion_la_SOURCES = emotion_smart.c
29 31
30if EMOTION_STATIC_BUILD_XINE 32if EMOTION_STATIC_BUILD_XINE