diff options
author | Cedric BAIL <cedric@osg.samsung.com> | 2016-03-30 14:14:58 -0700 |
---|---|---|
committer | Cedric BAIL <cedric@osg.samsung.com> | 2016-03-30 14:15:15 -0700 |
commit | 196455c7a388fca9d7eefffbeb72954f30677d5f (patch) | |
tree | 047e8e168134932ae7fd79ffc33a4cbf3c30f19e /config | |
parent | 1f4c7f171b9a2279d08fc64c6155b65bd43af536 (diff) |
elementary: add config back in.
Diffstat (limited to 'config')
-rw-r--r-- | config/.gitignore | 4 | ||||
-rw-r--r-- | config/Makefile.am | 8 | ||||
-rw-r--r-- | config/default/Makefile.am | 8 | ||||
-rw-r--r-- | config/mobile/Makefile.am | 8 | ||||
-rw-r--r-- | config/standard/Makefile.am | 8 |
5 files changed, 20 insertions, 16 deletions
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 @@ | |||
1 | MAINTAINERCLEANFILES = Makefile.in | 1 | MAINTAINERCLEANFILES = Makefile.in |
2 | SUBDIRS = default standard mobile | 2 | SUBDIRS = default standard mobile |
3 | 3 | ||
4 | EET_EET = @eet_eet@ | 4 | include ../src/Makefile_Eet_Helper.am |
5 | 5 | ||
6 | EXTRA_DIST = profile.src | 6 | EXTRA_DIST = profile.src |
7 | 7 | ||
@@ -10,9 +10,9 @@ filesdir = $(datadir)/elementary/config | |||
10 | files_DATA = profile.cfg | 10 | files_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 | ||
17 | clean-local: | 17 | clean-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 @@ | |||
1 | MAINTAINERCLEANFILES = Makefile.in | 1 | MAINTAINERCLEANFILES = Makefile.in |
2 | 2 | ||
3 | EET_EET = @eet_eet@ | 3 | include ../../src/Makefile_Eet_Helper.am |
4 | 4 | ||
5 | EXTRA_DIST = \ | 5 | EXTRA_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 | ||
21 | clean-local: | 21 | clean-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 @@ | |||
1 | MAINTAINERCLEANFILES = Makefile.in | 1 | MAINTAINERCLEANFILES = Makefile.in |
2 | 2 | ||
3 | EET_EET = @eet_eet@ | 3 | include ../../src/Makefile_Eet_Helper.am |
4 | 4 | ||
5 | EXTRA_DIST = \ | 5 | EXTRA_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 | ||
21 | clean-local: | 21 | clean-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 @@ | |||
1 | MAINTAINERCLEANFILES = Makefile.in | 1 | MAINTAINERCLEANFILES = Makefile.in |
2 | 2 | ||
3 | EET_EET = @eet_eet@ | 3 | include ../../src/Makefile_Eet_Helper.am |
4 | 4 | ||
5 | EXTRA_DIST = \ | 5 | EXTRA_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 | ||
21 | clean-local: | 21 | clean-local: |
22 | rm -rf *.cfg *~ | 22 | rm -rf *.cfg *~ |