summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 01:15:45 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-12 01:15:45 +0000
commit34f53151414bcdf44ec81e582b007f74da595694 (patch)
tree863058f0d94e9d39998774a375aa6d242d8714a4 /Makefile.am
parentae51833bac7ba5f72bd40a96beb13081c8d573f6 (diff)
merge ethumb.
This one was a painful bitch. The edbus2 port was quite broken, mainly leaking eina_stringshare and also not adding the '\0' to the strings that are represented as bytearray (paths cannot be utf8 to avoid translations). Emotion plugin was also quite bogus and the video thumbnail as edje (animated) is not working yet due bug in Edje_Edit api -- someone needs to investigate this, seems strange. Emotion plugin also had a bug that it was deleting the object from inside object callback. Now it seems to work. Please report if it does not. SVN revision: 82675
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am10
1 files changed, 8 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index c0f08f1b26..f377199d42 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,6 +62,7 @@ old/ChangeLog.eio \
62old/ChangeLog.embryo \ 62old/ChangeLog.embryo \
63old/ChangeLog.emotion \ 63old/ChangeLog.emotion \
64old/ChangeLog.escape \ 64old/ChangeLog.escape \
65old/ChangeLog.ethumb \
65old/ChangeLog.evas \ 66old/ChangeLog.evas \
66old/ChangeLog.evil \ 67old/ChangeLog.evil \
67old/ChangeLog.evil.0 \ 68old/ChangeLog.evil.0 \
@@ -75,6 +76,7 @@ old/NEWS.eio \
75old/NEWS.embryo \ 76old/NEWS.embryo \
76old/NEWS.emotion \ 77old/NEWS.emotion \
77old/NEWS.escape \ 78old/NEWS.escape \
79old/NEWS.ethumb \
78old/NEWS.evas \ 80old/NEWS.evas \
79old/NEWS.evil \ 81old/NEWS.evil \
80old/README.ecore \ 82old/README.ecore \
@@ -89,6 +91,7 @@ old/README.embryo \
89old/README.emotion \ 91old/README.emotion \
90old/README.ephysics \ 92old/README.ephysics \
91old/README.escape \ 93old/README.escape \
94old/README.ethumb \
92old/README.evas \ 95old/README.evas \
93old/README.evil \ 96old/README.evil \
94spec/efl.spec 97spec/efl.spec
@@ -125,7 +128,9 @@ pc/efreet.pc \
125pc/efreet-mime.pc \ 128pc/efreet-mime.pc \
126pc/efreet-trash.pc \ 129pc/efreet-trash.pc \
127pc/edje.pc \ 130pc/edje.pc \
128pc/emotion.pc 131pc/emotion.pc \
132pc/ethumb.pc \
133pc/ethumb_client.pc
129 134
130if BUILD_ENGINE_SOFTWARE_X11 135if BUILD_ENGINE_SOFTWARE_X11
131pkgconfig_DATA += pc/evas-software-x11.pc 136pkgconfig_DATA += pc/evas-software-x11.pc
@@ -216,7 +221,8 @@ endif
216 221
217servicedir = @dbusservicedir@ 222servicedir = @dbusservicedir@
218service_DATA = \ 223service_DATA = \
219dbus-services/org.enlightenment.Efreet.service 224dbus-services/org.enlightenment.Efreet.service \
225dbus-services/org.enlightenment.Ethumb.service
220 226
221 227
222 228