aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-10 03:43:32 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-10 03:43:32 +0000
commitdfb84c1657bfb14a5236b881193b81f4c0b8a69b (patch)
treeb51b210fc88a21eec8e5907b8bbfe12ebc669f90 /Makefile.am
parentefl: forward typedef to avoid including useless headers. (diff)
downloadefl-dfb84c1657bfb14a5236b881193b81f4c0b8a69b.tar.gz
efl: merge emotion.
this one was quite a huge work, but hopefully it's correct. NOTES: * removed vlc generic module, it should go into a separate package. * gstreamer is enabled by default (see --disable-gstreamer) * xine is disabled by default (see --enable-gstreamer) * generic is always built statically if supported * gstreamer and xine can't be configured as static (just lacks command line options, build system supports it) * v4l2 is enabled by default on linux if eeze is built (see --disable-v4l2) * emotion_test moved to src/tests/emotion and depends on EFL_ENABLE_TESTS (--with-tests), but is still installed if enabled. TODO (need your help!): * fix warnings with gstreamer and xine engine * call engine shutdown functions if building as static * remove direct usage of PACKAGE_*_DIR and use eina_prefix * add eina_prefix checkme file as evas and others * add support for $EFL_RUN_IN_TREE * create separate package for emotion_generic_modules * check docs hierarchy (doxygen is segv'in here) SVN revision: 82501
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index a24e6448dc..c0f08f1b26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,6 +60,7 @@ old/ChangeLog.efreet \
old/ChangeLog.eina \
old/ChangeLog.eio \
old/ChangeLog.embryo \
+old/ChangeLog.emotion \
old/ChangeLog.escape \
old/ChangeLog.evas \
old/ChangeLog.evil \
@@ -72,6 +73,7 @@ old/NEWS.efreet \
old/NEWS.eina \
old/NEWS.eio \
old/NEWS.embryo \
+old/NEWS.emotion \
old/NEWS.escape \
old/NEWS.evas \
old/NEWS.evil \
@@ -84,6 +86,7 @@ old/README.efreet \
old/README.eina \
old/README.eio \
old/README.embryo \
+old/README.emotion \
old/README.ephysics \
old/README.escape \
old/README.evas \
@@ -121,7 +124,8 @@ pc/edbus2.pc \
pc/efreet.pc \
pc/efreet-mime.pc \
pc/efreet-trash.pc \
-pc/edje.pc
+pc/edje.pc \
+pc/emotion.pc
if BUILD_ENGINE_SOFTWARE_X11
pkgconfig_DATA += pc/evas-software-x11.pc