From 196455c7a388fca9d7eefffbeb72954f30677d5f Mon Sep 17 00:00:00 2001
From: Cedric BAIL <cedric@osg.samsung.com>
Date: Wed, 30 Mar 2016 14:14:58 -0700
Subject: [PATCH] elementary: add config back in.

---
 Makefile.am                 |  2 +-
 config/.gitignore           |  4 ++++
 config/Makefile.am          |  8 ++++----
 config/default/Makefile.am  |  8 ++++----
 config/mobile/Makefile.am   |  8 ++++----
 config/standard/Makefile.am |  8 ++++----
 configure.ac                |  7 +++++++
 src/Makefile_Eet_Helper.am  | 13 +++++++++++++
 8 files changed, 41 insertions(+), 17 deletions(-)
 create mode 100644 src/Makefile_Eet_Helper.am

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
 AM_DISTCHECK_CONFIGURE_FLAGS = \
 --with-tests=regular
 
-SUBDIRS = src data doc
+SUBDIRS = src data config doc
 
 if HAVE_PO
 
diff --git a/config/.gitignore b/config/.gitignore
index d5b414900b..fb84a6a5b1 100644
--- a/config/.gitignore
+++ b/config/.gitignore
@@ -3,3 +3,7 @@
 /default/base.cfg
 /mobile/base.cfg
 /standard/base.cfg
+
+/default/base.src
+/mobile/base.src
+/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 @@
 MAINTAINERCLEANFILES = Makefile.in
 SUBDIRS = default standard mobile
 
-EET_EET = @eet_eet@
+include ../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = profile.src
 
@@ -10,9 +10,9 @@ filesdir = $(datadir)/elementary/config
 files_DATA = profile.cfg
 
 %.cfg: %.src
-	$(EET_EET) -i \
-	$(top_builddir)/config/$@ config \
-	$< 0
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/; \
+	$(EET) -i $(top_builddir)/config/$@ config $< 0
 
 clean-local:
 	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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EET_EET = @eet_eet@
+include ../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = \
         profile.desktop \
@@ -14,9 +14,9 @@ files_DATA = \
         base.cfg
 
 %.cfg: %.src
-	$(EET_EET) -e \
-	$(top_builddir)/config/default/$@ config \
-	$< 1
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/default/; \
+	$(EET) -e $(top_builddir)/config/default/$@ config $< 1
 
 clean-local:
 	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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EET_EET = @eet_eet@
+include ../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = \
         profile.desktop \
@@ -14,9 +14,9 @@ files_DATA = \
         base.cfg
 
 %.cfg: %.src
-	$(EET_EET) -e \
-	$(top_builddir)/config/mobile/$@ config \
-	$< 1
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/; \
+	$(EET) -e $(top_builddir)/config/mobile/$@ config $< 1
 
 clean-local:
 	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 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-EET_EET = @eet_eet@
+include ../../src/Makefile_Eet_Helper.am
 
 EXTRA_DIST = \
         profile.desktop \
@@ -14,9 +14,9 @@ files_DATA = \
         base.cfg
 
 %.cfg: %.src
-	$(EET_EET) -e \
-	$(top_builddir)/config/standard/$@ config \
-	$< 1
+	$(AM_V_EET) \
+	$(MKDIR_P) $(top_builddir)/config/standard/; \
+	$(EET) -e $(top_builddir)/config/standard/$@ config $< 1
 
 clean-local:
 	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])
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
+config/Makefile
+config/default/Makefile
+config/default/base.src
+config/mobile/Makefile
+config/mobile/base.src
+config/standard/Makefile
+config/standard/base.src
 doc/Makefile
 doc/Doxyfile
 doc/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 @@
+if HAVE_EET_EET
+EET = @eet_eet@
+else
+EET = EFL_RUN_IN_TREE=1 $(top_builddir)/src/bin/eet/eet
+endif
+EET_FLAGS_VERBOSE = $(EET_FLAGS_VERBOSE_@AM_V@)
+EET_FLAGS_VERBOSE_ = $(EET_FLAGS_VERBOSE_@AM_DEFAULT_V@)
+EET_FLAGS_VERBOSE_1 = -v
+EET_FLAGS = $(EET_FLAGS_VERBOSE)
+
+AM_V_EET = $(am__v_EET_@AM_V@)
+am__v_EET_ = $(am__v_EET_@AM_DEFAULT_V@)
+am__v_EET_0 = @echo "  EET     " $@;