summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-12-04 17:40:58 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-12-04 17:40:58 +0000
commit81c86b19f6b432c5d6701bd025d5b2cf308fba4c (patch)
tree44f76300c96fddf3be01d97afb3025227350ee92 /Makefile.am
parent633e29c5a50fa1a1087df88d8d9859c79a83e486 (diff)
merge: eio + fix compilation on windows + minor fixes + po files
don't move eio to IN-EFL right now SVN revision: 80180
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am11
1 files changed, 8 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index b59b22074f..0cca9c24c4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,7 +41,10 @@ m4/eina_check.m4 \
41m4/eina_config.m4 \ 41m4/eina_config.m4 \
42m4/evas_check_engine.m4 \ 42m4/evas_check_engine.m4 \
43m4/evas_check_loader.m4 \ 43m4/evas_check_loader.m4 \
44m4/evas_dither.m4 44m4/evas_dither.m4 \
45m4/ecore_check_c_extension.m4 \
46m4/ecore_check_module.m4 \
47m4/eio_check_options.m4
45 48
46EXTRA_DIST += \ 49EXTRA_DIST += \
47autogen.sh \ 50autogen.sh \
@@ -93,7 +96,8 @@ pc/ecore-x.pc \
93pc/ecore-imf.pc \ 96pc/ecore-imf.pc \
94pc/ecore-imf-evas.pc \ 97pc/ecore-imf-evas.pc \
95pc/ecore-evas.pc \ 98pc/ecore-evas.pc \
96pc/embryo.pc 99pc/embryo.pc \
100pc/eio.pc
97 101
98pkgconfigdir = $(libdir)/pkgconfig 102pkgconfigdir = $(libdir)/pkgconfig
99pkgconfig_DATA = 103pkgconfig_DATA =
@@ -120,7 +124,8 @@ pc/ecore-input-evas.pc \
120pc/ecore-imf.pc \ 124pc/ecore-imf.pc \
121pc/ecore-imf-evas.pc \ 125pc/ecore-imf-evas.pc \
122pc/ecore-evas.pc \ 126pc/ecore-evas.pc \
123pc/embryo.pc 127pc/embryo.pc \
128pc/eio.pc
124 129
125if BUILD_ENGINE_SOFTWARE_X11 130if BUILD_ENGINE_SOFTWARE_X11
126pkgconfig_DATA += pc/evas-software-x11.pc 131pkgconfig_DATA += pc/evas-software-x11.pc