summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2010-12-09 18:39:08 +0000
committerVincent Torri <vincent.torri@gmail.com>2010-12-09 18:39:08 +0000
commit78a75afd7b41c1e91e5cccf9851bf9754a58cd92 (patch)
tree06ea74d9874d47338596b44de8aa5588292c7cab /legacy
parent7c995d2f1697d935e99438a8baec5090be429755 (diff)
first step toward DSO solution. see ticket #644
SVN revision: 55431
Diffstat (limited to 'legacy')
-rw-r--r--legacy/edje/configure.ac23
-rw-r--r--legacy/edje/src/bin/Makefile.am51
2 files changed, 53 insertions, 21 deletions
diff --git a/legacy/edje/configure.ac b/legacy/edje/configure.ac
index e9b7ddea66..adefe571f2 100644
--- a/legacy/edje/configure.ac
+++ b/legacy/edje/configure.ac
@@ -287,12 +287,29 @@ PKG_CHECK_MODULES([ECORE_IMF],
287# Dependencies for the binaries 287# Dependencies for the binaries
288 288
289if test "x$have_edje_cc" = "xyes"; then 289if test "x$have_edje_cc" = "xyes"; then
290 PKG_CHECK_MODULES([ECORE_FILE], [ecore-file >= 1.0.0]) 290 PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
291 PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0]) 291 EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
292fi
293
294if test "x$have_edje_decc" = "xyes"; then
295 PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
292fi 296fi
293 297
294if test "x$have_edje_player" = "xyes"; then 298if test "x$have_edje_player" = "xyes"; then
295 PKG_CHECK_MODULES([ECORE_EVAS], [ecore-evas >= 1.0.0]) 299 PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
300fi
301
302if test "x$have_edje_convert" = "xyes"; then
303 PKG_CHECK_MODULES([EDJE_CONVERT], [eet >= 1.0.0 eina >= 1.0.0])
304 EDJE_CONVERT_LIBS="${EDJE_CONVERT_LIBS} ${LUA_LIBS} ${lua_libs}"
305fi
306
307if test "x$have_edje_inspector" = "xyes"; then
308 PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
309fi
310
311if test "x$have_edje_external_inspector" = "xyes"; then
312 PKG_CHECK_MODULES([EDJE_EXTERNAL_INSPECTOR], [ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
296fi 313fi
297 314
298 315
diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am
index 2d2921045e..5056c86bf1 100644
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@@ -1,18 +1,6 @@
1 1
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4AM_CPPFLAGS = \
5-I$(top_srcdir) \
6-I$(top_srcdir)/src/bin \
7-I$(top_srcdir)/src/lib \
8-DPACKAGE_BIN_DIR=\"$(bindir)\" \
9-DPACKAGE_LIB_DIR=\"$(libdir)\" \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
11@EDJE_CFLAGS@ \
12@ECORE_EVAS_CFLAGS@ \
13@ECORE_FILE_CFLAGS@ \
14@EVIL_CFLAGS@
15
16bin_SCRIPTS = @EDJE_RECC_PRG@ 4bin_SCRIPTS = @EDJE_RECC_PRG@
17 5
18bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_CONVERT_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@ 6bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_CONVERT_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
@@ -28,7 +16,14 @@ edje_cc_handlers.c \
28edje_cc_sources.c \ 16edje_cc_sources.c \
29edje_prefix.c 17edje_prefix.c
30 18
31edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS) 19edje_cc_CPPFLAGS = \
20-I$(top_srcdir)/src/bin \
21-I$(top_srcdir)/src/lib \
22-DPACKAGE_BIN_DIR=\"$(bindir)\" \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
25@EDJE_CFLAGS@ @EDJE_CC_CFLAGS@ @EVIL_CFLAGS@
26edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CC_LIBS@ @EVIL_LIBS@
32edje_cc_LDFLAGS = @lt_enable_auto_import@ 27edje_cc_LDFLAGS = @lt_enable_auto_import@
33 28
34 29
@@ -38,23 +33,43 @@ edje_decc.h \
38edje_cc_mem.c \ 33edje_cc_mem.c \
39edje_cc_sources.c 34edje_cc_sources.c
40 35
41edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(ECORE_FILE_LIBS) 36edje_decc_CPPFLAGS = \
37-I$(top_srcdir)/src/bin \
38-I$(top_srcdir)/src/lib \
39@EDJE_CFLAGS@ @EDJE_DECC_CFLAGS@ @EVIL_CFLAGS@
40edje_decc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_DECC_LIBS@
42edje_decc_LDFLAGS = @lt_enable_auto_import@ 41edje_decc_LDFLAGS = @lt_enable_auto_import@
43 42
44edje_player_SOURCES = edje_player.c 43edje_player_SOURCES = edje_player.c
45edje_player_LDADD = $(top_builddir)/src/lib/libedje.la $(ECORE_EVAS_LIBS) $(EVIL_LIBS) 44edje_player_CPPFLAGS = \
45-I$(top_srcdir)/src/bin \
46-I$(top_srcdir)/src/lib \
47@EDJE_PLAYER_CFLAGS@ @EVIL_CFLAGS@
48edje_player_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_PLAYER_LIBS@ @EVIL_LIBS@
46edje_player_LDFLAGS = @lt_enable_auto_import@ 49edje_player_LDFLAGS = @lt_enable_auto_import@
47 50
48edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c 51edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
49edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS) 52edje_convert_CPPFLAGS = \
53-I$(top_srcdir)/src/bin \
54-I$(top_srcdir)/src/lib \
55@EDJE_CFLAGS@ @EDJE_CONVERT_CFLAGS@
56edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CONVERT_LIBS@
50edje_convert_LDFLAGS = @lt_enable_auto_import@ 57edje_convert_LDFLAGS = @lt_enable_auto_import@
51 58
52edje_inspector_SOURCES = edje_inspector.c 59edje_inspector_SOURCES = edje_inspector.c
53edje_inspector_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS) 60edje_inspector_CPPFLAGS = \
61-I$(top_srcdir)/src/bin \
62-I$(top_srcdir)/src/lib \
63@EDJE_INSPECTOR_CFLAGS@
64edje_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_INSPECTOR_LIBS@
54edje_inspector_LDFLAGS = @lt_enable_auto_import@ 65edje_inspector_LDFLAGS = @lt_enable_auto_import@
55 66
56edje_external_inspector_SOURCES = edje_external_inspector.c 67edje_external_inspector_SOURCES = edje_external_inspector.c
57edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la $(EVIL_LIBS) $(ECORE_EVAS_LIBS) $(EVIL_LIBS) 68edje_external_inspector_CPPFLAGS = \
69-I$(top_srcdir)/src/bin \
70-I$(top_srcdir)/src/lib \
71@EDJE_EXTERNAL_INSPECTOR_CFLAGS@
72edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_EXTERNAL_INSPECTOR_LIBS@
58edje_external_inspector_LDFLAGS = @lt_enable_auto_import@ 73edje_external_inspector_LDFLAGS = @lt_enable_auto_import@
59 74
60 75