summaryrefslogtreecommitdiff
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
parent532284dbbe4259a9f2291f44d3eff376849e8031 (diff)
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 \
60old/ChangeLog.eina \ 60old/ChangeLog.eina \
61old/ChangeLog.eio \ 61old/ChangeLog.eio \
62old/ChangeLog.embryo \ 62old/ChangeLog.embryo \
63old/ChangeLog.emotion \
63old/ChangeLog.escape \ 64old/ChangeLog.escape \
64old/ChangeLog.evas \ 65old/ChangeLog.evas \
65old/ChangeLog.evil \ 66old/ChangeLog.evil \
@@ -72,6 +73,7 @@ old/NEWS.efreet \
72old/NEWS.eina \ 73old/NEWS.eina \
73old/NEWS.eio \ 74old/NEWS.eio \
74old/NEWS.embryo \ 75old/NEWS.embryo \
76old/NEWS.emotion \
75old/NEWS.escape \ 77old/NEWS.escape \
76old/NEWS.evas \ 78old/NEWS.evas \
77old/NEWS.evil \ 79old/NEWS.evil \
@@ -84,6 +86,7 @@ old/README.efreet \
84old/README.eina \ 86old/README.eina \
85old/README.eio \ 87old/README.eio \
86old/README.embryo \ 88old/README.embryo \
89old/README.emotion \
87old/README.ephysics \ 90old/README.ephysics \
88old/README.escape \ 91old/README.escape \
89old/README.evas \ 92old/README.evas \
@@ -121,7 +124,8 @@ pc/edbus2.pc \
121pc/efreet.pc \ 124pc/efreet.pc \
122pc/efreet-mime.pc \ 125pc/efreet-mime.pc \
123pc/efreet-trash.pc \ 126pc/efreet-trash.pc \
124pc/edje.pc 127pc/edje.pc \
128pc/emotion.pc
125 129
126if BUILD_ENGINE_SOFTWARE_X11 130if BUILD_ENGINE_SOFTWARE_X11
127pkgconfig_DATA += pc/evas-software-x11.pc 131pkgconfig_DATA += pc/evas-software-x11.pc