From dfb84c1657bfb14a5236b881193b81f4c0b8a69b Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Thu, 10 Jan 2013 03:43:32 +0000 Subject: 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 --- src/Makefile.am | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/Makefile.am') diff --git a/src/Makefile.am b/src/Makefile.am index 9dec122..c530955 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -42,6 +42,7 @@ include Makefile_Efreet.am include Makefile_Eeze.am include Makefile_EPhysics.am include Makefile_Edje.am +include Makefile_Emotion.am .PHONY: benchmark examples @@ -80,6 +81,7 @@ clean-local: rm -rf lib/eeze/*.gcno rm -rf lib/ephysics/*.gcno rm -rf lib/edje/*.gcno + rm -rf lib/emotion/*.gcno rm -rf modules/eina/mp/pass_through/*.gcno rm -rf modules/eina/mp/one_big/*.gcno rm -rf modules/eina/mp/chained_pool/*.gcno @@ -119,5 +121,8 @@ clean-local: rm -rf modules/edje/alsa_snd_player/*.gcno rm -rf modules/edje/eet_snd_reader/*.gcno rm -rf modules/edje/multisense_factory/*.gcno + rm -rf modules/emotion/xine/*.gcno + rm -rf modules/emotion/gstreamer/*.gcno + rm -rf modules/emotion/generic/*.gcno rm -rf static_libs/liblinebreak/*.gcno rm -rf static_libs/lz4/*.gcno -- cgit v1.1