summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric Bail <cedric.bail@free.fr>2013-12-01 23:35:43 +0900
committerCedric Bail <cedric.bail@free.fr>2013-12-01 23:35:43 +0900
commitcf7b9d07e0a8cd0c0dcaac0910c01214ae050a43 (patch)
tree874618e0b347ce9e57c51691737aeded5688ab5c
parent005c4b09f2221366df4110e6b99f5dc7f6fd90c7 (diff)
autotools: improve build system to be able to correctly pick outside and inside tools.
-rw-r--r--data/edje_externals/Makefile.am10
-rw-r--r--data/objects/Makefile.am30
-rw-r--r--data/themes/Makefile.am13
-rw-r--r--doc/widgets/Makefile.am6
-rw-r--r--m4/efl_binary.m42
-rw-r--r--src/examples/Makefile.am14
-rw-r--r--src/modules/prefs/Makefile.am8
7 files changed, 33 insertions, 50 deletions
diff --git a/data/edje_externals/Makefile.am b/data/edje_externals/Makefile.am
index b5762b121..a4ae9066d 100644
--- a/data/edje_externals/Makefile.am
+++ b/data/edje_externals/Makefile.am
@@ -1,11 +1,9 @@
1AUTOMAKE_OPTIONS = 1.4 foreign 1AUTOMAKE_OPTIONS = 1.4 foreign
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4EDJE_CC = @edje_cc@ 4include ../../Makefile_Elm_Helpers.am
5EDJE_FLAGS_VERBOSE_ = 5
6EDJE_FLAGS_VERBOSE_0 = 6EDJE_CC_FLAGS += -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals
7EDJE_FLAGS_VERBOSE_1 = -v
8EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/edje_externals -fd $(top_srcdir)/data/edje_externals
9 7
10filesdir = $(datadir)/elementary/edje_externals 8filesdir = $(datadir)/elementary/edje_externals
11files_DATA = icons.edj 9files_DATA = icons.edj
@@ -36,7 +34,7 @@ ico_thumb.png \
36ico_toolbar.png 34ico_toolbar.png
37 35
38icons.edj: Makefile $(EXTRA_DIST) 36icons.edj: Makefile $(EXTRA_DIST)
39 $(EDJE_CC) $(EDJE_FLAGS) \ 37 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
40 $(top_srcdir)/data/edje_externals/icons.edc \ 38 $(top_srcdir)/data/edje_externals/icons.edc \
41 $(top_builddir)/data/edje_externals/icons.edj 39 $(top_builddir)/data/edje_externals/icons.edj
42 40
diff --git a/data/objects/Makefile.am b/data/objects/Makefile.am
index 88c4f1a3b..f18e34743 100644
--- a/data/objects/Makefile.am
+++ b/data/objects/Makefile.am
@@ -1,18 +1,14 @@
1AUTOMAKE_OPTIONS = 1.4 foreign 1AUTOMAKE_OPTIONS = 1.4 foreign
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4EDJE_CC = @edje_cc@ 4include ../../Makefile_Elm_Helpers.am
5EDJE_FLAGS_VERBOSE_ = 5
6EDJE_FLAGS_VERBOSE_0 = 6EDJE_CC_FLAGS += -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
7EDJE_FLAGS_VERBOSE_1 = -v
8EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/objects -fd $(top_srcdir)/data/objects
9 7
10filesdir = $(datadir)/elementary/objects 8filesdir = $(datadir)/elementary/objects
11 9
12files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_custom.edj 10files_DATA = test.edj test_external.edj multip.edj cursors.edj font_preview.edj postit_ent.edj multibuttonentry.edj test_prefs.edj test_prefs.epb test_focus_custom.edj
13 11
14ELM_PREFS_CC = @elm_prefs_cc@
15
16EXTRA_DIST = \ 12EXTRA_DIST = \
17test.edc \ 13test.edc \
18test_external.edc \ 14test_external.edc \
@@ -37,46 +33,46 @@ border5.png \
37border6.png 33border6.png
38 34
39test.edj: Makefile $(EXTRA_DIST) 35test.edj: Makefile $(EXTRA_DIST)
40 $(EDJE_CC) $(EDJE_FLAGS) \ 36 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
41 $(top_srcdir)/data/objects/test.edc \ 37 $(top_srcdir)/data/objects/test.edc \
42 $(top_builddir)/data/objects/test.edj 38 $(top_builddir)/data/objects/test.edj
43 39
44test_external.edj: Makefile $(EXTRA_DIST) 40test_external.edj: Makefile $(EXTRA_DIST)
45 $(EDJE_CC) $(EDJE_FLAGS) \ 41 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
46 $(top_srcdir)/data/objects/test_external.edc \ 42 $(top_srcdir)/data/objects/test_external.edc \
47 $(top_builddir)/data/objects/test_external.edj 43 $(top_builddir)/data/objects/test_external.edj
48 44
49multip.edj: Makefile $(EXTRA_DIST) 45multip.edj: Makefile $(EXTRA_DIST)
50 $(EDJE_CC) $(EDJE_FLAGS) \ 46 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
51 $(top_srcdir)/data/objects/multip.edc \ 47 $(top_srcdir)/data/objects/multip.edc \
52 $(top_builddir)/data/objects/multip.edj 48 $(top_builddir)/data/objects/multip.edj
53 49
54colorpreview.edj: Makefile $(EXTRA_DIST) 50colorpreview.edj: Makefile $(EXTRA_DIST)
55 $(EDJE_CC) $(EDJE_FLAGS) \ 51 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
56 $(top_srcdir)/data/objects/colorpreview.edc \ 52 $(top_srcdir)/data/objects/colorpreview.edc \
57 $(top_builddir)/data/objects/colorpreview.edj 53 $(top_builddir)/data/objects/colorpreview.edj
58 54
59cursors.edj: Makefile $(EXTRA_DIST) 55cursors.edj: Makefile $(EXTRA_DIST)
60 $(EDJE_CC) $(EDJE_FLAGS) \ 56 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
61 $(top_srcdir)/data/objects/cursors.edc \ 57 $(top_srcdir)/data/objects/cursors.edc \
62 $(top_builddir)/data/objects/cursors.edj 58 $(top_builddir)/data/objects/cursors.edj
63 59
64font_preview.edj: Makefile $(EXTRA_DIST) 60font_preview.edj: Makefile $(EXTRA_DIST)
65 $(EDJE_CC) $(EDJE_FLAGS) \ 61 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
66 $(top_srcdir)/data/objects/font_preview.edc \ 62 $(top_srcdir)/data/objects/font_preview.edc \
67 $(top_builddir)/data/objects/font_preview.edj 63 $(top_builddir)/data/objects/font_preview.edj
68 64
69postit_ent.edj: Makefile $(EXTRA_DIST) 65postit_ent.edj: Makefile $(EXTRA_DIST)
70 $(EDJE_CC) $(EDJE_FLAGS) \ 66 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
71 $(top_srcdir)/data/objects/postit_ent.edc \ 67 $(top_srcdir)/data/objects/postit_ent.edc \
72 $(top_builddir)/data/objects/postit_ent.edj 68 $(top_builddir)/data/objects/postit_ent.edj
73multibuttonentry.edj: Makefile $(EXTRA_DIST) 69multibuttonentry.edj: Makefile $(EXTRA_DIST)
74 $(EDJE_CC) $(EDJE_FLAGS) \ 70 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
75 $(top_srcdir)/data/objects/multibuttonentry.edc \ 71 $(top_srcdir)/data/objects/multibuttonentry.edc \
76 $(top_builddir)/data/objects/multibuttonentry.edj 72 $(top_builddir)/data/objects/multibuttonentry.edj
77 73
78test_prefs.edj: Makefile test_prefs.edc 74test_prefs.edj: Makefile test_prefs.edc
79 $(EDJE_CC) $(EDJE_FLAGS) \ 75 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
80 $(top_srcdir)/data/objects/test_prefs.edc \ 76 $(top_srcdir)/data/objects/test_prefs.edc \
81 $(top_builddir)/data/objects/test_prefs.edj 77 $(top_builddir)/data/objects/test_prefs.edj
82 78
@@ -86,7 +82,7 @@ test_prefs.epb: Makefile test_prefs.epc
86 $(top_builddir)/data/objects/test_prefs.epb 82 $(top_builddir)/data/objects/test_prefs.epb
87 83
88test_focus_custom.edj: Makefile test_focus_custom.edc 84test_focus_custom.edj: Makefile test_focus_custom.edc
89 $(EDJE_CC) $(EDJE_FLAGS) \ 85 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
90 $(top_srcdir)/data/objects/test_focus_custom.edc \ 86 $(top_srcdir)/data/objects/test_focus_custom.edc \
91 $(top_builddir)/data/objects/test_focus_custom.edj 87 $(top_builddir)/data/objects/test_focus_custom.edj
92 88
diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am
index 8b65e7f7b..682e5f923 100644
--- a/data/themes/Makefile.am
+++ b/data/themes/Makefile.am
@@ -1,19 +1,16 @@
1AUTOMAKE_OPTIONS = 1.4 foreign 1AUTOMAKE_OPTIONS = 1.4 foreign
2MAINTAINERCLEANFILES = Makefile.in 2MAINTAINERCLEANFILES = Makefile.in
3 3
4EDJE_CC = @edje_cc@ 4include ../../Makefile_Elm_Helpers.am
5EDJE_FLAGS_VERBOSE_ = 5
6EDJE_FLAGS_VERBOSE_0 = 6EDJE_CC_FLAGS += -id $(top_srcdir)/data/themes/img -fd $(top_srcdir)/data/themes/fnt -sd $(top_srcdir)/data/themes/snd
7EDJE_FLAGS_VERBOSE_1 = -v
8EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/img -fd $(top_srcdir)/data/themes/fnt -sd $(top_srcdir)/data/themes/snd
9 7
10filesdir = $(datadir)/elementary/themes 8filesdir = $(datadir)/elementary/themes
11files_DATA = default.edj 9files_DATA = default.edj
12 10
13default.edj: Makefile $(EXTRA_DIST) 11default.edj: Makefile $(EXTRA_DIST)
14 $(EDJE_CC) \ 12 $(AM_V_EDJ)$(EDJE_CC) \
15 -fastdecomp \ 13 $(EDJE_CC_FLAGS) \
16 $(EDJE_FLAGS) \
17 $(top_srcdir)/data/themes/default.edc \ 14 $(top_srcdir)/data/themes/default.edc \
18 $(top_builddir)/data/themes/default.edj 15 $(top_builddir)/data/themes/default.edj
19 16
diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am
index c0544f96d..aaee0666f 100644
--- a/doc/widgets/Makefile.am
+++ b/doc/widgets/Makefile.am
@@ -2,6 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
2 2
3if EFL_BUILD_DOC 3if EFL_BUILD_DOC
4 4
5include ../../Makefile_Elm_Helpers.am
6
5AM_CPPFLAGS = \ 7AM_CPPFLAGS = \
6-I$(top_srcdir) \ 8-I$(top_srcdir) \
7-I$(top_srcdir)/src/lib \ 9-I$(top_srcdir)/src/lib \
@@ -19,12 +21,10 @@ AM_CPPFLAGS = \
19@ELEMENTARY_EWEATHER_CFLAGS@ \ 21@ELEMENTARY_EWEATHER_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ 22@ELEMENTARY_EMAP_CFLAGS@
21 23
22ELM_PREFS_CC = @elm_prefs_cc@
23
24noinst_DATA = widget_preview_prefs.epb 24noinst_DATA = widget_preview_prefs.epb
25 25
26widget_preview_prefs.epb: Makefile widget_preview_prefs.epc 26widget_preview_prefs.epb: Makefile widget_preview_prefs.epc
27 $(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \ 27 $(AM_V_EPB)$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) \
28 $(top_srcdir)/doc/widgets/widget_preview_prefs.epc \ 28 $(top_srcdir)/doc/widgets/widget_preview_prefs.epc \
29 $(top_builddir)/doc/widgets/widget_preview_prefs.epb 29 $(top_builddir)/doc/widgets/widget_preview_prefs.epb
30 30
diff --git a/m4/efl_binary.m4 b/m4/efl_binary.m4
index c77468817..f6262dc73 100644
--- a/m4/efl_binary.m4
+++ b/m4/efl_binary.m4
@@ -53,6 +53,7 @@ AC_DEFUN([EFL_WITH_BIN],
53[ 53[
54 54
55m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl 55m4_pushdef([DOWN], m4_translit([[$2]], [-A-Z], [_a-z]))dnl
56m4_pushdef([UP], m4_translit([[$2]], [-a-z], [_A-Z]))dnl
56 57
57dnl configure option 58dnl configure option
58 59
@@ -66,6 +67,7 @@ AC_MSG_NOTICE(DOWN[ set to ${_efl_with_binary}])
66 67
67with_binary_[]m4_defn([DOWN])=${_efl_with_binary} 68with_binary_[]m4_defn([DOWN])=${_efl_with_binary}
68 69
70AM_CONDITIONAL(HAVE_[]UP, [test "x${_efl_binary_define}" = "xyes"])
69AC_SUBST(DOWN) 71AC_SUBST(DOWN)
70 72
71]) 73])
diff --git a/src/examples/Makefile.am b/src/examples/Makefile.am
index 7184ca10f..fc35c7515 100644
--- a/src/examples/Makefile.am
+++ b/src/examples/Makefile.am
@@ -1,5 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3include ../../Makefile_Elm_Helpers.am
4
3.PHONY: screenshots 5.PHONY: screenshots
4 6
5examplesdir = $(pkgdatadir)/examples 7examplesdir = $(pkgdatadir)/examples
@@ -27,14 +29,6 @@ LDADD = \
27@ELEMENTARY_X_LIBS@ \ 29@ELEMENTARY_X_LIBS@ \
28$(top_builddir)/src/lib/libelementary.la 30$(top_builddir)/src/lib/libelementary.la
29 31
30EDJE_CC = @edje_cc@
31EDJE_FLAGS_VERBOSE_ =
32EDJE_FLAGS_VERBOSE_0 =
33EDJE_FLAGS_VERBOSE_1 = -v
34EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V))
35
36ELM_PREFS_CC = $(top_builddir)/src/bin/@ELM_PREFS_CC_PRG@
37
38ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@ 32ELEMENTARY_CODEGEN = $(top_builddir)/src/bin/@ELEMENTARY_CODEGEN_PRG@
39ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example 33ELEMENTARY_CODEGEN_FLAGS = --prefix=codegen_example
40 34
@@ -148,10 +142,10 @@ win_example.c \
148track_example_01.c 142track_example_01.c
149 143
150.edc.edj: 144.edc.edj:
151 $(EDJE_CC) $(EDJE_FLAGS) $< $@ 145 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
152 146
153.epc.epb: 147.epc.epb:
154 $(ELM_PREFS_CC) $< $@ 148 $(AM_V_EPB)$(ELM_PREFS_CC) $< $@
155 149
156if EFL_INSTALL_EXAMPLES 150if EFL_INSTALL_EXAMPLES
157files_DATA += $(SRCS) \ 151files_DATA += $(SRCS) \
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 6f19bf523..72ded15c0 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -1,10 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EDJE_CC = @edje_cc@ 3include ../../../Makefile_Elm_Helpers.am
4EDJE_FLAGS_VERBOSE_ =
5EDJE_FLAGS_VERBOSE_0 =
6EDJE_FLAGS_VERBOSE_1 = -v
7EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V))
8 4
9EXTRA_DIST = \ 5EXTRA_DIST = \
10elm_prefs_swallow.edc 6elm_prefs_swallow.edc
@@ -13,7 +9,7 @@ filesdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
13files_DATA = elm_prefs_swallow.edj 9files_DATA = elm_prefs_swallow.edj
14 10
15elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc 11elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc
16 $(EDJE_CC) $(EDJE_FLAGS) \ 12 $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
17 $(top_srcdir)/src/modules/prefs/elm_prefs_swallow.edc \ 13 $(top_srcdir)/src/modules/prefs/elm_prefs_swallow.edc \
18 $(top_builddir)/src/modules/prefs/elm_prefs_swallow.edj 14 $(top_builddir)/src/modules/prefs/elm_prefs_swallow.edj
19 15