diff options
| author | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-04 02:08:14 +0000 |
|---|---|---|
| committer | Gustavo Sverzut Barbieri <barbieri@gmail.com> | 2013-01-04 02:08:14 +0000 |
| commit | 9ea2ce1041549c90f94062ce5ec145056e7fbdfa (patch) | |
| tree | 3bcd3fb016bc498a72ff99c8d67c8b7ef2d91718 /Makefile.am | |
| parent | e2ce20e9a4dfd12bb383a1b60032f2ef7b507850 (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.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ce6c93aeb..ac56f4107 100644 --- a/Makefile.am +++ b/Makefile.am @@ -100,7 +100,8 @@ pc/efreet.pc \ pc/efreet-mime.pc \ pc/efreet-trash.pc \ pc/eeze.pc \ -pc/ephysics.pc +pc/ephysics.pc \ +pc/edje.pc pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = @@ -132,7 +133,8 @@ pc/eio.pc \ pc/edbus2.pc \ pc/efreet.pc \ pc/efreet-mime.pc \ -pc/efreet-trash.pc +pc/efreet-trash.pc \ +pc/edje.pc if BUILD_ENGINE_SOFTWARE_X11 pkgconfig_DATA += pc/evas-software-x11.pc |