kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: add config back in.

This commit is contained in:
Cedric BAIL 2016-03-30 14:14:58 -07:00
parent 1f4c7f171b
commit 196455c7a3
8 changed files with 41 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -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

4
config/.gitignore vendored
View File

@ -3,3 +3,7 @@
/default/base.cfg
/mobile/base.cfg
/standard/base.cfg
/default/base.src
/mobile/base.src
/standard/base.src

8
config/Makefile.am
View File

@ -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 *~

8
config/default/Makefile.am
View File

@ -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 *~

8
config/mobile/Makefile.am
View File

@ -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 *~

8
config/standard/Makefile.am
View File

@ -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 *~

7
configure.ac
View File

@ -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

13
src/Makefile_Eet_Helper.am Normal file
View File

@ -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 " $@;