summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 02:08:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 02:08:14 +0000
commit9ea2ce1041549c90f94062ce5ec145056e7fbdfa (patch)
tree3bcd3fb016bc498a72ff99c8d67c8b7ef2d91718 /Makefile.am
parente2ce20e9a4dfd12bb383a1b60032f2ef7b507850 (diff)
efl: merge edje.
this is still in progress, mostly the multisense stuff is pending. it seems that when we merge ecore_audio in edje the libremix and similar are gone, at least from Edje, and will be in ecore_audio itself (or pulseaudio). Changes: * __UNUSED__ to EINA_UNUSED * binaries (epp, embryo_cc, edje_cc) now consider EFL_RUN_IN_TREE and will assume the binaries are still not installed, running from build tree location (needs more testing, maybe doesn't work with srcdir != builddir, still doesn't solve cross compile builds) SVN revision: 82139
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index ce6c93aeb6..ac56f41074 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -100,7 +100,8 @@ pc/efreet.pc \
100pc/efreet-mime.pc \ 100pc/efreet-mime.pc \
101pc/efreet-trash.pc \ 101pc/efreet-trash.pc \
102pc/eeze.pc \ 102pc/eeze.pc \
103pc/ephysics.pc 103pc/ephysics.pc \
104pc/edje.pc
104 105
105pkgconfigdir = $(libdir)/pkgconfig 106pkgconfigdir = $(libdir)/pkgconfig
106pkgconfig_DATA = 107pkgconfig_DATA =
@@ -132,7 +133,8 @@ pc/eio.pc \
132pc/edbus2.pc \ 133pc/edbus2.pc \
133pc/efreet.pc \ 134pc/efreet.pc \
134pc/efreet-mime.pc \ 135pc/efreet-mime.pc \
135pc/efreet-trash.pc 136pc/efreet-trash.pc \
137pc/edje.pc
136 138
137if BUILD_ENGINE_SOFTWARE_X11 139if BUILD_ENGINE_SOFTWARE_X11
138pkgconfig_DATA += pc/evas-software-x11.pc 140pkgconfig_DATA += pc/evas-software-x11.pc