summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--Makefile.am2
-rw-r--r--config/.gitignore4
-rw-r--r--config/Makefile.am8
-rw-r--r--config/default/Makefile.am8
-rw-r--r--config/mobile/Makefile.am8
-rw-r--r--config/standard/Makefile.am8
-rw-r--r--configure.ac7
-rw-r--r--src/Makefile_Eet_Helper.am13
8 files changed, 41 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index 0e1d321e07..73102dac44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@ AM_MAKEFLAGS = --no-print-directory
3AM_DISTCHECK_CONFIGURE_FLAGS = \ 3AM_DISTCHECK_CONFIGURE_FLAGS = \
4--with-tests=regular 4--with-tests=regular
5 5
6SUBDIRS = src data doc 6SUBDIRS = src data config doc
7 7
8if HAVE_PO 8if HAVE_PO
9 9
diff --git a/config/.gitignore b/config/.gitignore
index d5b414900b..fb84a6a5b1 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -3,3 +3,7 @@
3/default/base.cfg 3/default/base.cfg
4/mobile/base.cfg 4/mobile/base.cfg
5/standard/base.cfg 5/standard/base.cfg
6
7/default/base.src
8/mobile/base.src
9/standard/base.src
diff --git a/config/Makefile.am b/config/Makefile.am
index e1381b16ba..690067909d 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,7 +1,7 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2SUBDIRS = default standard mobile 2SUBDIRS = default standard mobile
3 3
4EET_EET = @eet_eet@ 4include ../src/Makefile_Eet_Helper.am
5 5
6EXTRA_DIST = profile.src 6EXTRA_DIST = profile.src
7 7
@@ -10,9 +10,9 @@ filesdir = $(datadir)/elementary/config
10files_DATA = profile.cfg 10files_DATA = profile.cfg
11 11
12%.cfg: %.src 12%.cfg: %.src
13 $(EET_EET) -i \ 13 $(AM_V_EET) \
14 $(top_builddir)/config/$@ config \ 14 $(MKDIR_P) $(top_builddir)/config/; \
15 $< 0 15 $(EET) -i $(top_builddir)/config/$@ config $< 0
16 16
17clean-local: 17clean-local:
18 rm -rf *.cfg *~ 18 rm -rf *.cfg *~
diff --git a/config/default/Makefile.am b/config/default/Makefile.am
index 76c171c57a..6211ff7e1f 100644
--- a/config/default/Makefile.am
+++ b/config/default/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EET_EET = @eet_eet@ 3include ../../src/Makefile_Eet_Helper.am
4 4
5EXTRA_DIST = \ 5EXTRA_DIST = \
6 profile.desktop \ 6 profile.desktop \
@@ -14,9 +14,9 @@ files_DATA = \
14 base.cfg 14 base.cfg
15 15
16%.cfg: %.src 16%.cfg: %.src
17 $(EET_EET) -e \ 17 $(AM_V_EET) \
18 $(top_builddir)/config/default/$@ config \ 18 $(MKDIR_P) $(top_builddir)/config/default/; \
19 $< 1 19 $(EET) -e $(top_builddir)/config/default/$@ config $< 1
20 20
21clean-local: 21clean-local:
22 rm -rf *.cfg *~ 22 rm -rf *.cfg *~
diff --git a/config/mobile/Makefile.am b/config/mobile/Makefile.am
index 0535aa8c31..7cdfbd5881 100644
--- a/config/mobile/Makefile.am
+++ b/config/mobile/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EET_EET = @eet_eet@ 3include ../../src/Makefile_Eet_Helper.am
4 4
5EXTRA_DIST = \ 5EXTRA_DIST = \
6 profile.desktop \ 6 profile.desktop \
@@ -14,9 +14,9 @@ files_DATA = \
14 base.cfg 14 base.cfg
15 15
16%.cfg: %.src 16%.cfg: %.src
17 $(EET_EET) -e \ 17 $(AM_V_EET) \
18 $(top_builddir)/config/mobile/$@ config \ 18 $(MKDIR_P) $(top_builddir)/config/; \
19 $< 1 19 $(EET) -e $(top_builddir)/config/mobile/$@ config $< 1
20 20
21clean-local: 21clean-local:
22 rm -rf *.cfg *~ 22 rm -rf *.cfg *~
diff --git a/config/standard/Makefile.am b/config/standard/Makefile.am
index 5c7038fe96..3dd3c88c68 100644
--- a/config/standard/Makefile.am
+++ b/config/standard/Makefile.am
@@ -1,6 +1,6 @@
1MAINTAINERCLEANFILES = Makefile.in 1MAINTAINERCLEANFILES = Makefile.in
2 2
3EET_EET = @eet_eet@ 3include ../../src/Makefile_Eet_Helper.am
4 4
5EXTRA_DIST = \ 5EXTRA_DIST = \
6 profile.desktop \ 6 profile.desktop \
@@ -14,9 +14,9 @@ files_DATA = \
14 base.cfg 14 base.cfg
15 15
16%.cfg: %.src 16%.cfg: %.src
17 $(EET_EET) -e \ 17 $(AM_V_EET) \
18 $(top_builddir)/config/standard/$@ config \ 18 $(MKDIR_P) $(top_builddir)/config/standard/; \
19 $< 1 19 $(EET) -e $(top_builddir)/config/standard/$@ config $< 1
20 20
21clean-local: 21clean-local:
22 rm -rf *.cfg *~ 22 rm -rf *.cfg *~
diff --git a/configure.ac b/configure.ac
index 30910d909e..cc12979bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5376,6 +5376,13 @@ EFL_LIB_END_OPTIONAL([ELEMENTARY_JS])
5376AC_CONFIG_FILES([ 5376AC_CONFIG_FILES([
5377Makefile 5377Makefile
5378data/Makefile 5378data/Makefile
5379config/Makefile
5380config/default/Makefile
5381config/default/base.src
5382config/mobile/Makefile
5383config/mobile/base.src
5384config/standard/Makefile
5385config/standard/base.src
5379doc/Makefile 5386doc/Makefile
5380doc/Doxyfile 5387doc/Doxyfile
5381doc/previews/Makefile 5388doc/previews/Makefile
diff --git a/src/Makefile_Eet_Helper.am b/src/Makefile_Eet_Helper.am
new file mode 100644
index 0000000000..3275a675b8
--- /dev/null
+++ b/src/Makefile_Eet_Helper.am
@@ -0,0 +1,13 @@
1if HAVE_EET_EET
2EET = @eet_eet@
3else
4EET = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eet/eet
5endif
6EET_FLAGS_VERBOSE = $(EET_FLAGS_VERBOSE_@AM_V@)
7EET_FLAGS_VERBOSE_ = $(EET_FLAGS_VERBOSE_@AM_DEFAULT_V@)
8EET_FLAGS_VERBOSE_1 = -v
9EET_FLAGS = $(EET_FLAGS_VERBOSE)
10
11AM_V_EET = $(am__v_EET_@AM_V@)
12am__v_EET_ = $(am__v_EET_@AM_DEFAULT_V@)
13am__v_EET_0 = @echo " EET " $@;