feature: use non-recursive makefiles for entire build system

this is the correct way to write a build system. one toplevel Makefile.am with the rest of the directories having include Makefile.mk files.

additional authors:

Iván Briano <ivan.briano@intel.com>
devs/discomfitor/eo
Mike Blumenkrantz 10 years ago committed by Mike Blumenkrantz
parent 0bd3f7d13c
commit e3c85ec4da
  1. 94
      Makefile.am
  2. 20
      config/Makefile.am
  3. 25
      config/Makefile.mk
  4. 27
      config/default/Makefile.am
  5. 12
      config/default/Makefile.mk
  6. 40
      config/mobile/Makefile.am
  7. 26
      config/mobile/Makefile.mk
  8. 43
      config/standard/Makefile.am
  9. 28
      config/standard/Makefile.mk
  10. 123
      configure.ac
  11. 14
      data/Makefile.am
  12. 11
      data/Makefile.mk
  13. 42
      data/backgrounds/Makefile.am
  14. 41
      data/backgrounds/Makefile.mk
  15. 6
      data/desktop/Makefile.am
  16. 5
      data/desktop/Makefile.mk
  17. 16
      data/etc/Makefile.am
  18. 15
      data/etc/Makefile.mk
  19. 11
      data/favorites/Makefile.am
  20. 9
      data/favorites/Makefile.mk
  21. 104
      data/flags/Makefile.am
  22. 103
      data/flags/Makefile.mk
  23. 13
      data/icons/Makefile.am
  24. 12
      data/icons/Makefile.mk
  25. 10
      data/images/Makefile.am
  26. 9
      data/images/Makefile.mk
  27. 12
      data/input_methods/Makefile.am
  28. 11
      data/input_methods/Makefile.mk
  29. 8
      data/tools/Makefile.am
  30. 6
      data/tools/Makefile.mk
  31. 9
      data/units/Makefile.am
  32. 6
      data/units/Makefile.mk
  33. 4
      data/xsession/Makefile.am
  34. 3
      data/xsession/Makefile.mk
  35. 12
      doc/Doxyfile.in
  36. 42
      doc/Makefile.am
  37. 47
      doc/Makefile.mk
  38. 26
      m4/Makefile.mk
  39. 10
      po/Makefile.mk
  40. 2
      src/Makefile.am
  41. 2
      src/Makefile.mk
  42. 457
      src/bin/Makefile.am
  43. 470
      src/bin/Makefile.mk
  44. 62
      src/bin/e_fm/Makefile.am
  45. 56
      src/bin/e_fm/Makefile.mk
  46. 28
      src/bin/e_fm_cmdline.c
  47. 6
      src/bin/e_static_grab.c
  48. 250
      src/modules/Makefile.am
  49. 231
      src/modules/Makefile.mk
  50. 15
      src/modules/Makefile_access.am
  51. 18
      src/modules/Makefile_access.mk
  52. 18
      src/modules/Makefile_appmenu.am
  53. 21
      src/modules/Makefile_appmenu.mk
  54. 14
      src/modules/Makefile_backlight.am
  55. 17
      src/modules/Makefile_backlight.mk
  56. 39
      src/modules/Makefile_battery.am
  57. 43
      src/modules/Makefile_battery.mk
  58. 22
      src/modules/Makefile_bluez4.am
  59. 23
      src/modules/Makefile_bluez4.mk
  60. 16
      src/modules/Makefile_clock.am
  61. 19
      src/modules/Makefile_clock.mk
  62. 17
      src/modules/Makefile_conf.am
  63. 20
      src/modules/Makefile_conf.mk
  64. 32
      src/modules/Makefile_conf2.mk
  65. 19
      src/modules/Makefile_conf_applications.am
  66. 22
      src/modules/Makefile_conf_applications.mk
  67. 19
      src/modules/Makefile_conf_bindings.am
  68. 22
      src/modules/Makefile_conf_bindings.mk
  69. 16
      src/modules/Makefile_conf_comp.am
  70. 19
      src/modules/Makefile_conf_comp.mk
  71. 17
      src/modules/Makefile_conf_dialogs.am
  72. 20
      src/modules/Makefile_conf_dialogs.mk
  73. 21
      src/modules/Makefile_conf_display.am
  74. 24
      src/modules/Makefile_conf_display.mk
  75. 17
      src/modules/Makefile_conf_interaction.am
  76. 20
      src/modules/Makefile_conf_interaction.mk
  77. 17
      src/modules/Makefile_conf_intl.am
  78. 20
      src/modules/Makefile_conf_intl.mk
  79. 16
      src/modules/Makefile_conf_menus.am
  80. 19
      src/modules/Makefile_conf_menus.mk
  81. 17
      src/modules/Makefile_conf_paths.am
  82. 20
      src/modules/Makefile_conf_paths.mk
  83. 18
      src/modules/Makefile_conf_performance.am
  84. 21
      src/modules/Makefile_conf_performance.mk
  85. 21
      src/modules/Makefile_conf_randr.am
  86. 24
      src/modules/Makefile_conf_randr.mk
  87. 17
      src/modules/Makefile_conf_shelves.am
  88. 20
      src/modules/Makefile_conf_shelves.mk
  89. 23
      src/modules/Makefile_conf_theme.am
  90. 26
      src/modules/Makefile_conf_theme.mk
  91. 15
      src/modules/Makefile_conf_wallpaper2.am
  92. 18
      src/modules/Makefile_conf_wallpaper2.mk
  93. 19
      src/modules/Makefile_conf_window_manipulation.am
  94. 22
      src/modules/Makefile_conf_window_manipulation.mk
  95. 17
      src/modules/Makefile_conf_window_remembers.am
  96. 20
      src/modules/Makefile_conf_window_remembers.mk
  97. 22
      src/modules/Makefile_connman.am
  98. 23
      src/modules/Makefile_connman.mk
  99. 21
      src/modules/Makefile_contact.am
  100. 24
      src/modules/Makefile_contact.mk
  101. Some files were not shown because too many files have changed in this diff Show More

@ -1,6 +1,7 @@
SUBDIRS = src data doc config
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = subdir-objects
SUBDIRS = .
if HAVE_PO
@ -8,6 +9,11 @@ SUBDIRS += po
endif
CLEANFILES =
DISTCLEANFILES =
INSTALL_DATA_HOOKS =
PHONIES =
MAINTAINERCLEANFILES = \
ABOUT-NLS* \
Makefile.in \
@ -25,52 +31,45 @@ ltmain.sh \
missing \
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \
m4/libtool.m4 \
m4/lt~obsolete.m4 \
m4/ltoptions.m4 \
m4/ltsugar.m4 \
m4/ltversion.m4 \
m4/codeset.m4 \
m4/gettext.m4 \
m4/glibc21.m4 \
m4/iconv.m4 \
m4/intdiv0.m4 \
m4/inttypes_h.m4 \
m4/inttypes.m4 \
m4/inttypes-pri.m4 \
m4/isc-posix.m4 \
m4/lcmessage.m4 \
m4/lib-ld.m4 \
m4/lib-link.m4 \
m4/lib-prefix.m4 \
m4/nls.m4 \
m4/po.m4 \
m4/progtest.m4 \
m4/stdint_h.m4 \
m4/uintmax_t.m4 \
m4/ulonglong.m4
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2
EXTRA_DIST = \
config.rpath \
README \
AUTHORS \
COPYING \
enlightenment.spec.in \
enlightenment.spec \
enlightenment.pc \
pkgbuild/PKGBUILD \
pkgbuild/enlightenment.install
EDJE_CC = $(EDJE_CC_$(V))
EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY))
EDJE_CC_0 = @echo " EDJE_CC " $@; @edje_cc@
EDJE_CC_1 = @edje_cc@
EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY))
EDJE_FLAGS_VERBOSE_0 =
EDJE_FLAGS_VERBOSE_1 = -v
EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) \
@EDJE_DEF@
include m4/Makefile.mk
if HAVE_PO
MAINTAINERCLEANFILES += \
po/boldquot.sed \
po/en@boldquot.header \
po/en@quot.header \
po/insert-header.sin \
po/Makefile.in.in \
po/Makevars.template \
po/quot.sed \
po/remove-potcdate.sin \
po/Rules-quot
include po/Makefile.mk
endif
DISTCHECK_CONFIGURE_FLAGS = --disable-systemd
EXTRA_DIST = config.rpath README AUTHORS COPYING \
enlightenment.spec.in enlightenment.spec enlightenment.pc \
pkgbuild/PKGBUILD pkgbuild/enlightenment.install
include config/Makefile.mk
include data/Makefile.mk
include src/Makefile.mk
filesdir = $(datadir)/enlightenment/
files_DATA = AUTHORS COPYING
@ -78,8 +77,15 @@ files_DATA = AUTHORS COPYING
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = enlightenment.pc
.PHONY: doc
include doc/Makefile.mk
.PHONY: $(PHONIES)
clean-local: doc-clean
rm -rf config/*.cfg config/*~
rm -rf config/standard/*.cfg config/standard/*~
rm -rf config/mobile/*.cfg config/mobile/*~
rm -rf config/default/*.cfg config/default/*~
rm -f data/themes/*.edj
doc:
@echo "entering doc/"
$(MAKE) -C doc doc
install-data-hook: $(INSTALL_DATA_HOOKS)

@ -1,20 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = default standard mobile
EET_EET = @eet_eet@
EXTRA_DIST = profile.src
filesdir = $(datadir)/enlightenment/data/config
files_DATA = profile.cfg
SUFFIXES = .cfg
.src.cfg:
$(EET_EET) -i \
$(top_builddir)/config/$@ config \
$< 0
clean-local:
rm -rf *.cfg *~

@ -0,0 +1,25 @@
EET_EET = @eet_eet@
EXTRA_DIST += config/profile.src
configfilesdir = $(datadir)/enlightenment/data/config
configfiles_DATA = config/profile.cfg
SUFFIXES = .cfg
.src.cfg:
$(MKDIR_P) $(@D)
$(EET_EET) -e \
$(top_builddir)/$@ config \
$< 0
include config/default/Makefile.mk
include config/standard/Makefile.mk
include config/mobile/Makefile.mk
config/profile.cfg: config/profile.src
$(MKDIR_P) $(@D)
$(EET_EET) -i \
$(top_builddir)/$@ config \
$< 1

@ -1,27 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
profile.desktop \
enlightenment-default.png \
e.src \
e_bindings.src
filesdir = $(datadir)/enlightenment/data/config/default
files_DATA = \
profile.desktop \
enlightenment-default.png \
e.cfg \
e_bindings.cfg
SUFFIXES = .cfg
.src.cfg:
$(EET_EET) -e \
$(top_builddir)/config/default/$@ config \
$< 1
clean-local:
rm -rf *.cfg *~

@ -0,0 +1,12 @@
EXTRA_DIST += \
config/default/profile.desktop \
config/default/enlightenment-default.png \
config/default/e.src \
config/default/e_bindings.src
configdefaultfilesdir = $(datadir)/enlightenment/data/config/default
configdefaultfiles_DATA = \
config/default/profile.desktop \
config/default/enlightenment-default.png \
config/default/e.cfg \
config/default/e_bindings.cfg

@ -1,40 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
profile.desktop \
enlightenment-mobile.png \
e.src \
e_bindings.src \
module.battery.src \
module.illume-home.src \
module.illume-keyboard.src \
module.illume-indicator.src \
module.illume-softkey.src \
module.illume2.src \
module.conf.src
filesdir = $(datadir)/enlightenment/data/config/mobile
files_DATA = \
profile.desktop \
enlightenment-mobile.png \
e.cfg \
e_bindings.cfg \
module.battery.cfg \
module.illume-home.cfg \
module.illume-keyboard.cfg \
module.illume-indicator.cfg \
module.illume-softkey.cfg \
module.illume2.cfg \
module.conf.cfg
SUFFIXES = .cfg
.src.cfg:
$(EET_EET) -e \
$(top_builddir)/config/mobile/$@ config \
$< 1
clean-local:
rm -rf *.cfg *~

@ -0,0 +1,26 @@
EXTRA_DIST += \
config/mobile/profile.desktop \
config/mobile/enlightenment-mobile.png \
config/mobile/e.src \
config/mobile/e_bindings.src \
config/mobile/module.battery.src \
config/mobile/module.illume-home.src \
config/mobile/module.illume-keyboard.src \
config/mobile/module.illume-indicator.src \
config/mobile/module.illume-softkey.src \
config/mobile/module.illume2.src \
config/mobile/module.conf.src
configmobilefilesdir = $(datadir)/enlightenment/data/config/mobile
configmobilefiles_DATA = \
config/mobile/profile.desktop \
config/mobile/enlightenment-mobile.png \
config/mobile/e.cfg \
config/mobile/e_bindings.cfg \
config/mobile/module.battery.cfg \
config/mobile/module.illume-home.cfg \
config/mobile/module.illume-keyboard.cfg \
config/mobile/module.illume-indicator.cfg \
config/mobile/module.illume-softkey.cfg \
config/mobile/module.illume2.cfg \
config/mobile/module.conf.cfg

@ -1,43 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
EET_EET = @eet_eet@
EXTRA_DIST = \
profile.desktop \
enlightenment-standard.png \
e.src \
e_bindings.src \
module.battery.src \
module.cpufreq.src \
module.fileman.src \
module.ibar.src \
module.ibox.src \
module.pager.src \
module.temperature.src \
module.conf.src
filesdir = $(datadir)/enlightenment/data/config/standard
files_DATA = \
profile.desktop \
enlightenment-standard.png \
e.cfg \
e_bindings.cfg \
module.battery.cfg \
module.cpufreq.cfg \
module.fileman.cfg \
module.ibar.cfg \
module.ibox.cfg \
module.pager.cfg \
module.temperature.cfg \
module.conf.cfg
SUFFIXES = .cfg
.src.cfg:
$(EET_EET) -e \
$(top_builddir)/config/standard/$@ config \
$< 1
clean-local:
rm -rf *.cfg *~

@ -0,0 +1,28 @@
EXTRA_DIST += \
config/standard/profile.desktop \
config/standard/enlightenment-standard.png \
config/standard/e.src \
config/standard/e_bindings.src \
config/standard/module.battery.src \
config/standard/module.cpufreq.src \
config/standard/module.fileman.src \
config/standard/module.ibar.src \
config/standard/module.ibox.src \
config/standard/module.pager.src \
config/standard/module.temperature.src \
config/standard/module.conf.src
configstandardfilesdir = $(datadir)/enlightenment/data/config/standard
configstandardfiles_DATA = \
config/standard/profile.desktop \
config/standard/enlightenment-standard.png \
config/standard/e.cfg \
config/standard/e_bindings.cfg \
config/standard/module.battery.cfg \
config/standard/module.cpufreq.cfg \
config/standard/module.fileman.cfg \
config/standard/module.ibar.cfg \
config/standard/module.ibox.cfg \
config/standard/module.pager.cfg \
config/standard/module.temperature.cfg \
config/standard/module.conf.cfg

@ -2,11 +2,11 @@
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
m4_define([v_maj], [0])
m4_define([v_min], [18])
m4_define([v_mic], [0])
dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
m4_define([v_mic], [99])
m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
##-- When released, remove the dnl on the below line
dnl m4_undefine([v_rev])
m4_define([relname], [0.17.99])
m4_define([relname], [0.18.99])
##-- When doing snapshots - change soname. remove dnl on below line
m4_define([relname], [ver-pre-01])
dnl m4_define([v_rel], [-release relname])
@ -18,13 +18,12 @@ m4_define([lt_age], v_min)
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
AC_INIT([enlightenment], [v_ver-rc2], [enlightenment-devel@lists.sourceforge.net])
AC_INIT([enlightenment], [v_ver], [enlightenment-devel@lists.sourceforge.net])
AC_PREREQ([2.52])
AC_CONFIG_SRCDIR([configure.ac])
AC_CONFIG_MACRO_DIR([m4])
AC_CANONICAL_BUILD
AC_CANONICAL_HOST
AC_ISC_POSIX
AC_CONFIG_HEADERS([config.h])
AH_TOP([
@ -36,14 +35,13 @@ AH_BOTTOM([
])
AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AM_SILENT_RULES([yes])
AC_GNU_SOURCE
AC_USE_SYSTEM_EXTENSIONS
AC_PROG_MKDIR_P
AC_C_BIGENDIAN
AC_PROG_CC_C99
AM_PROG_CC_C_O
AC_C_CONST
AC_FUNC_ALLOCA
AC_C___ATTRIBUTE__
@ -59,13 +57,13 @@ AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
version_info="lt_cur:lt_rev:lt_age"
release_info="v_rel"
AC_SUBST(version_info)
AC_SUBST(release_info)
AC_SUBST([version_info])
AC_SUBST([release_info])
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
release=relname
AC_SUBST(release)
AC_SUBST([release])
PKG_PROG_PKG_CONFIG
@ -93,7 +91,7 @@ extern char **environ;
AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
])
efl_version="1.8.0"
efl_version="1.8.99"
AC_SUBST(efl_version)
AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])
@ -112,11 +110,11 @@ if test "x$res" = "xno"; then
fi
fi
AC_SUBST(fnmatch_libs)
AC_SUBST([fnmatch_libs])
have_pam=no
AC_ARG_ENABLE(pam,
AC_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]),
AS_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]),
[want_pam=$enableval],
[want_pam=auto]
)
@ -131,11 +129,11 @@ if test "x$want_pam" != "xno" ; then
fi
dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:])
AC_SUBST(VALGRIND_CFLAGS)
AC_SUBST(VALGRIND_LIBS)
AC_SUBST([VALGRIND_CFLAGS])
AC_SUBST([VALGRIND_LIBS])
MODULE_ARCH="$host_os-$host_cpu-relname"
AC_SUBST(MODULE_ARCH)
AC_SUBST([MODULE_ARCH])
AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
if test "x${bindir}" = 'xNONE'; then
@ -147,7 +145,7 @@ if test "x${bindir}" = 'xNONE'; then
else
PACKAGE_BIN_DIR="${bindir}"
fi
AC_SUBST(PACKAGE_BIN_DIR)
AC_SUBST([PACKAGE_BIN_DIR])
if test "x${libdir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
@ -158,7 +156,7 @@ if test "x${libdir}" = 'xNONE'; then
else
PACKAGE_LIB_DIR="${libdir}"
fi
AC_SUBST(PACKAGE_LIB_DIR)
AC_SUBST([PACKAGE_LIB_DIR])
if test "x${prefix}" = "xNONE"; then
PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
@ -169,15 +167,15 @@ else
LOCALE_DIR="${prefix}/share/locale"
PACKAGE_SYSCONF_DIR="${sysconfdir}"
fi
AC_SUBST(PACKAGE_DATA_DIR)
AC_SUBST(LOCALE_DIR)
AC_SUBST(PACKAGE_SYSCONF_DIR)
AC_SUBST([PACKAGE_DATA_DIR])
AC_SUBST([LOCALE_DIR])
AC_SUBST([PACKAGE_SYSCONF_DIR])
#######################################
## Simple X11 build/link
AC_ARG_ENABLE(simple-x11,
AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]),
AS_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]),
[ want_evas_simple_x11=$enableval ]
)
@ -198,8 +196,8 @@ dnl ],[
dnl AC_MSG_ERROR([Cannot find X headers and libraries.])
dnl ]
dnl )
dnl AC_SUBST(x_cflags)
dnl AC_SUBST(x_libs)
dnl AC_SUBST([x_cflags])
dnl AC_SUBST([x_libs])
cf_cflags=""
cf_libs=""
@ -213,8 +211,8 @@ AC_CHECK_HEADERS(CFBase.h,
]
)
CPPFLAGS="${PCPPFLAGS}"
AC_SUBST(cf_cflags)
AC_SUBST(cf_libs)
AC_SUBST([cf_cflags])
AC_SUBST([cf_libs])
PKG_CHECK_MODULES([BLUEZ], [bluez],
[have_bluetooth="yes"],
@ -296,7 +294,7 @@ dnl fi
#ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW"
# a lot of .po's are broken
ALL_LINGUAS="bg ca cs da de el eo es fi fr fr_CH he hu it ja ko nb nl pl pt_BR ru sk sl sv tr zh_CN zh_TW"
AC_SUBST(ALL_LINGUAS)
AC_SUBST([ALL_LINGUAS])
m4_ifdef([AM_GNU_GETTEXT_VERSION], [
AM_GNU_GETTEXT_VERSION([0.17])
@ -315,7 +313,7 @@ have_po="yes"
have_po="no"
])
])
AC_SUBST(LTLIBINTL)
AC_SUBST([LTLIBINTL])
if test "x$LIBINTL" = "x"; then
LIBINTL="$INTLLIBS"
fi
@ -327,7 +325,7 @@ fi
AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
AC_SUBST(dlopen_libs)
AC_SUBST([dlopen_libs])
AC_MSG_CHECKING([whether to install sysactions.conf])
AC_ARG_ENABLE([install-sysactions],
@ -480,10 +478,7 @@ PKG_CHECK_MODULES(E_THUMB, [
PKG_CHECK_MODULES(E_GRABBER, [
eina >= ${efl_version}
ecore >= ${efl_version}
eet >= ${efl_version}
efreet >= ${efl_version}
ecore-x >= ${efl_version}
])
efm_requires="\
@ -591,10 +586,10 @@ e_libs="$E_LIBS $LIBINTL $fnmatch_libs $execinfo_libs"
e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS"
e_configflags="-DUSE_E_CONFIG_H"
AC_SUBST(e_libs)
AC_SUBST(e_cflags)
AC_SUBST(e_configflags)
AC_SUBST(requirements_e)
AC_SUBST([e_libs])
AC_SUBST([e_cflags])
AC_SUBST([e_configflags])
AC_SUBST([requirements_e])
PKG_CHECK_EXISTS([xkeyboard-config],[
xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config 2>/dev/null`
@ -610,7 +605,7 @@ AC_ARG_WITH(profile,
AC_MSG_NOTICE([Enlightenment build profile set to $profile])
EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6"
EDJE_DEF=$EDJE_DEF" -DE18_PROFILE"=$profile
AC_SUBST(EDJE_DEF)
AC_SUBST([EDJE_DEF])
AC_ARG_WITH(edje-cc,
[ --with-edje-cc=PATH specify a specific path to edje_cc],
@ -621,7 +616,7 @@ AC_ARG_WITH(edje-cc,
],[
edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
])
AC_SUBST(edje_cc)
AC_SUBST([edje_cc])
PKG_CHECK_MODULES(EET, [eet >= ${efl_version}])
AC_ARG_WITH(eet-eet,
@ -633,7 +628,7 @@ AC_ARG_WITH(eet-eet,
],[
eet_eet=$(pkg-config --variable=prefix eet)/bin/eet
])
AC_SUBST(eet_eet)
AC_SUBST([eet_eet])
AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported")
@ -654,7 +649,7 @@ case "$host_os" in
;;
esac
AC_SUBST(BATTERY_LDFLAGS)
AC_SUBST([BATTERY_LDFLAGS])
AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"])
AM_CONDITIONAL(HAVE_TEMPERATURE, false)
@ -671,7 +666,7 @@ define([CHECK_MODULE_MUSIC_CONTROL],
##have_exchange=no
##AC_ARG_ENABLE(exchange,
## AC_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]),
## AS_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]),
## [want_exchange=$enableval],
## [want_exchange=auto]
##)
@ -690,7 +685,7 @@ AM_CONDITIONAL(HAVE_EXCHANGE, false)
have_enotify=no
AM_CONDITIONAL([HAVE_ENOTIFY], [false])
AC_ARG_ENABLE([enotify],
AC_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]),
AS_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]),
[e_cv_want_enotify=$enableval],
AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
)
@ -718,6 +713,7 @@ define([CHECK_MODULE_NOTIFICATION],
fi
])
AM_CONDITIONAL(HAVE_ALSA, false)
define([CHECK_MODULE_MIXER],
[
@ -743,8 +739,8 @@ define([CHECK_MODULE_MIXER],
fi
])
AC_SUBST(SOUND_CFLAGS)
AC_SUBST(SOUND_LIBS)
AC_SUBST([SOUND_CFLAGS])
AC_SUBST([SOUND_LIBS])
AM_CONDITIONAL(HAVE_ECONNMAN, false)
AM_CONDITIONAL(HAVE_DUMMY, false)
@ -753,8 +749,8 @@ define([CHECK_MODULE_CONNMAN],
AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false])
dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
])
AC_SUBST(ECONNMAN_CFLAGS)
AC_SUBST(ECONNMAN_LIBS)
AC_SUBST([ECONNMAN_CFLAGS])
AC_SUBST([ECONNMAN_LIBS])
AM_CONDITIONAL(HAVE_BLUEZ4, false)
AM_CONDITIONAL(HAVE_DUMMY, false)
@ -762,8 +758,8 @@ define([CHECK_MODULE_BLUEZ4],
[
AC_E_CHECK_PKG(BLUEZ4, [ eldbus ],)
])
AC_SUBST(EBLUEZ4_CFLAGS)
AC_SUBST(EBLUEZ4_LIBS)
AC_SUBST([EBLUEZ4_CFLAGS])
AC_SUBST([EBLUEZ4_LIBS])
have_wayland_clients=no
AC_ARG_ENABLE([wayland-clients],
@ -917,10 +913,10 @@ case "$host_os" in
fi
;;
esac
AC_SUBST(HALT)
AC_SUBST(REBOOT)
AC_SUBST(SUSPEND)
AC_SUBST(HIBERNATE)
AC_SUBST([HALT])
AC_SUBST([REBOOT])
AC_SUBST([SUSPEND])
AC_SUBST([HIBERNATE])
m4_ifdef([v_mic],
[
@ -939,11 +935,7 @@ AC_OUTPUT([
Makefile
enlightenment.spec
enlightenment.pc
src/Makefile
src/bin/Makefile
src/bin/e_fm_shared_types.h
src/bin/e_fm/Makefile
src/modules/Makefile
src/modules/ibar/module.desktop
src/modules/clock/module.desktop
src/modules/pager/module.desktop
@ -1005,28 +997,11 @@ src/modules/music-control/module.desktop
src/modules/contact/module.desktop
src/modules/wl_desktop_shell/module.desktop
src/modules/wl_screenshot/module.desktop
data/Makefile
data/images/Makefile
data/flags/Makefile
data/favorites/Makefile
data/desktop/Makefile
data/input_methods/Makefile
data/xsession/Makefile
data/xsession/enlightenment.desktop
data/tools/Makefile
data/etc/Makefile
data/etc/sysactions.conf
data/icons/Makefile
data/backgrounds/Makefile
data/units/Makefile
data/units/e18.service
doc/Makefile
doc/Doxyfile
doc/e.dox
config/Makefile
config/default/Makefile
config/standard/Makefile
config/mobile/Makefile
$po_makefile_in
])

@ -1,14 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = \
images \
tools \
xsession \
input_methods \
etc \
icons \
backgrounds \
flags \
favorites \
desktop \
units

@ -0,0 +1,11 @@
include data/images/Makefile.mk
include data/tools/Makefile.mk
include data/xsession/Makefile.mk
include data/input_methods/Makefile.mk
include data/etc/Makefile.mk
include data/icons/Makefile.mk
include data/backgrounds/Makefile.mk
include data/flags/Makefile.mk
include data/favorites/Makefile.mk
include data/desktop/Makefile.mk
include data/units/Makefile.mk

@ -1,42 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/enlightenment/data/backgrounds
files_DATA = \
Brown_Rock_Hi.edj \
Colorful_Roses.edj \
Darkconcrete.edj \
Dark_Gradient.edj \
Grassy.edj \
Japanesemaple.edj \
Lakegrass.edj \
Light_Gradient.edj \
Mossstring.edj \
Motleyrock.edj \
Newgrowth.edj \
Orange_Roses.edj \
Pattern_Radial.edj \
Pattern_Vertical.edj \
Pattern_Vertical_Hi.edj \
Pine_Silhouettes.edj \
Purple_Flower_Bunch.edj \
Skywall.edj \
Stringflower.edj \
Wetgrass.edj \
Wetleaf.edj \
Whiterock.edj \
Hills.edj \
Light.edj \
Temple.edj \
Train.edj \
Curly_Leaves.edj \
Flower_Petals.edj \
Go_Away.edj \
Green_Stem.edj \
Leafy_Red.edj \
Ramen.edj \
Shady_Leaves.edj \
Windy_Palm.edj \
Lantern_Cluster.edj \
Wall_Lanterns.edj
EXTRA_DIST = $(files_DATA)

@ -0,0 +1,41 @@
backgroundfilesdir = $(datadir)/enlightenment/data/backgrounds
backgroundfiles_DATA = \
data/backgrounds/Brown_Rock_Hi.edj \
data/backgrounds/Colorful_Roses.edj \
data/backgrounds/Darkconcrete.edj \
data/backgrounds/Dark_Gradient.edj \
data/backgrounds/Grassy.edj \
data/backgrounds/Japanesemaple.edj \
data/backgrounds/Lakegrass.edj \
data/backgrounds/Light_Gradient.edj \
data/backgrounds/Mossstring.edj \
data/backgrounds/Motleyrock.edj \
data/backgrounds/Newgrowth.edj \
data/backgrounds/Orange_Roses.edj \
data/backgrounds/Pattern_Radial.edj \
data/backgrounds/Pattern_Vertical.edj \
data/backgrounds/Pattern_Vertical_Hi.edj \
data/backgrounds/Pine_Silhouettes.edj \
data/backgrounds/Purple_Flower_Bunch.edj \
data/backgrounds/Skywall.edj \
data/backgrounds/Stringflower.edj \
data/backgrounds/Wetgrass.edj \
data/backgrounds/Wetleaf.edj \
data/backgrounds/Whiterock.edj \
data/backgrounds/Hills.edj \
data/backgrounds/Light.edj \
data/backgrounds/Temple.edj \
data/backgrounds/Train.edj \
data/backgrounds/Curly_Leaves.edj \
data/backgrounds/Flower_Petals.edj \
data/backgrounds/Go_Away.edj \
data/backgrounds/Green_Stem.edj \
data/backgrounds/Leafy_Red.edj \
data/backgrounds/Ramen.edj \
data/backgrounds/Shady_Leaves.edj \
data/backgrounds/Windy_Palm.edj \
data/backgrounds/Lantern_Cluster.edj \
data/backgrounds/Wall_Lanterns.edj
EXTRA_DIST += $(backgroundfiles_DATA)

@ -1,6 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/applications
files_DATA = \
enlightenment_filemanager.desktop
EXTRA_DIST = $(files_DATA)

@ -0,0 +1,5 @@
desktopfilesdir = $(datadir)/applications
desktopfiles_DATA = \
data/desktop/enlightenment_filemanager.desktop
EXTRA_DIST += $(desktopfiles_DATA)

@ -1,16 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(sysconfdir)/enlightenment
files_DATA =
if INSTALL_SYSACTIONS
files_DATA += sysactions.conf
endif
menusdir = $(sysconfdir)/xdg/menus
menus_DATA =
if INSTALL_ENLIGHTENMENT_MENU
menus_DATA += enlightenment.menu
endif
EXTRA_DIST = $(files_DATA) $(menus_DATA)

@ -0,0 +1,15 @@
etcfilesdir = $(sysconfdir)/enlightenment
etcfiles_DATA =
if INSTALL_SYSACTIONS
etcfiles_DATA += data/etc/sysactions.conf
endif
etcmenusdir = $(sysconfdir)/xdg/menus
etcmenus_DATA =
if INSTALL_ENLIGHTENMENT_MENU
etcmenus_DATA += data/etc/enlightenment.menu
endif
EXTRA_DIST += $(etcfiles_DATA) $(etcmenus_DATA)

@ -1,11 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
favsdir = $(datadir)/enlightenment/data/favorites
favs_DATA = \
.order \
desktop.desktop \
home.desktop \
root.desktop \
tmp.desktop
EXTRA_DIST = $(favs_DATA)

@ -0,0 +1,9 @@
datafavsdir = $(datadir)/enlightenment/data/favorites
datafavs_DATA = \
data/favorites/.order \
data/favorites/desktop.desktop \
data/favorites/home.desktop \
data/favorites/root.desktop \
data/favorites/tmp.desktop
EXTRA_DIST += $(datafavs_DATA)

@ -1,104 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/enlightenment/data/flags
files_DATA = \
ad_flag.png \
af_flag.png \
al_flag.png \
am_flag.png \
ara_flag.png \
ar_flag.png \
at_flag.png \
az_flag.png \
ba_flag.png \
bd_flag.png \
be_flag.png \
bg_flag.png \
brai_flag.png \
br_flag.png \
bt_flag.png \
bw_flag.png \
by_flag.png \
ca_flag.png \
cat_flag.png \
cd_flag.png \
ch_flag.png \
cm_flag.png \
cn_flag.png \
cz_flag.png \
de_flag.png \
dk_flag.png \
ee_flag.png \
epo_flag.png \
es_flag.png \
et_flag.png \
fi_flag.png \
fo_flag.png \
fr_flag.png \
gb_flag.png \
ge_flag.png \
gh_flag.png \
gn_flag.png \
gr_flag.png \
hr_flag.png \
hu_flag.png \
ie_flag.png \
il_flag.png \
in_flag.png \
iq_flag.png \
ir_flag.png \
is_flag.png \
it_flag.png \
jp_flag.png \
ke_flag.png \
kg_flag.png \
kh_flag.png \
kr_flag.png \
ku_flag.png \
kz_flag.png \
la_flag.png \
lang-system.png \
latam_flag.png \
lk_flag.png \
lt_flag.png \
lv_flag.png \
ma_flag.png \
mao_flag.png \
md_flag.png \
me_flag.png \
mk_flag.png \
ml_flag.png \
mm_flag.png \
mn_flag.png \
mt_flag.png \
mv_flag.png \
my_flag.png \
ng_flag.png \
nl_flag.png \
no_flag.png \
np_flag.png \
ph_flag.png \
pk_flag.png \
pl_flag.png \
pt_flag.png \
ro_flag.png \
rs_flag.png \
ru_flag.png \
se_flag.png \
si_flag.png \
sk_flag.png \
sn_flag.png \
sy_flag.png \
th_flag.png \
tj_flag.png \
tm_flag.png \
tr_flag.png \
tw_flag.png \
tz_flag.png \
ua_flag.png \
unknown_flag.png \
us_flag.png \
uz_flag.png \
vn_flag.png \
za_flag.png
EXTRA_DIST = $(files_DATA)

@ -0,0 +1,103 @@
dataflagsfilesdir = $(datadir)/enlightenment/data/flags
dataflagsfiles_DATA = \
data/flags/ad_flag.png \
data/flags/af_flag.png \
data/flags/al_flag.png \
data/flags/am_flag.png \
data/flags/ara_flag.png \
data/flags/ar_flag.png \
data/flags/at_flag.png \
data/flags/az_flag.png \
data/flags/ba_flag.png \
data/flags/bd_flag.png \
data/flags/be_flag.png \
data/flags/bg_flag.png \
data/flags/brai_flag.png \
data/flags/br_flag.png \
data/flags/bt_flag.png \
data/flags/bw_flag.png \
data/flags/by_flag.png \
data/flags/ca_flag.png \
data/flags/cat_flag.png \
data/flags/cd_flag.png \
data/flags/ch_flag.png \
data/flags/cm_flag.png \
data/flags/cn_flag.png \
data/flags/cz_flag.png \
data/flags/de_flag.png \
data/flags/dk_flag.png \
data/flags/ee_flag.png \
data/flags/epo_flag.png \
data/flags/es_flag.png \
data/flags/et_flag.png \
data/flags/fi_flag.png \
data/flags/fo_flag.png \
data/flags/fr_flag.png \
data/flags/gb_flag.png \
data/flags/ge_flag.png \
data/flags/gh_flag.png \
data/flags/gn_flag.png \
data/flags/gr_flag.png \
data/flags/hr_flag.png \
data/flags/hu_flag.png \
data/flags/ie_flag.png \
data/flags/il_flag.png \
data/flags/in_flag.png \
data/flags/iq_flag.png \
data/flags/ir_flag.png \
data/flags/is_flag.png \
data/flags/it_flag.png \
data/flags/jp_flag.png \
data/flags/ke_flag.png \
data/flags/kg_flag.png \
data/flags/kh_flag.png \
data/flags/kr_flag.png \
data/flags/ku_flag.png \
data/flags/kz_flag.png \
data/flags/la_flag.png \
data/flags/lang-system.png \
data/flags/latam_flag.png \
data/flags/lk_flag.png \
data/flags/lt_flag.png \
data/flags/lv_flag.png \
data/flags/ma_flag.png \
data/flags/mao_flag.png \
data/flags/md_flag.png \
data/flags/me_flag.png \
data/flags/mk_flag.png \
data/flags/ml_flag.png \
data/flags/mm_flag.png \
data/flags/mn_flag.png \
data/flags/mt_flag.png \
data/flags/mv_flag.png \
data/flags/my_flag.png \
data/flags/ng_flag.png \
data/flags/nl_flag.png \
data/flags/no_flag.png \
data/flags/np_flag.png \
data/flags/ph_flag.png \
data/flags/pk_flag.png \
data/flags/pl_flag.png \
data/flags/pt_flag.png \
data/flags/ro_flag.png \
data/flags/rs_flag.png \
data/flags/ru_flag.png \
data/flags/se_flag.png \
data/flags/si_flag.png \
data/flags/sk_flag.png \
data/flags/sn_flag.png \
data/flags/sy_flag.png \
data/flags/th_flag.png \
data/flags/tj_flag.png \
data/flags/tm_flag.png \
data/flags/tr_flag.png \
data/flags/tw_flag.png \
data/flags/tz_flag.png \
data/flags/ua_flag.png \
data/flags/unknown_flag.png \
data/flags/us_flag.png \
data/flags/uz_flag.png \
data/flags/v