summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-07-25 09:46:14 +0100
committerMike Blumenkrantz <zmike@samsung.com>2014-01-14 20:22:01 -0500
commite3c85ec4da64ebcfb29eea0992466730e3e31995 (patch)
treed576c1ecc20985ee46a4a4d75a347890814d80ed
parent0bd3f7d13c64686f6aee19547d774438e82ce9d1 (diff)
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>
-rw-r--r--Makefile.am94
-rw-r--r--config/Makefile.am20
-rw-r--r--config/Makefile.mk25
-rw-r--r--config/default/Makefile.am27
-rw-r--r--config/default/Makefile.mk12
-rw-r--r--config/mobile/Makefile.am40
-rw-r--r--config/mobile/Makefile.mk26
-rw-r--r--config/standard/Makefile.am43
-rw-r--r--config/standard/Makefile.mk28
-rw-r--r--configure.ac123
-rw-r--r--data/Makefile.am14
-rw-r--r--data/Makefile.mk11
-rw-r--r--data/backgrounds/Makefile.am42
-rw-r--r--data/backgrounds/Makefile.mk41
-rw-r--r--data/desktop/Makefile.am6
-rw-r--r--data/desktop/Makefile.mk5
-rw-r--r--data/etc/Makefile.am16
-rw-r--r--data/etc/Makefile.mk15
-rw-r--r--data/favorites/Makefile.am11
-rw-r--r--data/favorites/Makefile.mk9
-rw-r--r--data/flags/Makefile.am104
-rw-r--r--data/flags/Makefile.mk103
-rw-r--r--data/icons/Makefile.am13
-rw-r--r--data/icons/Makefile.mk12
-rw-r--r--data/images/Makefile.am10
-rw-r--r--data/images/Makefile.mk9
-rw-r--r--data/input_methods/Makefile.am12
-rw-r--r--data/input_methods/Makefile.mk11
-rw-r--r--data/tools/Makefile.am8
-rw-r--r--data/tools/Makefile.mk6
-rw-r--r--data/units/Makefile.am9
-rw-r--r--data/units/Makefile.mk6
-rw-r--r--data/xsession/Makefile.am4
-rw-r--r--data/xsession/Makefile.mk3
-rw-r--r--doc/Doxyfile.in12
-rw-r--r--doc/Makefile.am42
-rw-r--r--doc/Makefile.mk47
-rw-r--r--m4/Makefile.mk26
-rw-r--r--po/Makefile.mk10
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.mk2
-rw-r--r--src/bin/Makefile.am457
-rw-r--r--src/bin/Makefile.mk470
-rw-r--r--src/bin/e_fm/Makefile.am62
-rw-r--r--src/bin/e_fm/Makefile.mk56
-rw-r--r--src/bin/e_fm_cmdline.c28
-rw-r--r--src/bin/e_static_grab.c6
-rw-r--r--src/modules/Makefile.am250
-rw-r--r--src/modules/Makefile.mk231
-rw-r--r--src/modules/Makefile_access.am15
-rw-r--r--src/modules/Makefile_access.mk18
-rw-r--r--src/modules/Makefile_appmenu.am18
-rw-r--r--src/modules/Makefile_appmenu.mk21
-rw-r--r--src/modules/Makefile_backlight.am14
-rw-r--r--src/modules/Makefile_backlight.mk17
-rw-r--r--src/modules/Makefile_battery.am39
-rw-r--r--src/modules/Makefile_battery.mk43
-rw-r--r--src/modules/Makefile_bluez4.am22
-rw-r--r--src/modules/Makefile_bluez4.mk23
-rw-r--r--src/modules/Makefile_clock.am16
-rw-r--r--src/modules/Makefile_clock.mk19
-rw-r--r--src/modules/Makefile_conf.am17
-rw-r--r--src/modules/Makefile_conf.mk20
-rw-r--r--src/modules/Makefile_conf2.mk32
-rw-r--r--src/modules/Makefile_conf_applications.am19
-rw-r--r--src/modules/Makefile_conf_applications.mk22
-rw-r--r--src/modules/Makefile_conf_bindings.am19
-rw-r--r--src/modules/Makefile_conf_bindings.mk22
-rw-r--r--src/modules/Makefile_conf_comp.am16
-rw-r--r--src/modules/Makefile_conf_comp.mk19
-rw-r--r--src/modules/Makefile_conf_dialogs.am17
-rw-r--r--src/modules/Makefile_conf_dialogs.mk20
-rw-r--r--src/modules/Makefile_conf_display.am21
-rw-r--r--src/modules/Makefile_conf_display.mk24
-rw-r--r--src/modules/Makefile_conf_interaction.am17
-rw-r--r--src/modules/Makefile_conf_interaction.mk20
-rw-r--r--src/modules/Makefile_conf_intl.am17
-rw-r--r--src/modules/Makefile_conf_intl.mk20
-rw-r--r--src/modules/Makefile_conf_menus.am16
-rw-r--r--src/modules/Makefile_conf_menus.mk19
-rw-r--r--src/modules/Makefile_conf_paths.am17
-rw-r--r--src/modules/Makefile_conf_paths.mk20
-rw-r--r--src/modules/Makefile_conf_performance.am18
-rw-r--r--src/modules/Makefile_conf_performance.mk21
-rw-r--r--src/modules/Makefile_conf_randr.am21
-rw-r--r--src/modules/Makefile_conf_randr.mk24
-rw-r--r--src/modules/Makefile_conf_shelves.am17
-rw-r--r--src/modules/Makefile_conf_shelves.mk20
-rw-r--r--src/modules/Makefile_conf_theme.am23
-rw-r--r--src/modules/Makefile_conf_theme.mk26
-rw-r--r--src/modules/Makefile_conf_wallpaper2.am15
-rw-r--r--src/modules/Makefile_conf_wallpaper2.mk18
-rw-r--r--src/modules/Makefile_conf_window_manipulation.am19
-rw-r--r--src/modules/Makefile_conf_window_manipulation.mk22
-rw-r--r--src/modules/Makefile_conf_window_remembers.am17
-rw-r--r--src/modules/Makefile_conf_window_remembers.mk20
-rw-r--r--src/modules/Makefile_connman.am22
-rw-r--r--src/modules/Makefile_connman.mk23
-rw-r--r--src/modules/Makefile_contact.am21
-rw-r--r--src/modules/Makefile_contact.mk24
-rw-r--r--src/modules/Makefile_cpufreq.am32
-rw-r--r--src/modules/Makefile_cpufreq.mk35
-rw-r--r--src/modules/Makefile_everything.am49
-rw-r--r--src/modules/Makefile_everything.mk52
-rw-r--r--src/modules/Makefile_fileman.am22
-rw-r--r--src/modules/Makefile_fileman.mk25
-rw-r--r--src/modules/Makefile_fileman_opinfo.am14
-rw-r--r--src/modules/Makefile_fileman_opinfo.mk17
-rw-r--r--src/modules/Makefile_gadman.am17
-rw-r--r--src/modules/Makefile_gadman.mk20
-rw-r--r--src/modules/Makefile_ibar.am16
-rw-r--r--src/modules/Makefile_ibar.mk19
-rw-r--r--src/modules/Makefile_ibox.am16
-rw-r--r--src/modules/Makefile_ibox.mk19
-rw-r--r--src/modules/Makefile_illume-bluetooth.am14
-rw-r--r--src/modules/Makefile_illume-bluetooth.mk17
-rw-r--r--src/modules/Makefile_illume-home-toggle.am14
-rw-r--r--src/modules/Makefile_illume-home-toggle.mk17
-rw-r--r--src/modules/Makefile_illume-home.am19
-rw-r--r--src/modules/Makefile_illume-home.mk22
-rw-r--r--src/modules/Makefile_illume-indicator.am26
-rw-r--r--src/modules/Makefile_illume-indicator.mk28
-rw-r--r--src/modules/Makefile_illume-kbd-toggle.am14
-rw-r--r--src/modules/Makefile_illume-kbd-toggle.mk17
-rw-r--r--src/modules/Makefile_illume-keyboard.am56
-rw-r--r--src/modules/Makefile_illume-keyboard.mk59
-rw-r--r--src/modules/Makefile_illume-mode-toggle.am14
-rw-r--r--src/modules/Makefile_illume-mode-toggle.mk17
-rw-r--r--src/modules/Makefile_illume-softkey.am21
-rw-r--r--src/modules/Makefile_illume-softkey.mk24
-rw-r--r--src/modules/Makefile_illume2.am58
-rw-r--r--src/modules/Makefile_illume2.mk65
-rw-r--r--src/modules/Makefile_mixer.am43
-rw-r--r--src/modules/Makefile_mixer.mk44
-rw-r--r--src/modules/Makefile_msgbus.am18
-rw-r--r--src/modules/Makefile_msgbus.mk22
-rw-r--r--src/modules/Makefile_music_control.am21
-rw-r--r--src/modules/Makefile_music_control.mk27
-rw-r--r--src/modules/Makefile_notification.am19
-rw-r--r--src/modules/Makefile_notification.mk21
-rw-r--r--src/modules/Makefile_pager.am16
-rw-r--r--src/modules/Makefile_pager.mk19
-rw-r--r--src/modules/Makefile_physics.mk26
-rw-r--r--src/modules/Makefile_quickaccess.am19
-rw-r--r--src/modules/Makefile_quickaccess.mk22
-rw-r--r--src/modules/Makefile_shot.am14
-rw-r--r--src/modules/Makefile_shot.mk17
-rw-r--r--src/modules/Makefile_start.am14
-rw-r--r--src/modules/Makefile_start.mk17
-rw-r--r--src/modules/Makefile_syscon.am18
-rw-r--r--src/modules/Makefile_syscon.mk21
-rw-r--r--src/modules/Makefile_systray.am20
-rw-r--r--src/modules/Makefile_systray.mk23
-rw-r--r--src/modules/Makefile_tasks.am16
-rw-r--r--src/modules/Makefile_tasks.mk19
-rw-r--r--src/modules/Makefile_teamwork.am22
-rw-r--r--src/modules/Makefile_teamwork.mk23
-rw-r--r--src/modules/Makefile_temperature.am27
-rw-r--r--src/modules/Makefile_temperature.mk32
-rw-r--r--src/modules/Makefile_tiling.am33
-rw-r--r--src/modules/Makefile_tiling.mk36
-rw-r--r--src/modules/Makefile_winlist.am18
-rw-r--r--src/modules/Makefile_winlist.mk21
-rw-r--r--src/modules/Makefile_wizard.am90
-rw-r--r--src/modules/Makefile_wizard.mk156
-rw-r--r--src/modules/Makefile_wl_desktop_shell.am25
-rw-r--r--src/modules/Makefile_wl_desktop_shell.mk26
-rw-r--r--src/modules/Makefile_wl_screenshot.am23
-rw-r--r--src/modules/Makefile_wl_screenshot.mk24
-rw-r--r--src/modules/Makefile_xkbswitch.am18
-rw-r--r--src/modules/Makefile_xkbswitch.mk21
171 files changed, 2939 insertions, 2676 deletions
diff --git a/Makefile.am b/Makefile.am
index ba31f42..bf95f1f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
1SUBDIRS = src data doc config
2
3ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} 1ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
2AUTOMAKE_OPTIONS = subdir-objects
3
4SUBDIRS = .
4 5
5if HAVE_PO 6if HAVE_PO
6 7
@@ -8,6 +9,11 @@ SUBDIRS += po
8 9
9endif 10endif
10 11
12CLEANFILES =
13DISTCLEANFILES =
14INSTALL_DATA_HOOKS =
15PHONIES =
16
11MAINTAINERCLEANFILES = \ 17MAINTAINERCLEANFILES = \
12ABOUT-NLS* \ 18ABOUT-NLS* \
13Makefile.in \ 19Makefile.in \
@@ -25,52 +31,45 @@ ltmain.sh \
25missing \ 31missing \
26$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \ 32$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
27$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \ 33$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2 \
28$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2 \ 34$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc.tar.bz2
29m4/libtool.m4 \ 35
30m4/lt~obsolete.m4 \ 36EXTRA_DIST = \
31m4/ltoptions.m4 \ 37config.rpath \
32m4/ltsugar.m4 \ 38README \
33m4/ltversion.m4 \ 39AUTHORS \
34m4/codeset.m4 \ 40COPYING \
35m4/gettext.m4 \ 41enlightenment.spec.in \
36m4/glibc21.m4 \ 42enlightenment.spec \
37m4/iconv.m4 \ 43enlightenment.pc \
38m4/intdiv0.m4 \ 44pkgbuild/PKGBUILD \
39m4/inttypes_h.m4 \ 45pkgbuild/enlightenment.install
40m4/inttypes.m4 \ 46
41m4/inttypes-pri.m4 \ 47EDJE_CC = $(EDJE_CC_$(V))
42m4/isc-posix.m4 \ 48EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY))
43m4/lcmessage.m4 \ 49EDJE_CC_0 = @echo " EDJE_CC " $@; @edje_cc@
44m4/lib-ld.m4 \ 50EDJE_CC_1 = @edje_cc@
45m4/lib-link.m4 \ 51
46m4/lib-prefix.m4 \ 52EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY))
47m4/nls.m4 \ 53EDJE_FLAGS_VERBOSE_0 =
48m4/po.m4 \ 54EDJE_FLAGS_VERBOSE_1 = -v
49m4/progtest.m4 \ 55EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) \
50m4/stdint_h.m4 \ 56@EDJE_DEF@
51m4/uintmax_t.m4 \ 57
52m4/ulonglong.m4 58include m4/Makefile.mk
53 59
54if HAVE_PO 60if HAVE_PO
55 61
56MAINTAINERCLEANFILES += \ 62include po/Makefile.mk
57po/boldquot.sed \
58po/en@boldquot.header \
59po/en@quot.header \
60po/insert-header.sin \
61po/Makefile.in.in \
62po/Makevars.template \
63po/quot.sed \
64po/remove-potcdate.sin \
65po/Rules-quot
66 63
67endif 64endif
68 65
69DISTCHECK_CONFIGURE_FLAGS = --disable-systemd 66DISTCHECK_CONFIGURE_FLAGS = --disable-systemd
70 67
71EXTRA_DIST = config.rpath README AUTHORS COPYING \ 68include config/Makefile.mk
72 enlightenment.spec.in enlightenment.spec enlightenment.pc \ 69
73 pkgbuild/PKGBUILD pkgbuild/enlightenment.install 70include data/Makefile.mk
71
72include src/Makefile.mk
74 73
75filesdir = $(datadir)/enlightenment/ 74filesdir = $(datadir)/enlightenment/
76files_DATA = AUTHORS COPYING 75files_DATA = AUTHORS COPYING
@@ -78,8 +77,15 @@ files_DATA = AUTHORS COPYING
78pkgconfigdir = $(libdir)/pkgconfig 77pkgconfigdir = $(libdir)/pkgconfig
79pkgconfig_DATA = enlightenment.pc 78pkgconfig_DATA = enlightenment.pc
80 79
81.PHONY: doc 80include doc/Makefile.mk
81
82.PHONY: $(PHONIES)
83
84clean-local: doc-clean
85 rm -rf config/*.cfg config/*~
86 rm -rf config/standard/*.cfg config/standard/*~
87 rm -rf config/mobile/*.cfg config/mobile/*~
88 rm -rf config/default/*.cfg config/default/*~
89 rm -f data/themes/*.edj
82 90
83doc: 91install-data-hook: $(INSTALL_DATA_HOOKS)
84 @echo "entering doc/"
85 $(MAKE) -C doc doc
diff --git a/config/Makefile.am b/config/Makefile.am
deleted file mode 100644
index 340809b..0000000
--- a/config/Makefile.am
+++ /dev/null
@@ -1,20 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2SUBDIRS = default standard mobile
3
4EET_EET = @eet_eet@
5
6EXTRA_DIST = profile.src
7
8filesdir = $(datadir)/enlightenment/data/config
9
10files_DATA = profile.cfg
11
12SUFFIXES = .cfg
13
14.src.cfg:
15 $(EET_EET) -i \
16 $(top_builddir)/config/$@ config \
17 $< 0
18
19clean-local:
20 rm -rf *.cfg *~
diff --git a/config/Makefile.mk b/config/Makefile.mk
new file mode 100644
index 0000000..34fef48
--- /dev/null
+++ b/config/Makefile.mk
@@ -0,0 +1,25 @@
1EET_EET = @eet_eet@
2
3EXTRA_DIST += config/profile.src
4
5configfilesdir = $(datadir)/enlightenment/data/config
6
7configfiles_DATA = config/profile.cfg
8
9SUFFIXES = .cfg
10
11.src.cfg:
12 $(MKDIR_P) $(@D)
13 $(EET_EET) -e \
14 $(top_builddir)/$@ config \
15 $< 0
16
17include config/default/Makefile.mk
18include config/standard/Makefile.mk
19include config/mobile/Makefile.mk
20
21config/profile.cfg: config/profile.src
22 $(MKDIR_P) $(@D)
23 $(EET_EET) -i \
24 $(top_builddir)/$@ config \
25 $< 1
diff --git a/config/default/Makefile.am b/config/default/Makefile.am
deleted file mode 100644
index 57dec3f..0000000
--- a/config/default/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3EET_EET = @eet_eet@
4
5EXTRA_DIST = \
6 profile.desktop \
7 enlightenment-default.png \
8 e.src \
9 e_bindings.src
10
11filesdir = $(datadir)/enlightenment/data/config/default
12files_DATA = \
13 profile.desktop \
14 enlightenment-default.png \
15 e.cfg \
16 e_bindings.cfg
17
18SUFFIXES = .cfg
19
20.src.cfg:
21 $(EET_EET) -e \
22 $(top_builddir)/config/default/$@ config \
23 $< 1
24
25clean-local:
26 rm -rf *.cfg *~
27
diff --git a/config/default/Makefile.mk b/config/default/Makefile.mk
new file mode 100644
index 0000000..3b619c7
--- /dev/null
+++ b/config/default/Makefile.mk
@@ -0,0 +1,12 @@
1EXTRA_DIST += \
2config/default/profile.desktop \
3config/default/enlightenment-default.png \
4config/default/e.src \
5config/default/e_bindings.src
6
7configdefaultfilesdir = $(datadir)/enlightenment/data/config/default
8configdefaultfiles_DATA = \
9config/default/profile.desktop \
10config/default/enlightenment-default.png \
11config/default/e.cfg \
12config/default/e_bindings.cfg
diff --git a/config/mobile/Makefile.am b/config/mobile/Makefile.am
deleted file mode 100644
index cd59d24..0000000
--- a/config/mobile/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3EET_EET = @eet_eet@
4
5EXTRA_DIST = \
6 profile.desktop \
7 enlightenment-mobile.png \
8 e.src \
9 e_bindings.src \
10 module.battery.src \
11 module.illume-home.src \
12 module.illume-keyboard.src \
13 module.illume-indicator.src \
14 module.illume-softkey.src \
15 module.illume2.src \
16 module.conf.src
17
18filesdir = $(datadir)/enlightenment/data/config/mobile
19files_DATA = \
20 profile.desktop \
21 enlightenment-mobile.png \
22 e.cfg \
23 e_bindings.cfg \
24 module.battery.cfg \
25 module.illume-home.cfg \
26 module.illume-keyboard.cfg \
27 module.illume-indicator.cfg \
28 module.illume-softkey.cfg \
29 module.illume2.cfg \
30 module.conf.cfg
31
32SUFFIXES = .cfg
33
34.src.cfg:
35 $(EET_EET) -e \
36 $(top_builddir)/config/mobile/$@ config \
37 $< 1
38
39clean-local:
40 rm -rf *.cfg *~
diff --git a/config/mobile/Makefile.mk b/config/mobile/Makefile.mk
new file mode 100644
index 0000000..b1939c2
--- /dev/null
+++ b/config/mobile/Makefile.mk
@@ -0,0 +1,26 @@
1EXTRA_DIST += \
2config/mobile/profile.desktop \
3config/mobile/enlightenment-mobile.png \
4config/mobile/e.src \
5config/mobile/e_bindings.src \
6config/mobile/module.battery.src \
7config/mobile/module.illume-home.src \
8config/mobile/module.illume-keyboard.src \
9config/mobile/module.illume-indicator.src \
10config/mobile/module.illume-softkey.src \
11config/mobile/module.illume2.src \
12config/mobile/module.conf.src
13
14configmobilefilesdir = $(datadir)/enlightenment/data/config/mobile
15configmobilefiles_DATA = \
16config/mobile/profile.desktop \
17config/mobile/enlightenment-mobile.png \
18config/mobile/e.cfg \
19config/mobile/e_bindings.cfg \
20config/mobile/module.battery.cfg \
21config/mobile/module.illume-home.cfg \
22config/mobile/module.illume-keyboard.cfg \
23config/mobile/module.illume-indicator.cfg \
24config/mobile/module.illume-softkey.cfg \
25config/mobile/module.illume2.cfg \
26config/mobile/module.conf.cfg
diff --git a/config/standard/Makefile.am b/config/standard/Makefile.am
deleted file mode 100644
index 6b04039..0000000
--- a/config/standard/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3EET_EET = @eet_eet@
4
5EXTRA_DIST = \
6 profile.desktop \
7 enlightenment-standard.png \
8 e.src \
9 e_bindings.src \
10 module.battery.src \
11 module.cpufreq.src \
12 module.fileman.src \
13 module.ibar.src \
14 module.ibox.src \
15 module.pager.src \
16 module.temperature.src \
17 module.conf.src
18
19filesdir = $(datadir)/enlightenment/data/config/standard
20files_DATA = \
21 profile.desktop \
22 enlightenment-standard.png \
23 e.cfg \
24 e_bindings.cfg \
25 module.battery.cfg \
26 module.cpufreq.cfg \
27 module.fileman.cfg \
28 module.ibar.cfg \
29 module.ibox.cfg \
30 module.pager.cfg \
31 module.temperature.cfg \
32 module.conf.cfg
33
34SUFFIXES = .cfg
35
36.src.cfg:
37 $(EET_EET) -e \
38 $(top_builddir)/config/standard/$@ config \
39 $< 1
40
41clean-local:
42 rm -rf *.cfg *~
43
diff --git a/config/standard/Makefile.mk b/config/standard/Makefile.mk
new file mode 100644
index 0000000..4b3f4f2
--- /dev/null
+++ b/config/standard/Makefile.mk
@@ -0,0 +1,28 @@
1EXTRA_DIST += \
2config/standard/profile.desktop \
3config/standard/enlightenment-standard.png \
4config/standard/e.src \
5config/standard/e_bindings.src \
6config/standard/module.battery.src \
7config/standard/module.cpufreq.src \
8config/standard/module.fileman.src \
9config/standard/module.ibar.src \
10config/standard/module.ibox.src \
11config/standard/module.pager.src \
12config/standard/module.temperature.src \
13config/standard/module.conf.src
14
15configstandardfilesdir = $(datadir)/enlightenment/data/config/standard
16configstandardfiles_DATA = \
17config/standard/profile.desktop \
18config/standard/enlightenment-standard.png \
19config/standard/e.cfg \
20config/standard/e_bindings.cfg \
21config/standard/module.battery.cfg \
22config/standard/module.cpufreq.cfg \
23config/standard/module.fileman.cfg \
24config/standard/module.ibar.cfg \
25config/standard/module.ibox.cfg \
26config/standard/module.pager.cfg \
27config/standard/module.temperature.cfg \
28config/standard/module.conf.cfg
diff --git a/configure.ac b/configure.ac
index 062df94..cb03716 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 2##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
3m4_define([v_maj], [0]) 3m4_define([v_maj], [0])
4m4_define([v_min], [18]) 4m4_define([v_min], [18])
5m4_define([v_mic], [0]) 5m4_define([v_mic], [99])
6dnl m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl 6m4_define([v_rev], m4_esyscmd([(git rev-list --count HEAD 2>/dev/null || echo 0) | tr -d '\n']))dnl
7##-- When released, remove the dnl on the below line 7##-- When released, remove the dnl on the below line
8dnl m4_undefine([v_rev]) 8dnl m4_undefine([v_rev])
9m4_define([relname], [0.17.99]) 9m4_define([relname], [0.18.99])
10##-- When doing snapshots - change soname. remove dnl on below line 10##-- When doing snapshots - change soname. remove dnl on below line
11m4_define([relname], [ver-pre-01]) 11m4_define([relname], [ver-pre-01])
12dnl m4_define([v_rel], [-release relname]) 12dnl m4_define([v_rel], [-release relname])
@@ -18,13 +18,12 @@ m4_define([lt_age], v_min)
18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 18##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 19##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
20 20
21AC_INIT([enlightenment], [v_ver-rc2], [enlightenment-devel@lists.sourceforge.net]) 21AC_INIT([enlightenment], [v_ver], [enlightenment-devel@lists.sourceforge.net])
22AC_PREREQ([2.52]) 22AC_PREREQ([2.52])
23AC_CONFIG_SRCDIR([configure.ac]) 23AC_CONFIG_SRCDIR([configure.ac])
24AC_CONFIG_MACRO_DIR([m4]) 24AC_CONFIG_MACRO_DIR([m4])
25AC_CANONICAL_BUILD 25AC_CANONICAL_BUILD
26AC_CANONICAL_HOST 26AC_CANONICAL_HOST
27AC_ISC_POSIX
28 27
29AC_CONFIG_HEADERS([config.h]) 28AC_CONFIG_HEADERS([config.h])
30AH_TOP([ 29AH_TOP([
@@ -36,14 +35,13 @@ AH_BOTTOM([
36]) 35])
37 36
38AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability]) 37AM_INIT_AUTOMAKE([1.11 dist-bzip2 -Wno-portability])
39m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) 38AM_SILENT_RULES([yes])
40 39
41AC_GNU_SOURCE 40AC_USE_SYSTEM_EXTENSIONS
42AC_PROG_MKDIR_P 41AC_PROG_MKDIR_P
43AC_C_BIGENDIAN 42AC_C_BIGENDIAN
44AC_PROG_CC_C99 43AC_PROG_CC_C99
45AM_PROG_CC_C_O 44AM_PROG_CC_C_O
46AC_C_CONST
47AC_FUNC_ALLOCA 45AC_FUNC_ALLOCA
48AC_C___ATTRIBUTE__ 46AC_C___ATTRIBUTE__
49 47
@@ -59,13 +57,13 @@ AC_DEFINE_UNQUOTED(VMIC, [v_mic], [Micro version])
59AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison]) 57AC_DEFINE_UNQUOTED(VREV, [v_rev], [Revison])
60version_info="lt_cur:lt_rev:lt_age" 58version_info="lt_cur:lt_rev:lt_age"
61release_info="v_rel" 59release_info="v_rel"
62AC_SUBST(version_info) 60AC_SUBST([version_info])
63AC_SUBST(release_info) 61AC_SUBST([release_info])
64##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 62##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
65##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--## 63##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##--##
66 64
67release=relname 65release=relname
68AC_SUBST(release) 66AC_SUBST([release])
69 67
70PKG_PROG_PKG_CONFIG 68PKG_PROG_PKG_CONFIG
71 69
@@ -93,7 +91,7 @@ extern char **environ;
93AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var]) 91AC_DEFINE(HAVE_ENVIRON, 1, [Have environ var])
94 ]) 92 ])
95 93
96efl_version="1.8.0" 94efl_version="1.8.99"
97AC_SUBST(efl_version) 95AC_SUBST(efl_version)
98 96
99AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h]) 97AC_CHECK_HEADERS([sys/timerfd.h sys/ptrace.h arpa/inet.h netinet/in.h])
@@ -112,11 +110,11 @@ if test "x$res" = "xno"; then
112 fi 110 fi
113fi 111fi
114 112
115AC_SUBST(fnmatch_libs) 113AC_SUBST([fnmatch_libs])
116 114
117have_pam=no 115have_pam=no
118AC_ARG_ENABLE(pam, 116AC_ARG_ENABLE(pam,
119 AC_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]), 117 AS_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]),
120 [want_pam=$enableval], 118 [want_pam=$enableval],
121 [want_pam=auto] 119 [want_pam=auto]
122) 120)
@@ -131,11 +129,11 @@ if test "x$want_pam" != "xno" ; then
131fi 129fi
132 130
133dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:]) 131dnl AC_E_CHECK_PKG(VALGRIND, [valgrind >= 2.4.0], [], [:])
134AC_SUBST(VALGRIND_CFLAGS) 132AC_SUBST([VALGRIND_CFLAGS])
135AC_SUBST(VALGRIND_LIBS) 133AC_SUBST([VALGRIND_LIBS])
136 134
137MODULE_ARCH="$host_os-$host_cpu-relname" 135MODULE_ARCH="$host_os-$host_cpu-relname"
138AC_SUBST(MODULE_ARCH) 136AC_SUBST([MODULE_ARCH])
139AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture") 137AC_DEFINE_UNQUOTED(MODULE_ARCH, "$MODULE_ARCH", "Module architecture")
140 138
141if test "x${bindir}" = 'xNONE'; then 139if test "x${bindir}" = 'xNONE'; then
@@ -147,7 +145,7 @@ if test "x${bindir}" = 'xNONE'; then
147else 145else
148 PACKAGE_BIN_DIR="${bindir}" 146 PACKAGE_BIN_DIR="${bindir}"
149fi 147fi
150AC_SUBST(PACKAGE_BIN_DIR) 148AC_SUBST([PACKAGE_BIN_DIR])
151 149
152if test "x${libdir}" = 'xNONE'; then 150if test "x${libdir}" = 'xNONE'; then
153 if test "x${prefix}" = "xNONE"; then 151 if test "x${prefix}" = "xNONE"; then
@@ -158,7 +156,7 @@ if test "x${libdir}" = 'xNONE'; then
158else 156else
159 PACKAGE_LIB_DIR="${libdir}" 157 PACKAGE_LIB_DIR="${libdir}"
160fi 158fi
161AC_SUBST(PACKAGE_LIB_DIR) 159AC_SUBST([PACKAGE_LIB_DIR])
162 160
163if test "x${prefix}" = "xNONE"; then 161if test "x${prefix}" = "xNONE"; then
164 PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}" 162 PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
@@ -169,15 +167,15 @@ else
169 LOCALE_DIR="${prefix}/share/locale" 167 LOCALE_DIR="${prefix}/share/locale"
170 PACKAGE_SYSCONF_DIR="${sysconfdir}" 168 PACKAGE_SYSCONF_DIR="${sysconfdir}"
171fi 169fi
172AC_SUBST(PACKAGE_DATA_DIR) 170AC_SUBST([PACKAGE_DATA_DIR])
173AC_SUBST(LOCALE_DIR) 171AC_SUBST([LOCALE_DIR])
174AC_SUBST(PACKAGE_SYSCONF_DIR) 172AC_SUBST([PACKAGE_SYSCONF_DIR])
175 173
176####################################### 174#######################################
177## Simple X11 build/link 175## Simple X11 build/link
178 176
179AC_ARG_ENABLE(simple-x11, 177AC_ARG_ENABLE(simple-x11,
180 AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]), 178 AS_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]),
181 [ want_evas_simple_x11=$enableval ] 179 [ want_evas_simple_x11=$enableval ]
182) 180)
183 181
@@ -198,8 +196,8 @@ dnl ],[
198dnl AC_MSG_ERROR([Cannot find X headers and libraries.]) 196dnl AC_MSG_ERROR([Cannot find X headers and libraries.])
199dnl ] 197dnl ]
200dnl ) 198dnl )
201dnl AC_SUBST(x_cflags) 199dnl AC_SUBST([x_cflags])
202dnl AC_SUBST(x_libs) 200dnl AC_SUBST([x_libs])
203 201
204cf_cflags="" 202cf_cflags=""
205cf_libs="" 203cf_libs=""
@@ -213,8 +211,8 @@ AC_CHECK_HEADERS(CFBase.h,
213 ] 211 ]
214) 212)
215CPPFLAGS="${PCPPFLAGS}" 213CPPFLAGS="${PCPPFLAGS}"
216AC_SUBST(cf_cflags) 214AC_SUBST([cf_cflags])
217AC_SUBST(cf_libs) 215AC_SUBST([cf_libs])
218 216
219PKG_CHECK_MODULES([BLUEZ], [bluez], 217PKG_CHECK_MODULES([BLUEZ], [bluez],
220 [have_bluetooth="yes"], 218 [have_bluetooth="yes"],
@@ -296,7 +294,7 @@ dnl fi
296#ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW" 294#ALL_LINGUAS="bg de eo es fi fr ja pt ru zh_CN hu sl it cs da sk sv nb nl zh_TW"
297# a lot of .po's are broken 295# a lot of .po's are broken
298ALL_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" 296ALL_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"
299AC_SUBST(ALL_LINGUAS) 297AC_SUBST([ALL_LINGUAS])
300 298
301m4_ifdef([AM_GNU_GETTEXT_VERSION], [ 299m4_ifdef([AM_GNU_GETTEXT_VERSION], [
302AM_GNU_GETTEXT_VERSION([0.17]) 300AM_GNU_GETTEXT_VERSION([0.17])
@@ -315,7 +313,7 @@ have_po="yes"
315have_po="no" 313have_po="no"
316]) 314])
317]) 315])
318AC_SUBST(LTLIBINTL) 316AC_SUBST([LTLIBINTL])
319if test "x$LIBINTL" = "x"; then 317if test "x$LIBINTL" = "x"; then
320 LIBINTL="$INTLLIBS" 318 LIBINTL="$INTLLIBS"
321fi 319fi
@@ -327,7 +325,7 @@ fi
327AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"]) 325AM_CONDITIONAL([HAVE_PO], [test "x${have_po}" = "xyes"])
328 326
329AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl) 327AC_CHECK_LIB(dl, dlopen, dlopen_libs=-ldl)
330AC_SUBST(dlopen_libs) 328AC_SUBST([dlopen_libs])
331 329
332AC_MSG_CHECKING([whether to install sysactions.conf]) 330AC_MSG_CHECKING([whether to install sysactions.conf])
333AC_ARG_ENABLE([install-sysactions], 331AC_ARG_ENABLE([install-sysactions],
@@ -480,10 +478,7 @@ PKG_CHECK_MODULES(E_THUMB, [
480 478
481PKG_CHECK_MODULES(E_GRABBER, [ 479PKG_CHECK_MODULES(E_GRABBER, [
482 eina >= ${efl_version} 480 eina >= ${efl_version}
483 ecore >= ${efl_version}
484 eet >= ${efl_version} 481 eet >= ${efl_version}
485 efreet >= ${efl_version}
486 ecore-x >= ${efl_version}
487]) 482])
488 483
489efm_requires="\ 484efm_requires="\
@@ -591,10 +586,10 @@ e_libs="$E_LIBS $LIBINTL $fnmatch_libs $execinfo_libs"
591e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS" 586e_cflags="-DUSE_E_CONFIG_H $E_CFLAGS"
592e_configflags="-DUSE_E_CONFIG_H" 587e_configflags="-DUSE_E_CONFIG_H"
593 588
594AC_SUBST(e_libs) 589AC_SUBST([e_libs])
595AC_SUBST(e_cflags) 590AC_SUBST([e_cflags])
596AC_SUBST(e_configflags) 591AC_SUBST([e_configflags])
597AC_SUBST(requirements_e) 592AC_SUBST([requirements_e])
598 593
599PKG_CHECK_EXISTS([xkeyboard-config],[ 594PKG_CHECK_EXISTS([xkeyboard-config],[
600 xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config 2>/dev/null` 595 xkb_base=`$PKG_CONFIG --variable=xkb_base xkeyboard-config 2>/dev/null`
@@ -610,7 +605,7 @@ AC_ARG_WITH(profile,
610AC_MSG_NOTICE([Enlightenment build profile set to $profile]) 605AC_MSG_NOTICE([Enlightenment build profile set to $profile])
611EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6" 606EDJE_DEF="-DLOWRES_PDA=1 -DMEDIUMRES_PDA=2 -DHIRES_PDA=3 -DSLOW_PC=4 -DMEDIUM_PC=5 -DFAST_PC=6"
612EDJE_DEF=$EDJE_DEF" -DE18_PROFILE"=$profile 607EDJE_DEF=$EDJE_DEF" -DE18_PROFILE"=$profile
613AC_SUBST(EDJE_DEF) 608AC_SUBST([EDJE_DEF])
614 609
615AC_ARG_WITH(edje-cc, 610AC_ARG_WITH(edje-cc,
616[ --with-edje-cc=PATH specify a specific path to edje_cc], 611[ --with-edje-cc=PATH specify a specific path to edje_cc],
@@ -621,7 +616,7 @@ AC_ARG_WITH(edje-cc,
621],[ 616],[
622 edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc 617 edje_cc=$(pkg-config --variable=prefix edje)/bin/edje_cc
623]) 618])
624AC_SUBST(edje_cc) 619AC_SUBST([edje_cc])
625 620
626PKG_CHECK_MODULES(EET, [eet >= ${efl_version}]) 621PKG_CHECK_MODULES(EET, [eet >= ${efl_version}])
627AC_ARG_WITH(eet-eet, 622AC_ARG_WITH(eet-eet,
@@ -633,7 +628,7 @@ AC_ARG_WITH(eet-eet,
633],[ 628],[
634 eet_eet=$(pkg-config --variable=prefix eet)/bin/eet 629 eet_eet=$(pkg-config --variable=prefix eet)/bin/eet
635]) 630])
636AC_SUBST(eet_eet) 631AC_SUBST([eet_eet])
637 632
638AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported") 633AC_DEFINE(E_INTERNAL, 1, "This define can be used to wrap internal E stuff, as config.h isn't exported")
639 634
@@ -654,7 +649,7 @@ case "$host_os" in
654 ;; 649 ;;
655esac 650esac
656 651
657AC_SUBST(BATTERY_LDFLAGS) 652AC_SUBST([BATTERY_LDFLAGS])
658AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"]) 653AM_CONDITIONAL([HAVE_OPENBSD], [test "x${have_openbsd}" = "xyes"])
659 654
660AM_CONDITIONAL(HAVE_TEMPERATURE, false) 655AM_CONDITIONAL(HAVE_TEMPERATURE, false)
@@ -671,7 +666,7 @@ define([CHECK_MODULE_MUSIC_CONTROL],
671 666
672##have_exchange=no 667##have_exchange=no
673##AC_ARG_ENABLE(exchange, 668##AC_ARG_ENABLE(exchange,
674## AC_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]), 669## AS_HELP_STRING([--disable-exchange], [disable Exchange support @<:@default=detect@:>@]),
675## [want_exchange=$enableval], 670## [want_exchange=$enableval],
676## [want_exchange=auto] 671## [want_exchange=auto]
677##) 672##)
@@ -690,7 +685,7 @@ AM_CONDITIONAL(HAVE_EXCHANGE, false)
690have_enotify=no 685have_enotify=no
691AM_CONDITIONAL([HAVE_ENOTIFY], [false]) 686AM_CONDITIONAL([HAVE_ENOTIFY], [false])
692AC_ARG_ENABLE([enotify], 687AC_ARG_ENABLE([enotify],
693 AC_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]), 688 AS_HELP_STRING([--disable-enotify], [disable Enotify support @<:@default=detect@:>@]),
694 [e_cv_want_enotify=$enableval], 689 [e_cv_want_enotify=$enableval],
695 AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes]) 690 AC_CACHE_VAL([e_cv_want_enotify], [e_cv_want_enotify=yes])
696) 691)
@@ -718,6 +713,7 @@ define([CHECK_MODULE_NOTIFICATION],
718 fi 713 fi
719]) 714])
720 715
716
721AM_CONDITIONAL(HAVE_ALSA, false) 717AM_CONDITIONAL(HAVE_ALSA, false)
722define([CHECK_MODULE_MIXER], 718define([CHECK_MODULE_MIXER],
723[ 719[
@@ -743,8 +739,8 @@ define([CHECK_MODULE_MIXER],
743 fi 739 fi
744]) 740])
745 741
746AC_SUBST(SOUND_CFLAGS) 742AC_SUBST([SOUND_CFLAGS])
747AC_SUBST(SOUND_LIBS) 743AC_SUBST([SOUND_LIBS])
748 744
749AM_CONDITIONAL(HAVE_ECONNMAN, false) 745AM_CONDITIONAL(HAVE_ECONNMAN, false)
750AM_CONDITIONAL(HAVE_DUMMY, false) 746AM_CONDITIONAL(HAVE_DUMMY, false)
@@ -753,8 +749,8 @@ define([CHECK_MODULE_CONNMAN],
753 AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false]) 749 AC_E_CHECK_PKG(ECONNMAN, [ eldbus >= $efl_version ], [], [CONNMAN=false])
754dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false]) 750dnl AC_E_CHECK_PKG(DUMMY, [ connman >= 1.0 ], [], [CONNMAN=false])
755]) 751])
756AC_SUBST(ECONNMAN_CFLAGS) 752AC_SUBST([ECONNMAN_CFLAGS])
757AC_SUBST(ECONNMAN_LIBS) 753AC_SUBST([ECONNMAN_LIBS])
758 754
759AM_CONDITIONAL(HAVE_BLUEZ4, false) 755AM_CONDITIONAL(HAVE_BLUEZ4, false)
760AM_CONDITIONAL(HAVE_DUMMY, false) 756AM_CONDITIONAL(HAVE_DUMMY, false)
@@ -762,8 +758,8 @@ define([CHECK_MODULE_BLUEZ4],
762[ 758[
763 AC_E_CHECK_PKG(BLUEZ4, [ eldbus ],) 759 AC_E_CHECK_PKG(BLUEZ4, [ eldbus ],)
764]) 760])
765AC_SUBST(EBLUEZ4_CFLAGS) 761AC_SUBST([EBLUEZ4_CFLAGS])
766AC_SUBST(EBLUEZ4_LIBS) 762AC_SUBST([EBLUEZ4_LIBS])
767 763
768have_wayland_clients=no 764have_wayland_clients=no
769AC_ARG_ENABLE([wayland-clients], 765AC_ARG_ENABLE([wayland-clients],
@@ -917,10 +913,10 @@ case "$host_os" in
917 fi 913 fi
918 ;; 914 ;;
919esac 915esac
920AC_SUBST(HALT) 916AC_SUBST([HALT])
921AC_SUBST(REBOOT) 917AC_SUBST([REBOOT])
922AC_SUBST(SUSPEND) 918AC_SUBST([SUSPEND])
923AC_SUBST(HIBERNATE) 919AC_SUBST([HIBERNATE])
924 920
925m4_ifdef([v_mic], 921m4_ifdef([v_mic],
926 [ 922 [
@@ -939,11 +935,7 @@ AC_OUTPUT([
939Makefile 935Makefile
940enlightenment.spec 936enlightenment.spec
941enlightenment.pc 937enlightenment.pc
942src/Makefile
943src/bin/Makefile
944src/bin/e_fm_shared_types.h 938src/bin/e_fm_shared_types.h
945src/bin/e_fm/Makefile
946src/modules/Makefile
947src/modules/ibar/module.desktop 939src/modules/ibar/module.desktop
948src/modules/clock/module.desktop 940src/modules/clock/module.desktop
949src/modules/pager/module.desktop 941src/modules/pager/module.desktop
@@ -1005,28 +997,11 @@ src/modules/music-control/module.desktop
1005src/modules/contact/module.desktop 997src/modules/contact/module.desktop
1006src/modules/wl_desktop_shell/module.desktop 998src/modules/wl_desktop_shell/module.desktop
1007src/modules/wl_screenshot/module.desktop 999src/modules/wl_screenshot/module.desktop
1008data/Makefile
1009data/images/Makefile
1010data/flags/Makefile
1011data/favorites/Makefile
1012data/desktop/Makefile
1013data/input_methods/Makefile
1014data/xsession/Makefile
1015data/xsession/enlightenment.desktop 1000data/xsession/enlightenment.desktop
1016data/tools/Makefile
1017data/etc/Makefile
1018data/etc/sysactions.conf 1001data/etc/sysactions.conf
1019data/icons/Makefile
1020data/backgrounds/Makefile
1021data/units/Makefile
1022data/units/e18.service 1002data/units/e18.service
1023doc/Makefile
1024doc/Doxyfile 1003doc/Doxyfile
1025doc/e.dox 1004doc/e.dox
1026config/Makefile
1027config/default/Makefile
1028config/standard/Makefile
1029config/mobile/Makefile
1030$po_makefile_in 1005$po_makefile_in
1031]) 1006])
1032 1007
diff --git a/data/Makefile.am b/data/Makefile.am
deleted file mode 100644
index 7a7cc39..0000000
--- a/data/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2SUBDIRS = \
3images \
4tools \
5xsession \
6input_methods \
7etc \
8icons \
9backgrounds \
10flags \
11favorites \
12desktop \
13units
14
diff --git a/data/Makefile.mk b/data/Makefile.mk
new file mode 100644
index 0000000..783744b
--- /dev/null
+++ b/data/Makefile.mk
@@ -0,0 +1,11 @@
1include data/images/Makefile.mk
2include data/tools/Makefile.mk
3include data/xsession/Makefile.mk
4include data/input_methods/Makefile.mk
5include data/etc/Makefile.mk
6include data/icons/Makefile.mk
7include data/backgrounds/Makefile.mk
8include data/flags/Makefile.mk
9include data/favorites/Makefile.mk
10include data/desktop/Makefile.mk
11include data/units/Makefile.mk
diff --git a/data/backgrounds/Makefile.am b/data/backgrounds/Makefile.am
deleted file mode 100644
index 3ad6ad8..0000000
--- a/data/backgrounds/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/enlightenment/data/backgrounds
3files_DATA = \
4Brown_Rock_Hi.edj \
5Colorful_Roses.edj \
6Darkconcrete.edj \
7Dark_Gradient.edj \
8Grassy.edj \
9Japanesemaple.edj \
10Lakegrass.edj \
11Light_Gradient.edj \
12Mossstring.edj \
13Motleyrock.edj \
14Newgrowth.edj \
15Orange_Roses.edj \
16Pattern_Radial.edj \
17Pattern_Vertical.edj \
18Pattern_Vertical_Hi.edj \
19Pine_Silhouettes.edj \
20Purple_Flower_Bunch.edj \
21Skywall.edj \
22Stringflower.edj \
23Wetgrass.edj \
24Wetleaf.edj \
25Whiterock.edj \
26Hills.edj \
27Light.edj \
28Temple.edj \
29Train.edj \
30Curly_Leaves.edj \
31Flower_Petals.edj \
32Go_Away.edj \
33Green_Stem.edj \
34Leafy_Red.edj \
35Ramen.edj \
36Shady_Leaves.edj \
37Windy_Palm.edj \
38Lantern_Cluster.edj \
39Wall_Lanterns.edj
40
41
42EXTRA_DIST = $(files_DATA)
diff --git a/data/backgrounds/Makefile.mk b/data/backgrounds/Makefile.mk
new file mode 100644
index 0000000..8be227d
--- /dev/null
+++ b/data/backgrounds/Makefile.mk
@@ -0,0 +1,41 @@
1backgroundfilesdir = $(datadir)/enlightenment/data/backgrounds
2backgroundfiles_DATA = \
3data/backgrounds/Brown_Rock_Hi.edj \
4data/backgrounds/Colorful_Roses.edj \
5data/backgrounds/Darkconcrete.edj \
6data/backgrounds/Dark_Gradient.edj \
7data/backgrounds/Grassy.edj \
8data/backgrounds/Japanesemaple.edj \
9data/backgrounds/Lakegrass.edj \
10data/backgrounds/Light_Gradient.edj \
11data/backgrounds/Mossstring.edj \
12data/backgrounds/Motleyrock.edj \
13data/backgrounds/Newgrowth.edj \
14data/backgrounds/Orange_Roses.edj \
15data/backgrounds/Pattern_Radial.edj \
16data/backgrounds/Pattern_Vertical.edj \
17data/backgrounds/Pattern_Vertical_Hi.edj \
18data/backgrounds/Pine_Silhouettes.edj \
19data/backgrounds/Purple_Flower_Bunch.edj \
20data/backgrounds/Skywall.edj \
21data/backgrounds/Stringflower.edj \
22data/backgrounds/Wetgrass.edj \
23data/backgrounds/Wetleaf.edj \
24data/backgrounds/Whiterock.edj \
25data/backgrounds/Hills.edj \
26data/backgrounds/Light.edj \
27data/backgrounds/Temple.edj \
28data/backgrounds/Train.edj \
29data/backgrounds/Curly_Leaves.edj \
30data/backgrounds/Flower_Petals.edj \
31data/backgrounds/Go_Away.edj \
32data/backgrounds/Green_Stem.edj \
33data/backgrounds/Leafy_Red.edj \
34data/backgrounds/Ramen.edj \
35data/backgrounds/Shady_Leaves.edj \
36data/backgrounds/Windy_Palm.edj \
37data/backgrounds/Lantern_Cluster.edj \
38data/backgrounds/Wall_Lanterns.edj
39
40
41EXTRA_DIST += $(backgroundfiles_DATA)
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
deleted file mode 100644
index 20a5004..0000000
--- a/data/desktop/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/applications
3files_DATA = \
4 enlightenment_filemanager.desktop
5
6EXTRA_DIST = $(files_DATA)
diff --git a/data/desktop/Makefile.mk b/data/desktop/Makefile.mk
new file mode 100644
index 0000000..07730a2
--- /dev/null
+++ b/data/desktop/Makefile.mk
@@ -0,0 +1,5 @@
1desktopfilesdir = $(datadir)/applications
2desktopfiles_DATA = \
3data/desktop/enlightenment_filemanager.desktop
4
5EXTRA_DIST += $(desktopfiles_DATA)
diff --git a/data/etc/Makefile.am b/data/etc/Makefile.am
deleted file mode 100644
index 2c50f01..0000000
--- a/data/etc/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(sysconfdir)/enlightenment
3files_DATA =
4
5if INSTALL_SYSACTIONS
6files_DATA += sysactions.conf
7endif
8
9menusdir = $(sysconfdir)/xdg/menus
10menus_DATA =
11
12if INSTALL_ENLIGHTENMENT_MENU
13menus_DATA += enlightenment.menu
14endif
15
16EXTRA_DIST = $(files_DATA) $(menus_DATA)
diff --git a/data/etc/Makefile.mk b/data/etc/Makefile.mk
new file mode 100644
index 0000000..8fc86d8
--- /dev/null
+++ b/data/etc/Makefile.mk
@@ -0,0 +1,15 @@
1etcfilesdir = $(sysconfdir)/enlightenment
2etcfiles_DATA =
3
4if INSTALL_SYSACTIONS
5etcfiles_DATA += data/etc/sysactions.conf
6endif
7
8etcmenusdir = $(sysconfdir)/xdg/menus
9etcmenus_DATA =
10
11if INSTALL_ENLIGHTENMENT_MENU
12etcmenus_DATA += data/etc/enlightenment.menu
13endif
14
15EXTRA_DIST += $(etcfiles_DATA) $(etcmenus_DATA)
diff --git a/data/favorites/Makefile.am b/data/favorites/Makefile.am
deleted file mode 100644
index 3ec05c8..0000000
--- a/data/favorites/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3favsdir = $(datadir)/enlightenment/data/favorites
4favs_DATA = \
5.order \
6desktop.desktop \
7home.desktop \
8root.desktop \
9tmp.desktop
10
11EXTRA_DIST = $(favs_DATA)
diff --git a/data/favorites/Makefile.mk b/data/favorites/Makefile.mk
new file mode 100644
index 0000000..785754e
--- /dev/null
+++ b/data/favorites/Makefile.mk
@@ -0,0 +1,9 @@
1datafavsdir = $(datadir)/enlightenment/data/favorites
2datafavs_DATA = \
3data/favorites/.order \
4data/favorites/desktop.desktop \
5data/favorites/home.desktop \
6data/favorites/root.desktop \
7data/favorites/tmp.desktop
8
9EXTRA_DIST += $(datafavs_DATA)
diff --git a/data/flags/Makefile.am b/data/flags/Makefile.am
deleted file mode 100644
index ce80dd7..0000000
--- a/data/flags/Makefile.am
+++ /dev/null
@@ -1,104 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/enlightenment/data/flags
3files_DATA = \
4ad_flag.png \
5af_flag.png \
6al_flag.png \
7am_flag.png \
8ara_flag.png \
9ar_flag.png \
10at_flag.png \
11az_flag.png \
12ba_flag.png \
13bd_flag.png \
14be_flag.png \
15bg_flag.png \
16brai_flag.png \
17br_flag.png \
18bt_flag.png \
19bw_flag.png \
20by_flag.png \
21ca_flag.png \
22cat_flag.png \
23cd_flag.png \
24ch_flag.png \
25cm_flag.png \
26cn_flag.png \
27cz_flag.png \
28de_flag.png \
29dk_flag.png \
30ee_flag.png \
31epo_flag.png \
32es_flag.png \
33et_flag.png \
34fi_flag.png \
35fo_flag.png \
36fr_flag.png \
37gb_flag.png \
38ge_flag.png \
39gh_flag.png \
40gn_flag.png \
41gr_flag.png \
42hr_flag.png \
43hu_flag.png \
44ie_flag.png \
45il_flag.png \
46in_flag.png \
47iq_flag.png \
48ir_flag.png \
49is_flag.png \
50it_flag.png \
51jp_flag.png \
52ke_flag.png \
53kg_flag.png \
54kh_flag.png \
55kr_flag.png \
56ku_flag.png \
57kz_flag.png \
58la_flag.png \
59lang-system.png \
60latam_flag.png \
61lk_flag.png \
62lt_flag.png \
63lv_flag.png \
64ma_flag.png \
65mao_flag.png \
66md_flag.png \
67me_flag.png \
68mk_flag.png \
69ml_flag.png \
70mm_flag.png \
71mn_flag.png \
72mt_flag.png \
73mv_flag.png \
74my_flag.png \
75ng_flag.png \
76nl_flag.png \
77no_flag.png \
78np_flag.png \
79ph_flag.png \
80pk_flag.png \
81pl_flag.png \
82pt_flag.png \
83ro_flag.png \
84rs_flag.png \
85ru_flag.png \
86se_flag.png \
87si_flag.png \
88sk_flag.png \
89sn_flag.png \
90sy_flag.png \
91th_flag.png \
92tj_flag.png \
93tm_flag.png \
94tr_flag.png \
95tw_flag.png \
96tz_flag.png \
97ua_flag.png \
98unknown_flag.png \
99us_flag.png \
100uz_flag.png \
101vn_flag.png \
102za_flag.png
103
104EXTRA_DIST = $(files_DATA)
diff --git a/data/flags/Makefile.mk b/data/flags/Makefile.mk
new file mode 100644
index 0000000..88efee1
--- /dev/null
+++ b/data/flags/Makefile.mk
@@ -0,0 +1,103 @@
1dataflagsfilesdir = $(datadir)/enlightenment/data/flags
2dataflagsfiles_DATA = \
3data/flags/ad_flag.png \
4data/flags/af_flag.png \
5data/flags/al_flag.png \
6data/flags/am_flag.png \
7data/flags/ara_flag.png \
8data/flags/ar_flag.png \
9data/flags/at_flag.png \
10data/flags/az_flag.png \
11data/flags/ba_flag.png \
12data/flags/bd_flag.png \
13data/flags/be_flag.png \
14data/flags/bg_flag.png \
15data/flags/brai_flag.png \
16data/flags/br_flag.png \
17data/flags/bt_flag.png \
18data/flags/bw_flag.png \
19data/flags/by_flag.png \
20data/flags/ca_flag.png \
21data/flags/cat_flag.png \
22data/flags/cd_flag.png \
23data/flags/ch_flag.png \
24data/flags/cm_flag.png \
25data/flags/cn_flag.png \
26data/flags/cz_flag.png \
27data/flags/de_flag.png \
28data/flags/dk_flag.png \
29data/flags/ee_flag.png \
30data/flags/epo_flag.png \
31data/flags/es_flag.png \
32data/flags/et_flag.png \
33data/flags/fi_flag.png \
34data/flags/fo_flag.png \
35data/flags/fr_flag.png \
36data/flags/gb_flag.png \
37data/flags/ge_flag.png \
38data/flags/gh_flag.png \
39data/flags/gn_flag.png \
40data/flags/gr_flag.png \
41data/flags/hr_flag.png \
42data/flags/hu_flag.png \
43data/flags/ie_flag.png \
44data/flags/il_flag.png \
45data/flags/in_flag.png \
46data/flags/iq_flag.png \
47data/flags/ir_flag.png \
48data/flags/is_flag.png \
49data/flags/it_flag.png \
50data/flags/jp_flag.png \
51data/flags/ke_flag.png \
52data/flags/kg_flag.png \
53data/flags/kh_flag.png \
54data/flags/kr_flag.png \
55data/flags/ku_flag.png \
56data/flags/kz_flag.png \
57data/flags/la_flag.png \
58data/flags/lang-system.png \
59data/flags/latam_flag.png \
60data/flags/lk_flag.png \
61data/flags/lt_flag.png \
62data/flags/lv_flag.png \
63data/flags/ma_flag.png \
64data/flags/mao_flag.png \
65data/flags/md_flag.png \
66data/flags/me_flag.png \
67data/flags/mk_flag.png \
68data/flags/ml_flag.png \
69data/flags/mm_flag.png \
70data/flags/mn_flag.png \
71data/flags/mt_flag.png \
72data/flags/mv_flag.png \
73data/flags/my_flag.png \
74data/flags/ng_flag.png \
75data/flags/nl_flag.png \
76data/flags/no_flag.png \
77data/flags/np_flag.png \
78data/flags/ph_flag.png \
79data/flags/pk_flag.png \
80data/flags/pl_flag.png \
81data/flags/pt_flag.png \
82data/flags/ro_flag.png \
83data/flags/rs_flag.png \
84data/flags/ru_flag.png \
85data/flags/se_flag.png \
86data/flags/si_flag.png \
87data/flags/sk_flag.png \
88data/flags/sn_flag.png \
89data/flags/sy_flag.png \
90data/flags/th_flag.png \
91data/flags/tj_flag.png \
92data/flags/tm_flag.png \
93data/flags/tr_flag.png \
94data/flags/tw_flag.png \
95data/flags/tz_flag.png \
96data/flags/ua_flag.png \
97data/flags/unknown_flag.png \
98data/flags/us_flag.png \
99data/flags/uz_flag.png \
100data/flags/vn_flag.png \
101data/flags/za_flag.png
102
103EXTRA_DIST += $(dataflagsfiles_DATA)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
deleted file mode 100644
index 37e708b..0000000
--- a/data/icons/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/enlightenment/data/icons
3files_DATA = \
4xterm.png \
5web_browser.png \
6audio_player.png \
7mail_client.png \
8video_player.png \
9text_editor.png \
10image_viewer.png \
11audio_player2.png
12
13EXTRA_DIST = $(files_DATA)
diff --git a/data/icons/Makefile.mk b/data/icons/Makefile.mk
new file mode 100644
index 0000000..84951de
--- /dev/null
+++ b/data/icons/Makefile.mk
@@ -0,0 +1,12 @@
1iconsfilesdir = $(datadir)/enlightenment/data/icons
2iconsfiles_DATA = \
3data/icons/xterm.png \
4data/icons/web_browser.png \
5data/icons/audio_player.png \
6data/icons/mail_client.png \
7data/icons/video_player.png \
8data/icons/text_editor.png \
9data/icons/image_viewer.png \
10data/icons/audio_player2.png
11
12EXTRA_DIST += $(iconsfiles_DATA)
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
deleted file mode 100644
index 7a340b0..0000000
--- a/data/images/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/enlightenment/data/images
3files_DATA = \
4enlightenment.png \
5test.png \
6test.jpg \
7test.edj \
8test.svg
9
10EXTRA_DIST = $(files_DATA)
diff --git a/data/images/Makefile.mk b/data/images/Makefile.mk
new file mode 100644
index 0000000..0dfe56d
--- /dev/null
+++ b/data/images/Makefile.mk
@@ -0,0 +1,9 @@
1imagesfilesdir = $(datadir)/enlightenment/data/images
2imagesfiles_DATA = \
3data/images/enlightenment.png \
4data/images/test.png \
5data/images/test.jpg \
6data/images/test.edj \
7data/images/test.svg
8
9EXTRA_DIST += $(imagesfiles_DATA)
diff --git a/data/input_methods/Makefile.am b/data/input_methods/Makefile.am
deleted file mode 100644
index 8b7832b..0000000
--- a/data/input_methods/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/enlightenment/data/input_methods
3files_DATA = \
4scim.imc \
5uim.imc \
6iiimf.imc \
7ibus.imc \
8gcin.imc \
9hime.imc \
10fcitx.imc
11
12EXTRA_DIST = $(files_DATA)
diff --git a/data/input_methods/Makefile.mk b/data/input_methods/Makefile.mk
new file mode 100644
index 0000000..16955c4
--- /dev/null
+++ b/data/input_methods/Makefile.mk
@@ -0,0 +1,11 @@
1imcfilesdir = $(datadir)/enlightenment/data/input_methods
2imcfiles_DATA = \
3data/input_methods/scim.imc \
4data/input_methods/uim.imc \
5data/input_methods/iiimf.imc \
6data/input_methods/ibus.imc \
7data/input_methods/gcin.imc \
8data/input_methods/hime.imc \
9data/input_methods/fcitx.imc
10
11EXTRA_DIST += $(imcfiles_DATA)
diff --git a/data/tools/Makefile.am b/data/tools/Makefile.am
deleted file mode 100644
index c3d733f..0000000
--- a/data/tools/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2
3enlightenment_remotedir = $(bindir)
4
5enlightenment_remote_SCRIPTS = enlightenment_remote
6
7EXTRA_DIST = enlightenment_remote
8
diff --git a/data/tools/Makefile.mk b/data/tools/Makefile.mk
new file mode 100644
index 0000000..60394ca
--- /dev/null
+++ b/data/tools/Makefile.mk
@@ -0,0 +1,6 @@
1enlightenment_remotedir = $(bindir)
2
3enlightenment_remote_SCRIPTS = data/tools/enlightenment_remote
4
5EXTRA_DIST += data/tools/enlightenment_remote
6
diff --git a/data/units/Makefile.am b/data/units/Makefile.am
deleted file mode 100644
index 04ed87f..0000000
--- a/data/units/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
1AUTOMAKE_OPTIONS = 1.4 foreign
2MAINTAINERCLEANFILES = Makefile.in
3
4if HAVE_SYSTEMD_USER_SESSION
5unitsdir = $(USER_SESSION_DIR)
6units_DATA = e18.service
7endif
8
9EXTRA_DIST = $(units_DATA)
diff --git a/data/units/Makefile.mk b/data/units/Makefile.mk
new file mode 100644
index 0000000..4387289
--- /dev/null
+++ b/data/units/Makefile.mk
@@ -0,0 +1,6 @@
1if HAVE_SYSTEMD_USER_SESSION
2unitsdir = $(USER_SESSION_DIR)
3units_DATA = data/units/e18.service
4endif
5
6EXTRA_DIST += $(units_DATA)
diff --git a/data/xsession/Makefile.am b/data/xsession/Makefile.am
deleted file mode 100644
index 27b57b2..0000000
--- a/data/xsession/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2filesdir = $(datadir)/xsessions
3files_DATA = enlightenment.desktop
4EXTRA_DIST = enlightenment.desktop.in
diff --git a/data/xsession/Makefile.mk b/data/xsession/Makefile.mk
new file mode 100644
index 0000000..c428580
--- /dev/null
+++ b/data/xsession/Makefile.mk
@@ -0,0 +1,3 @@
1xsessionfilesdir = $(datadir)/xsessions
2xsessionfiles_DATA = data/xsession/enlightenment.desktop
3EXTRA_DIST += data/xsession/enlightenment.desktop.in
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 20d2d3e..11359d0 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,15 +1,15 @@
1PROJECT_NAME = Enlightenment 1PROJECT_NAME = Enlightenment
2PROJECT_NUMBER = 2PROJECT_NUMBER =
3OUTPUT_DIRECTORY = . 3OUTPUT_DIRECTORY = @builddir@/doc
4INPUT = @builddir@/e.dox @top_srcdir@/src 4INPUT = @builddir@/doc/e.dox @top_srcdir@/src
5IMAGE_PATH = @srcdir@/img 5IMAGE_PATH = @srcdir@/doc/img
6OUTPUT_LANGUAGE = English 6OUTPUT_LANGUAGE = English
7GENERATE_HTML = YES 7GENERATE_HTML = YES
8HTML_OUTPUT = html 8HTML_OUTPUT = html
9HTML_FILE_EXTENSION = .html 9HTML_FILE_EXTENSION = .html
10HTML_HEADER = @srcdir@/head.html 10HTML_HEADER = @srcdir@/doc/head.html
11HTML_FOOTER = @srcdir@/foot.html 11HTML_FOOTER = @srcdir@/doc/foot.html
12HTML_STYLESHEET = @srcdir@/e.css 12HTML_STYLESHEET = @srcdir@/doc/e.css
13ENUM_VALUES_PER_LINE = 1 13ENUM_VALUES_PER_LINE = 1
14GENERATE_HTMLHELP = NO 14GENERATE_HTMLHELP = NO
15CHM_FILE = 15CHM_FILE =
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 9c8631e..0000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in e.dox
2
3.PHONY: doc
4
5PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
6
7if EFL_BUILD_DOC
8
9doc-clean:
10 rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
11
12doc: all doc-clean
13 $(efl_doxygen)
14 cp $(srcdir)/img/* html/
15 rm -rf $(PACKAGE_DOCNAME).tar*
16 $(MKDIR_P) $(PACKAGE_DOCNAME)/doc
17 cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
18 tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
19 bzip2 -9 $(PACKAGE_DOCNAME).tar
20 rm -rf $(PACKAGE_DOCNAME)/
21 mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
22 @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
23
24clean-local: doc-clean
25
26else
27
28doc:
29 @echo "Documentation not built. Run ./configure --help"
30
31endif
32
33filesdir = $(datadir)/enlightenment/doc
34files_DATA = \
35documentation.html \
36illume2.html \
37FDO.txt \
38cache.txt \
39enlightenment.png \
40illume2.png
41
42EXTRA_DIST = $(files_DATA) Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html e.dox.in
diff --git a/doc/Makefile.mk b/doc/Makefile.mk
new file mode 100644
index 0000000..fd49b87
--- /dev/null
+++ b/doc/Makefile.mk
@@ -0,0 +1,47 @@
1MAINTAINERCLEANFILES += doc/e.dox
2
3PHONIES += doc doc-clean
4
5PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
6
7if EFL_BUILD_DOC
8
9doc-clean:
10 rm -rf doc/html/ doc/latex/ doc/man/ doc/xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
11
12doc: all doc-clean
13 @echo "entering doc/"
14 $(efl_doxygen) doc/Doxyfile
15 cp $(top_srcdir)/doc/img/* doc/html/
16 rm -rf $(PACKAGE_DOCNAME).tar*
17 $(MKDIR_P) $(PACKAGE_DOCNAME)/doc
18 cp -R doc/html/ doc/latex/ doc/man/ $(PACKAGE_DOCNAME)/doc
19 tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
20 bzip2 -9 $(PACKAGE_DOCNAME).tar
21 rm -rf $(PACKAGE_DOCNAME)/
22 @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
23
24else
25
26doc:
27 @echo "Documentation not built. Run ./configure --help"
28
29endif
30
31docfilesdir = $(datadir)/enlightenment/doc
32docfiles_DATA = \
33doc/documentation.html \
34doc/illume2.html \
35doc/FDO.txt \
36doc/cache.txt \
37doc/enlightenment.png \
38doc/illume2.png
39
40EXTRA_DIST += \
41$(docfiles_DATA) \
42doc/Doxyfile.in \
43$(wildcard doc/img/*.*) \
44doc/e.css \
45doc/head.html \
46doc/foot.html \
47doc/e.dox.in
diff --git a/m4/Makefile.mk b/m4/Makefile.mk
new file mode 100644
index 0000000..745d21c
--- /dev/null
+++ b/m4/Makefile.mk
@@ -0,0 +1,26 @@
1MAINTAINERCLEANFILES += \
2m4/libtool.m4 \
3m4/lt~obsolete.m4 \
4m4/ltoptions.m4 \
5m4/ltsugar.m4 \
6m4/ltversion.m4 \
7m4/codeset.m4 \
8m4/gettext.m4 \
9m4/glibc21.m4 \
10m4/iconv.m4 \
11m4/intdiv0.m4 \
12m4/inttypes_h.m4 \
13m4/inttypes.m4 \
14m4/inttypes-pri.m4 \
15m4/isc-posix.m4 \
16m4/lcmessage.m4 \
17m4/lib-ld.m4 \
18m4/lib-link.m4 \
19m4/lib-prefix.m4 \
20m4/nls.m4 \
21m4/po.m4 \
22m4/progtest.m4 \
23m4/stdint_h.m4 \
24m4/uintmax_t.m4 \
25m4/ulonglong.m4
26
diff --git a/po/Makefile.mk b/po/Makefile.mk
new file mode 100644
index 0000000..3ce95bf
--- /dev/null
+++ b/po/Makefile.mk
@@ -0,0 +1,10 @@
1MAINTAINERCLEANFILES += \
2po/boldquot.sed \
3po/en@boldquot.header \
4po/en@quot.header \
5po/insert-header.sin \
6po/Makefile.in.in \
7po/Makevars.template \
8po/quot.sed \
9po/remove-potcdate.sin \
10po/Rules-quot
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index c362549..0000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2SUBDIRS = bin modules
diff --git a/src/Makefile.mk b/src/Makefile.mk
new file mode 100644
index 0000000..5bd68cd
--- /dev/null
+++ b/src/Makefile.mk
@@ -0,0 +1,2 @@
1include src/bin/Makefile.mk
2include src/modules/Makefile.mk
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
deleted file mode 100644
index 273af05..0000000
--- a/src/bin/Makefile.am
+++ /dev/null
@@ -1,457 +0,0 @@
1SUBDIRS = e_fm
2
3MAINTAINERCLEANFILES = Makefile.in
4DISTCLEANFILES = e_fm_shared_types.h
5
6AM_CPPFLAGS = \
7-I$(top_builddir) \
8-I$(top_builddir)/src/bin \
9-I$(top_srcdir) \
10-I$(top_srcdir)/src/bin \
11@e_cflags@ \
12@cf_cflags@ \
13@VALGRIND_CFLAGS@ \
14@EDJE_DEF@ \
15@WAYLAND_CFLAGS@ \
16@WAYLAND_EGL_CFLAGS@ \
17-DE_BINDIR=\"$(bindir)\" \
18-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
19-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
20-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
21-DLOCALE_DIR=\"@LOCALE_DIR@\" \
22-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
23
24bin_PROGRAMS = \
25enlightenment \
26enlightenment_imc \
27enlightenment_start \
28enlightenment_filemanager \
29enlightenment_open
30
31internal_bindir = $(libdir)/enlightenment/utils
32internal_bin_PROGRAMS = \
33enlightenment_fm_op \
34enlightenment_sys \
35enlightenment_thumb \
36enlightenment_alert \
37enlightenment_static_grabber
38
39if HAVE_EEZE
40internal_bin_PROGRAMS += enlightenment_backlight
41endif
42
43ENLIGHTENMENTHEADERS = \
44e_about.h \
45e_acpi.h \
46e_actions.h \
47e_alert.h \
48e_atoms.h \
49e_backlight.h \
50e_bg.h \
51e_bindings.h \
52e_border.h \
53e_box.h \
54e_canvas.h \
55e_color_class.h \
56e_color_dialog.h \
57e_color.h \
58e_comp.h \
59e_comp_cfdata.h \
60e_comp_render_update.h \
61e_config_data.h \
62e_config_dialog.h \
63e_config.h \
64e_configure.h \
65e_confirm_dialog.h \
66e_container.h \
67e_datastore.h \
68e_dbusmenu.h \
69e_desk.h \
70e_deskenv.h \
71e_desklock.h \
72e_deskmirror.h \
73e_dialog.h \
74e_dnd.h \
75e_dpms.h \
76e_desktop_editor.h \
77e_entry.h \
78e_entry_dialog.h \
79e_env.h \
80e_error.h \
81e_exec.h \
82e_exehist.h \
83e_filereg.h \
84e_flowlayout.h \
85e_fm_custom.h \
86e_fm_device.h \
87e_fm.h \
88e_fm_mime.h \
89e_fm_op.h \
90e_fm_op_registry.h \
91e_fm_prop.h \
92e_fm_shared_codec.h \
93e_fm_shared_device.h \
94e_fm_shared_types.h \
95e_focus.h \
96e_font.h \
97e_gadcon.h \
98e_gadcon_popup.h \
99e_grabinput.h \
100e_grab_dialog.h \
101e.h \
102e_hints.h \
103e_icon.h \
104e_ilist.h \
105e_import_config_dialog.h \
106e_import_dialog.h \
107e_includes.h \
108e_init.h \
109e_int_border_locks.h \
110e_int_border_menu.h \
111e_int_border_prop.h \
112e_int_border_remember.h \
113e_int_config_modules.h \
114e_int_gadcon_config.h \
115e_intl_data.h \
116e_intl.h \
117e_int_menus.h \
118e_int_shelf_config.h \
119e_int_toolbar_config.h \
120e_ipc_codec.h \
121e_ipc.h \
122e_layout.h \
123e_livethumb.h \
124e_log.h \
125e_manager.h \
126e_maximize.h \
127e_menu.h \
128e_mmx.h \
129e_module.h \
130e_mouse.h \
131e_moveresize.h \
132e_msgbus.h \
133e_notification.h \
134e_msg.h \
135e_obj_dialog.h \
136e_object.h \
137e_order.h \
138e_pan.h \
139e_path.h \
140e_place.h \
141e_pointer.h \
142e_popup.h \
143e_powersave.h \
144e_prefix.h \
145e_randr.h \
146e_remember.h \
147e_resist.h \
148e_scale.h \
149e_screensaver.h \
150e_scrollframe.h \
151e_sha1.h \
152e_shelf.h \
153e_signals.h \
154e_slidecore.h \
155e_slider.h \
156e_slidesel.h \
157e_spectrum.h \
158e_startup.h \
159e_stolen.h \
160e_sys.h \
161e_table.h \
162e_test.h \
163e_theme_about.h \
164e_theme.h \
165e_thumb.h \
166e_toolbar.h \
167e_update.h \
168e_user.h \
169e_utils.h \
170e_widget_aspect.h \
171e_widget_button.h \
172e_widget_check.h \
173e_widget_color_well.h \
174e_widget_config_list.h \
175e_widget_csel.h \
176e_widget_cslider.h \
177e_widget_bgpreview.h \
178e_widget_entry.h \
179e_widget_filepreview.h \
180e_widget_flist.h \
181e_widget_font_preview.h \
182e_widget_framelist.h \
183e_widget_frametable.h \
184e_widget_fsel.h \
185e_widget.h \
186e_widget_ilist.h \
187e_widget_image.h \
188e_widget_label.h \
189e_widget_list.h \
190e_widget_preview.h \
191e_widget_radio.h \
192e_widget_scrollframe.h \
193e_widget_slider.h \
194e_widget_spectrum.h \
195e_widget_table.h \
196e_widget_textblock.h \
197e_widget_toolbar.h \
198e_widget_toolbook.h \
199e_win.h \
200e_xinerama.h \
201e_xkb.h \
202e_xsettings.h \
203e_zoomap.h \
204e_zone.h
205
206if HAVE_WAYLAND_CLIENTS
207ENLIGHTENMENTHEADERS += \
208e_comp_wl.h \
209e_surface.h
210endif
211
212
213enlightenment_src = \
214e_about.c \
215e_acpi.c \
216e_alert.c \
217e_actions.c \
218e_atoms.c \
219e_backlight.c \
220e_bg.c \
221e_bindings.c \
222e_border.c \
223e_box.c \
224e_canvas.c \
225e_color.c \
226e_color_class.c \
227e_color_dialog.c \
228e_comp.c \
229e_comp_cfdata.c \
230e_comp_render_update.c \
231e_config.c \
232e_config_data.c \
233e_config_dialog.c \
234e_configure.c \
235e_confirm_dialog.c \
236e_container.c \
237e_datastore.c \
238e_dbusmenu.c \
239e_desk.c \
240e_deskenv.c \
241e_desklock.c \
242e_deskmirror.c \
243e_dialog.c \
244e_dnd.c \
245e_dpms.c \
246e_desktop_editor.c \
247e_entry.c \
248e_entry_dialog.c \
249e_env.c \
250e_error.c \
251e_exec.c \
252e_exehist.c \
253e_filereg.c \
254e_flowlayout.c \
255e_fm.c \
256e_fm_custom.c \
257e_fm_device.c \
258e_fm_mime.c \
259e_fm_op_registry.c \
260e_fm_prop.c \
261e_fm_shared_codec.c \
262e_fm_shared_device.c \
263e_focus.c \
264e_font.c \
265e_gadcon.c \
266e_gadcon_popup.c \
267e_grabinput.c \
268e_grab_dialog.c \
269e_hints.c \
270e_icon.c \
271e_ilist.c \
272e_import_config_dialog.c \
273e_import_dialog.c \
274e_init.c \
275e_int_border_locks.c \
276e_int_border_menu.c \
277e_int_border_prop.c \
278e_int_border_remember.c \
279e_int_config_modules.c \
280e_int_gadcon_config.c \
281e_intl.c \
282e_intl_data.c \
283e_int_menus.c \
284e_int_shelf_config.c \
285e_int_toolbar_config.c \
286e_ipc.c \
287e_ipc_codec.c \
288e_layout.c \
289e_livethumb.c \
290e_log.c \
291e_manager.c \
292e_maximize.c \
293e_menu.c \
294e_module.c \
295e_mouse.c \
296e_moveresize.c \
297e_msgbus.c \
298e_notification.c \
299e_msg.c \
300e_obj_dialog.c \
301e_object.c \
302e_order.c \
303e_pan.c \
304e_path.c \
305e_place.c \
306e_pointer.c \
307e_popup.c \
308e_powersave.c \
309e_prefix.c \
310e_randr.c \
311e_remember.c \
312e_resist.c \
313e_scale.c \
314e_screensaver.c \
315e_scrollframe.c \
316e_sha1.c \
317e_shelf.c \
318e_signals.c \
319e_slidecore.c \
320e_slider.c \
321e_slidesel.c \
322e_spectrum.c \
323e_startup.c \
324e_stolen.c \
325e_sys.c \
326e_table.c \
327e_test.c \
328e_theme_about.c \
329e_theme.c \
330e_thumb.c \
331e_toolbar.c \
332e_update.c \
333e_user.c \
334e_utils.c \
335e_widget_aspect.c \
336e_widget_button.c \
337e_widget.c \
338e_widget_check.c \
339e_widget_color_well.c \
340e_widget_config_list.c \
341e_widget_csel.c \
342e_widget_cslider.c \
343e_widget_bgpreview.c \
344e_widget_entry.c \
345e_widget_filepreview.c \
346e_widget_flist.c \
347e_widget_font_preview.c \
348e_widget_framelist.c \
349e_widget_frametable.c \
350e_widget_fsel.c \
351e_widget_ilist.c \
352e_widget_image.c \
353e_widget_label.c \
354e_widget_list.c \
355e_widget_preview.c \
356e_widget_radio.c \
357e_widget_scrollframe.c \
358e_widget_slider.c \
359e_widget_spectrum.c \
360e_widget_table.c \
361e_widget_textblock.c \
362e_widget_toolbar.c \
363e_widget_toolbook.c \
364e_win.c \
365e_xinerama.c \
366e_xkb.c \
367e_xsettings.c \
368e_zoomap.c \
369e_zone.c \
370$(ENLIGHTENMENTHEADERS)
371
372if HAVE_WAYLAND_CLIENTS
373enlightenment_src += \
374e_comp_wl.c \
375e_surface.c
376endif
377
378enlightenment_CFLAGS = $(AM_CPPFLAGS) @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@
379enlightenment_CPPFLAGS = $(AM_CPPFLAGS) -DE_LOGGING=1
380enlightenment_SOURCES = \
381e_main.c \
382$(enlightenment_src)
383
384enlightenment_LDFLAGS = -export-dynamic
385enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm
386
387enlightenment_imc_SOURCES = \
388e.h \
389e_config_data.c \
390e_imc_main.c \
391e_intl_data.c
392
393enlightenment_imc_LDADD = @E_IMC_LIBS@
394
395enlightenment_start_SOURCES = \
396e_start_main.c
397enlightenment_start_CFLAGS = $(AM_CPPFLAGS) @E_START_CFLAGS@
398enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@
399
400enlightenment_thumb_SOURCES = \
401e_sha1.c \
402e_thumb_main.c \
403e_user.c
404
405enlightenment_thumb_LDADD = @E_THUMB_LIBS@
406
407enlightenment_fm_op_SOURCES = \
408e_fm_op.c
409
410enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@ -lm
411
412enlightenment_sys_SOURCES = \
413e_sys_main.c e_sys_l2ping.c
414
415enlightenment_sys_LDADD = @SUID_LDFLAGS@ @E_SYS_LIBS@ @BLUEZ_LIBS@
416enlightenment_sys_CFLAGS = @SUID_CFLAGS@ @E_SYS_CFLAGS@ @BLUEZ_CFLAGS@
417
418if HAVE_EEZE
419enlightenment_backlight_SOURCES = \
420e_backlight_main.c
421
422enlightenment_backlight_CFLAGS = @SUID_CFLAGS@ @EEZE_CFLAGS@
423enlightenment_backlight_LDADD = @SUID_LDFLAGS@ @EEZE_LIBS@
424endif
425
426enlightenment_alert_SOURCES = \
427e_alert_main.c
428
429enlightenment_alert_LDADD = @E_ALERT_LIBS@
430enlightenment_alert_CFLAGS = @E_ALERT_CFLAGS@
431
432enlightenment_filemanager_SOURCES = e_fm_cmdline.c
433enlightenment_filemanager_LDADD = @E_FM_CMDLINE_LIBS@
434enlightenment_filemanager_CFLAGS = @E_FM_CMDLINE_CFLAGS@
435
436enlightenment_open_SOURCES = e_open.c
437enlightenment_open_LDADD = @E_OPEN_LIBS@
438enlightenment_open_CFLAGS = @E_OPEN_CFLAGS@
439
440enlightenment_static_grabber_SOURCES = e_static_grab.c
441enlightenment_static_grabber_LDADD = @E_GRABBER_LIBS@
442enlightenment_static_grabber_CFLAGS = @E_GRABBER_CFLAGS@
443
444# HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS
445# and before internal_bin_PROGRAMS are installed. install-data-hook is
446# run after both
447setuid_root_mode = a=rx,u+xs
448if HAVE_EEZE
449install-data-hook:
450 @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
451 @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true
452else
453install-data-hook:
454 @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
455endif
456installed_headersdir = $(prefix)/include/enlightenment
457installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk
new file mode 100644
index 0000000..0e58521
--- /dev/null
+++ b/src/bin/Makefile.mk
@@ -0,0 +1,470 @@
1DISTCLEANFILES += src/bin/e_fm_shared_types.h
2
3E_CPPFLAGS = \
4-I$(top_builddir) \
5-I$(top_builddir)/src/bin \
6-I$(top_srcdir) \
7-I$(top_srcdir)/src/bin \
8@e_cflags@ \
9@cf_cflags@ \
10@VALGRIND_CFLAGS@ \
11@EDJE_DEF@ \
12@WAYLAND_CFLAGS@ \
13@WAYLAND_EGL_CFLAGS@ \
14-DE_BINDIR=\"$(bindir)\" \
15-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
16-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
17-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
18-DLOCALE_DIR=\"@LOCALE_DIR@\" \
19-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
20
21bin_PROGRAMS = \
22src/bin/enlightenment \
23src/bin/enlightenment_imc \
24src/bin/enlightenment_start \
25src/bin/enlightenment_filemanager \
26src/bin/enlightenment_open
27
28internal_bindir = $(libdir)/enlightenment/utils
29internal_bin_PROGRAMS = \
30src/bin/enlightenment_fm_op \
31src/bin/enlightenment_sys \
32src/bin/enlightenment_thumb \
33src/bin/enlightenment_alert \
34src/bin/enlightenment_static_grabber
35
36if HAVE_EEZE
37internal_bin_PROGRAMS += src/bin/enlightenment_backlight
38endif
39
40ENLIGHTENMENTHEADERS = \
41src/bin/e_about.h \
42src/bin/e_acpi.h \
43src/bin/e_actions.h \
44src/bin/e_alert.h \
45src/bin/e_atoms.h \
46src/bin/e_backlight.h \
47src/bin/e_bg.h \
48src/bin/e_bindings.h \
49src/bin/e_border.h \
50src/bin/e_box.h \
51src/bin/e_canvas.h \
52src/bin/e_color_class.h \
53src/bin/e_color_dialog.h \
54src/bin/e_color.h \
55src/bin/e_comp.h \
56src/bin/e_comp_cfdata.h \
57src/bin/e_comp_render_update.h \
58src/bin/e_config_data.h \
59src/bin/e_config_dialog.h \
60src/bin/e_config.h \
61src/bin/e_configure.h \
62src/bin/e_confirm_dialog.h \
63src/bin/e_container.h \
64src/bin/e_datastore.h \
65src/bin/e_dbusmenu.h \
66src/bin/e_desk.h \
67src/bin/e_deskenv.h \
68src/bin/e_desklock.h \
69src/bin/e_deskmirror.h \
70src/bin/e_dialog.h \
71src/bin/e_dnd.h \
72src/bin/e_dpms.h \
73src/bin/e_desktop_editor.h \
74src/bin/e_entry.h \
75src/bin/e_entry_dialog.h \
76src/bin/e_env.h \
77src/bin/e_error.h \
78src/bin/e_exec.h \
79src/bin/e_exehist.h \
80src/bin/e_filereg.h \
81src/bin/e_flowlayout.h \
82src/bin/e_fm_custom.h \
83src/bin/e_fm_device.h \
84src/bin/e_fm.h \
85src/bin/e_fm_mime.h \
86src/bin/e_fm_op.h \
87src/bin/e_fm_op_registry.h \
88src/bin/e_fm_prop.h \
89src/bin/e_fm_shared_codec.h \
90src/bin/e_fm_shared_device.h \
91src/bin/e_fm_shared_types.h \
92src/bin/e_focus.h \
93src/bin/e_font.h \
94src/bin/e_gadcon.h \
95src/bin/e_gadcon_popup.h \
96src/bin/e_grabinput.h \
97src/bin/e_grab_dialog.h \
98src/bin/e.h \
99src/bin/e_hints.h \
100src/bin/e_icon.h \
101src/bin/e_ilist.h \
102src/bin/e_import_config_dialog.h \
103src/bin/e_import_dialog.h \
104src/bin/e_includes.h \
105src/bin/e_init.h \
106src/bin/e_int_border_locks.h \
107src/bin/e_int_border_menu.h \
108src/bin/e_int_border_prop.h \
109src/bin/e_int_border_remember.h \
110src/bin/e_int_config_modules.h \
111src/bin/e_int_gadcon_config.h \
112src/bin/e_intl_data.h \
113src/bin/e_intl.h \
114src/bin/e_int_menus.h \
115src/bin/e_int_shelf_config.h \
116src/bin/e_int_toolbar_config.h \
117src/bin/e_ipc_codec.h \
118src/bin/e_ipc.h \
119src/bin/e_layout.h \
120src/bin/e_livethumb.h \
121src/bin/e_log.h \
122src/bin/e_manager.h \
123src/bin/e_maximize.h \
124src/bin/e_menu.h \
125src/bin/e_mmx.h \
126src/bin/e_module.h \
127src/bin/e_mouse.h \
128src/bin/e_moveresize.h \
129src/bin/e_msgbus.h \
130src/bin/e_notification.h \
131src/bin/e_msg.h \
132src/bin/e_obj_dialog.h \
133src/bin/e_object.h \
134src/bin/e_order.h \
135src/bin/e_pan.h \
136src/bin/e_path.h \
137src/bin/e_place.h \
138src/bin/e_pointer.h \
139src/bin/e_popup.h \
140src/bin/e_powersave.h \
141src/bin/e_prefix.h \
142src/bin/e_randr.h \
143src/bin/e_remember.h \
144src/bin/e_resist.h \
145src/bin/e_scale.h \
146src/bin/e_screensaver.h \
147src/bin/e_scrollframe.h \
148src/bin/e_sha1.h \
149src/bin/e_shelf.h \
150src/bin/e_signals.h \
151src/bin/e_slidecore.h \
152src/bin/e_slider.h \
153src/bin/e_slidesel.h \
154src/bin/e_spectrum.h \
155src/bin/e_startup.h \
156src/bin/e_stolen.h \
157src/bin/e_sys.h \
158src/bin/e_table.h \
159src/bin/e_test.h \
160src/bin/e_theme_about.h \
161src/bin/e_theme.h \
162src/bin/e_thumb.h \
163src/bin/e_toolbar.h \
164src/bin/e_update.h \
165src/bin/e_user.h \
166src/bin/e_utils.h \
167src/bin/e_widget_aspect.h \
168src/bin/e_widget_button.h \
169src/bin/e_widget_check.h \
170src/bin/e_widget_color_well.h \
171src/bin/e_widget_config_list.h \
172src/bin/e_widget_csel.h \
173src/bin/e_widget_cslider.h \
174src/bin/e_widget_bgpreview.h \
175src/bin/e_widget_entry.h \
176src/bin/e_widget_filepreview.h \
177src/bin/e_widget_flist.h \
178src/bin/e_widget_font_preview.h \
179src/bin/e_widget_framelist.h \
180src/bin/e_widget_frametable.h \
181src/bin/e_widget_fsel.h \
182src/bin/e_widget.h \
183src/bin/e_widget_ilist.h \
184src/bin/e_widget_image.h \
185src/bin/e_widget_label.h \
186src/bin/e_widget_list.h \
187src/bin/e_widget_preview.h \
188src/bin/e_widget_radio.h \
189src/bin/e_widget_scrollframe.h \
190src/bin/e_widget_slider.h \
191src/bin/e_widget_spectrum.h \
192src/bin/e_widget_table.h \
193src/bin/e_widget_textblock.h \
194src/bin/e_widget_toolbar.h \
195src/bin/e_widget_toolbook.h \
196src/bin/e_win.h \
197src/bin/e_xinerama.h \
198src/bin/e_xkb.h \
199src/bin/e_xsettings.h \
200src/bin/e_zoomap.h \
201src/bin/e_zone.h
202
203if HAVE_WAYLAND_CLIENTS
204ENLIGHTENMENTHEADERS += \
205src/bin/e_comp_wl.h \
206src/bin/e_surface.h
207endif
208
209
210enlightenment_src = \
211src/bin/e_about.c \
212src/bin/e_acpi.c \
213src/bin/e_alert.c \
214src/bin/e_actions.c \
215src/bin/e_atoms.c \
216src/bin/e_backlight.c \
217src/bin/e_bg.c \
218src/bin/e_bindings.c \
219src/bin/e_border.c \
220src/bin/e_box.c \
221src/bin/e_canvas.c \
222src/bin/e_color.c \
223src/bin/e_color_class.c \
224src/bin/e_color_dialog.c \
225src/bin/e_comp.c \
226src/bin/e_comp_cfdata.c \
227src/bin/e_comp_render_update.c \
228src/bin/e_config.c \
229src/bin/e_config_data.c \
230src/bin/e_config_dialog.c \
231src/bin/e_configure.c \
232src/bin/e_confirm_dialog.c \
233src/bin/e_container.c \
234src/bin/e_datastore.c \
235src/bin/e_dbusmenu.c \
236src/bin/e_desk.c \
237src/bin/e_deskenv.c \
238src/bin/e_desklock.c \
239src/bin/e_deskmirror.c \
240src/bin/e_dialog.c \
241src/bin/e_dnd.c \
242src/bin/e_dpms.c \
243src/bin/e_desktop_editor.c \
244src/bin/e_entry.c \
245src/bin/e_entry_dialog.c \
246src/bin/e_env.c \
247src/bin/e_error.c \
248src/bin/e_exec.c \
249src/bin/e_exehist.c \
250src/bin/e_filereg.c \
251src/bin/e_flowlayout.c \
252src/bin/e_fm.c \
253src/bin/e_fm_custom.c \
254src/bin/e_fm_device.c \
255src/bin/e_fm_mime.c \
256src/bin/e_fm_op_registry.c \
257src/bin/e_fm_prop.c \
258src/bin/e_fm_shared_codec.c \
259src/bin/e_fm_shared_device.c \
260src/bin/e_focus.c \
261src/bin/e_font.c \
262src/bin/e_gadcon.c \
263src/bin/e_gadcon_popup.c \
264src/bin/e_grabinput.c \
265src/bin/e_grab_dialog.c \
266src/bin/e_hints.c \
267src/bin/e_icon.c \
268src/bin/e_ilist.c \
269src/bin/e_import_config_dialog.c \
270src/bin/e_import_dialog.c \
271src/bin/e_init.c \
272src/bin/e_int_border_locks.c \
273src/bin/e_int_border_menu.c \
274src/bin/e_int_border_prop.c \
275src/bin/e_int_border_remember.c \
276src/bin/e_int_config_modules.c \
277src/bin/e_int_gadcon_config.c \
278src/bin/e_intl.c \
279src/bin/e_intl_data.c \
280src/bin/e_int_menus.c \
281src/bin/e_int_shelf_config.c \
282src/bin/e_int_toolbar_config.c \
283src/bin/e_ipc.c \
284src/bin/e_ipc_codec.c \
285src/bin/e_layout.c \
286src/bin/e_livethumb.c \
287src/bin/e_log.c \
288src/bin/e_manager.c \
289src/bin/e_maximize.c \
290src/bin/e_menu.c \
291src/bin/e_module.c \
292src/bin/e_mouse.c \
293src/bin/e_moveresize.c \
294src/bin/e_msgbus.c \
295src/bin/e_notification.c \
296src/bin/e_msg.c \
297src/bin/e_obj_dialog.c \
298src/bin/e_object.c \
299src/bin/e_order.c \
300src/bin/e_pan.c \
301src/bin/e_path.c \
302src/bin/e_place.c \
303src/bin/e_pointer.c \
304src/bin/e_popup.c \
305src/bin/e_powersave.c \
306src/bin/e_prefix.c \
307src/bin/e_randr.c \
308src/bin/e_remember.c \
309src/bin/e_resist.c \
310src/bin/e_scale.c \
311src/bin/e_screensaver.c \
312src/bin/e_scrollframe.c \
313src/bin/e_sha1.c \
314src/bin/e_shelf.c \
315src/bin/e_signals.c \
316src/bin/e_slidecore.c \
317src/bin/e_slider.c \
318src/bin/e_slidesel.c \
319src/bin/e_spectrum.c \
320src/bin/e_startup.c \
321src/bin/e_stolen.c \
322src/bin/e_sys.c \
323src/bin/e_table.c \
324src/bin/e_test.c \
325src/bin/e_theme_about.c \
326src/bin/e_theme.c \
327src/bin/e_thumb.c \
328src/bin/e_toolbar.c \
329src/bin/e_update.c \
330src/bin/e_user.c \
331src/bin/e_utils.c \
332src/bin/e_widget_aspect.c \
333src/bin/e_widget_button.c \
334src/bin/e_widget.c \
335src/bin/e_widget_check.c \
336src/bin/e_widget_color_well.c \
337src/bin/e_widget_config_list.c \
338src/bin/e_widget_csel.c \
339src/bin/e_widget_cslider.c \
340src/bin/e_widget_bgpreview.c \
341src/bin/e_widget_entry.c \
342src/bin/e_widget_filepreview.c \
343src/bin/e_widget_flist.c \
344src/bin/e_widget_font_preview.c \
345src/bin/e_widget_framelist.c \
346src/bin/e_widget_frametable.c \
347src/bin/e_widget_fsel.c \
348src/bin/e_widget_ilist.c \
349src/bin/e_widget_image.c \
350src/bin/e_widget_label.c \
351src/bin/e_widget_list.c \
352src/bin/e_widget_preview.c \
353src/bin/e_widget_radio.c \
354src/bin/e_widget_scrollframe.c \
355src/bin/e_widget_slider.c \
356src/bin/e_widget_spectrum.c \
357src/bin/e_widget_table.c \
358src/bin/e_widget_textblock.c \
359src/bin/e_widget_toolbar.c \
360src/bin/e_widget_toolbook.c \
361src/bin/e_win.c \
362src/bin/e_xinerama.c \
363src/bin/e_xkb.c \
364src/bin/e_xsettings.c \
365src/bin/e_zoomap.c \
366src/bin/e_zone.c \
367$(ENLIGHTENMENTHEADERS)
368
369if HAVE_WAYLAND_CLIENTS
370enlightenment_src += \
371src/bin/e_comp_wl.c \
372src/bin/e_surface.c
373endif
374
375src_bin_enlightenment_CFLAGS = $(AM_CPPFLAGS) @WAYLAND_CFLAGS@ @WAYLAND_EGL_CFLAGS@
376src_bin_enlightenment_CPPFLAGS = $(E_CPPFLAGS) -DE_LOGGING=1
377src_bin_enlightenment_SOURCES = \
378src/bin/e_main.c \
379$(enlightenment_src)
380
381src_bin_enlightenment_LDFLAGS = -export-dynamic
382src_bin_enlightenment_LDADD = @e_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @WAYLAND_LIBS@ @WAYLAND_EGL_LIBS@ -lm
383
384src_bin_enlightenment_imc_SOURCES = \
385src/bin/e.h \
386src/bin/e_config_data.c \
387src/bin/e_imc_main.c \
388src/bin/e_intl_data.c
389
390src_bin_enlightenment_imc_LDADD = @E_IMC_LIBS@
391src_bin_enlightenment_imc_CPPFLAGS = $(E_CPPFLAGS)
392
393src_bin_enlightenment_start_SOURCES = \
394src/bin/e_start_main.c
395src_bin_enlightenment_start_CPPFLAGS = $(E_CPPFLAGS) @E_START_CFLAGS@
396src_bin_enlightenment_start_LDADD = @dlopen_libs@ @E_START_LIBS@
397
398src_bin_enlightenment_thumb_SOURCES = \
399src/bin/e_sha1.c \
400src/bin/e_thumb_main.c \
401src/bin/e_user.c
402
403src_bin_enlightenment_thumb_LDADD = @E_THUMB_LIBS@
404src_bin_enlightenment_thumb_CPPFLAGS = $(E_CPPFLAGS)
405
406src_bin_enlightenment_fm_op_SOURCES = \
407src/bin/e_fm_op.c
408
409src_bin_enlightenment_fm_op_LDADD = @E_FM_OP_LIBS@ -lm
410src_bin_enlightenment_fm_op_CPPFLAGS = $(E_CPPFLAGS)
411
412src_bin_enlightenment_sys_SOURCES = \
413src/bin/e_sys_main.c \
414src/bin/e_sys_l2ping.c
415
416src_bin_enlightenment_sys_LDADD = @SUID_LDFLAGS@ @E_SYS_LIBS@ @BLUEZ_LIBS@
417src_bin_enlightenment_sys_CPPFLAGS = @SUID_CFLAGS@ @E_SYS_CFLAGS@ @BLUEZ_CFLAGS@ -DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
418
419if HAVE_EEZE
420src_bin_enlightenment_backlight_SOURCES = \
421src/bin/e_backlight_main.c
422
423src_bin_enlightenment_backlight_CPPFLAGS = @SUID_CFLAGS@ @EEZE_CFLAGS@
424src_bin_enlightenment_backlight_LDADD = @SUID_LDFLAGS@ @EEZE_LIBS@
425endif
426
427src_bin_enlightenment_alert_SOURCES = \
428src/bin/e_alert_main.c
429
430src_bin_enlightenment_alert_LDADD = @E_ALERT_LIBS@
431src_bin_enlightenment_alert_CPPFLAGS = @E_ALERT_CFLAGS@
432
433src_bin_enlightenment_filemanager_SOURCES = \
434src/bin/e_fm_cmdline.c
435src_bin_enlightenment_filemanager_LDADD = @E_FM_CMDLINE_LIBS@
436src_bin_enlightenment_filemanager_CPPFLAGS = @E_FM_CMDLINE_CFLAGS@
437
438src_bin_enlightenment_open_SOURCES = \
439src/bin/e_open.c
440src_bin_enlightenment_open_LDADD = @E_OPEN_LIBS@
441src_bin_enlightenment_open_CPPFLAGS = @E_OPEN_CFLAGS@
442
443src_bin_enlightenment_static_grabber_SOURCES = \
444src/bin/e_static_grab.c
445src_bin_enlightenment_static_grabber_LDADD = @E_GRABBER_LIBS@
446src_bin_enlightenment_static_grabber_CPPFLAGS = @E_GRABBER_CFLAGS@
447
448include src/bin/e_fm/Makefile.mk
449
450# HACK! why install-data-hook? install-exec-hook is run after bin_PROGRAMS
451# and before internal_bin_PROGRAMS are installed. install-data-hook is
452# run after both
453setuid_root_mode = a=rx,u+xs
454if HAVE_EEZE
455enlightenment-sys-install-data-hook:
456 @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
457 @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true
458else
459enlightenment-sys-install-data-hook:
460 @chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
461endif
462installed_headersdir = $(prefix)/include/enlightenment
463installed_headers_DATA = $(ENLIGHTENMENTHEADERS)
464INSTALL_DATA_HOOKS += enlightenment-sys-install-data-hook
465
466PHONIES += e enlightenment install-e install-enlightenment
467e: $(bin_PROGRAMS)
468enlightenment: e
469install-e: install-binPROGRAMS
470install-enlightenment: install-e
diff --git a/src/bin/e_fm/Makefile.am b/src/bin/e_fm/Makefile.am
deleted file mode 100644
index dba628a..0000000
--- a/src/bin/e_fm/Makefile.am
+++ /dev/null
@@ -1,62 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2AUTOMAKE_OPTIONS = subdir-objects
3
4AM_CFLAGS = \
5-I$(top_builddir) \
6-I$(top_builddir)/src/bin \
7-I$(top_srcdir) \
8-I$(top_srcdir)/src/bin \
9@e_cflags@ \
10@cf_cflags@ \
11@VALGRIND_CFLAGS@ \
12@EDJE_DEF@ \
13-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
14-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
15-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
16-DLOCALE_DIR=\"@LOCALE_DIR@\" \
17-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
18
19internal_bindir = $(libdir)/enlightenment/utils
20internal_bin_PROGRAMS = \
21enlightenment_fm
22
23if HAVE_UDISKS_MOUNT
24udisks_s = \
25e_fm_main_udisks.h \
26e_fm_main_udisks.c \
27e_fm_main_udisks2.h \
28e_fm_main_udisks2.c
29else
30udisks_s =
31endif
32
33if HAVE_EEZE_MOUNT
34AM_CFLAGS += @EEZE_CFLAGS@ @EET_CFLAGS@
35LIBS += @EEZE_LIBS@ @EET_LIBS@
36eeze_s = \
37e_fm_main_eeze.h \
38e_fm_main_eeze.c
39else
40eeze_s =
41endif
42
43shared_sources = \
44e_fm_shared_codec.c \
45e_fm_shared_device.c \
46e_user.c
47
48enlightenment_fm_SOURCES = \
49e_fm_main.h \
50e_fm_ipc.h \
51e_fm_main.c \
52e_fm_ipc.c \
53$(udisks_s) \
54$(eeze_s) \
55$(shared_sources)
56
57$(shared_sources): %.c: $(abs_top_srcdir)/src/bin/%.c
58 $(AM_V_GEN) $(LN_S) -f $< $@
59
60CLEANFILES = $(shared_sources)
61
62enlightenment_fm_LDADD = @E_FM_LIBS@
diff --git a/src/bin/e_fm/Makefile.mk b/src/bin/e_fm/Makefile.mk
new file mode 100644
index 0000000..1ab59a4
--- /dev/null
+++ b/src/bin/e_fm/Makefile.mk
@@ -0,0 +1,56 @@
1EFM_CPPFLAGS = \
2-I$(top_builddir) \
3-I$(top_builddir)/src/bin \
4-I$(top_srcdir) \
5-I$(top_srcdir)/src/bin \
6@e_cflags@ \
7@cf_cflags@ \
8@VALGRIND_CFLAGS@ \
9@EDJE_DEF@ \
10-DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
11-DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
12-DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
13-DLOCALE_DIR=\"@LOCALE_DIR@\" \
14-DPACKAGE_SYSCONF_DIR=\"@PACKAGE_SYSCONF_DIR@\"
15
16EFM_LIBS =
17
18efm_bindir = $(libdir)/enlightenment/utils
19efm_bin_PROGRAMS = \
20src/bin/e_fm/enlightenment_fm
21
22if HAVE_UDISKS_MOUNT
23udisks_s = \
24src/bin/e_fm/e_fm_main_udisks.h \
25src/bin/e_fm/e_fm_main_udisks.c \
26src/bin/e_fm/e_fm_main_udisks2.h \
27src/bin/e_fm/e_fm_main_udisks2.c
28else
29udisks_s =
30endif
31
32if HAVE_EEZE_MOUNT
33EFM_CPPFLAGS += @EEZE_CFLAGS@ @EET_CFLAGS@
34EFM_LIBS += @EEZE_LIBS@ @EET_LIBS@
35eeze_s = \
36src/bin/e_prefix.c \
37src/bin/e_fm/e_fm_main_eeze.h \
38src/bin/e_fm/e_fm_main_eeze.c
39else
40eeze_s =
41endif
42
43src_bin_e_fm_enlightenment_fm_SOURCES = \
44src/bin/e_fm/e_fm_main.h \
45src/bin/e_fm/e_fm_ipc.h \
46src/bin/e_fm/e_fm_main.c \
47src/bin/e_fm/e_fm_ipc.c \
48$(udisks_s) \
49$(eeze_s) \
50src/bin/e_fm_shared_codec.c \
51src/bin/e_fm_shared_device.c \
52src/bin/e_user.c \
53src/bin/e_sha1.c
54
55src_bin_e_fm_enlightenment_fm_LDADD = @E_FM_LIBS@ $(EFM_LIBS)
56src_bin_e_fm_enlightenment_fm_CPPFLAGS = $(EFM_CPPFLAGS)
diff --git a/src/bin/e_fm_cmdline.c b/src/bin/e_fm_cmdline.c
index 11f498c..f2c77f0 100644
--- a/src/bin/e_fm_cmdline.c
+++ b/src/bin/e_fm_cmdline.c
@@ -2,7 +2,15 @@
2# include "config.h" 2# include "config.h"
3# endif 3# endif
4 4
5#include "e.h" 5#ifdef __linux__
6# include <features.h>
7#endif
8#include <unistd.h>
9#include <Ecore.h>
10#include <Ecore_Getopt.h>
11#include <Ecore_File.h>
12#include <Efreet.h>
13#include <Eldbus.h>
6 14
7static Eldbus_Connection *conn = NULL; 15static Eldbus_Connection *conn = NULL;
8static int retval = EXIT_SUCCESS; 16static int retval = EXIT_SUCCESS;
@@ -16,7 +24,7 @@ fm_open_reply(void *data __UNUSED__, const Eldbus_Message *msg,
16 if (eldbus_message_error_get(msg, &name, &txt)) 24 if (eldbus_message_error_get(msg, &name, &txt))
17 { 25 {
18 retval = EXIT_FAILURE; 26 retval = EXIT_FAILURE;
19 ERR("%s: %s", name, txt); 27 EINA_LOG_ERR("%s: %s", name, txt);
20 } 28 }
21 29
22 pending--; 30 pending--;
@@ -44,7 +52,7 @@ fm_open(const char *path)
44 Efreet_Uri *uri = efreet_uri_decode(path); 52 Efreet_Uri *uri = efreet_uri_decode(path);
45 if ((!uri) || (!uri->protocol) || (strcmp(uri->protocol, "file") != 0)) 53 if ((!uri) || (!uri->protocol) || (strcmp(uri->protocol, "file") != 0))
46 { 54 {
47 ERR("Invalid URI '%s'", path); 55 EINA_LOG_ERR("Invalid URI '%s'", path);
48 ecore_idler_add(fm_error_quit_last, NULL); 56 ecore_idler_add(fm_error_quit_last, NULL);
49 if (uri) 57 if (uri)
50 efreet_uri_free(uri); 58 efreet_uri_free(uri);
@@ -59,7 +67,7 @@ fm_open(const char *path)
59 char buf[PATH_MAX]; 67 char buf[PATH_MAX];
60 if (!getcwd(buf, sizeof(buf))) 68 if (!getcwd(buf, sizeof(buf)))
61 { 69 {
62 ERR("Could not get current working directory: %s", strerror(errno)); 70 EINA_LOG_ERR("Could not get current working directory: %s", strerror(errno));
63 ecore_idler_add(fm_error_quit_last, NULL); 71 ecore_idler_add(fm_error_quit_last, NULL);
64 return; 72 return;
65 } 73 }
@@ -73,10 +81,10 @@ fm_open(const char *path)
73 } 81 }
74 } 82 }
75 83
76 DBG("'%s' -> '%s'", path, p); 84 EINA_LOG_DBG("'%s' -> '%s'", path, p);
77 if ((!p) || (p[0] == '\0')) 85 if ((!p) || (p[0] == '\0'))
78 { 86 {
79 ERR("Could not get path '%s'", path); 87 EINA_LOG_ERR("Could not get path '%s'", path);
80 ecore_idler_add(fm_error_quit_last, NULL); 88 ecore_idler_add(fm_error_quit_last, NULL);
81 free(p); 89 free(p);
82 return; 90 return;
@@ -93,7 +101,7 @@ fm_open(const char *path)
93 method); 101 method);
94 if (!msg) 102 if (!msg)
95 { 103 {
96 ERR("Could not create DBus Message"); 104 EINA_LOG_ERR("Could not create DBus Message");
97 ecore_idler_add(fm_error_quit_last, NULL); 105 ecore_idler_add(fm_error_quit_last, NULL);
98 free(p); 106 free(p);
99 return; 107 return;
@@ -103,7 +111,7 @@ fm_open(const char *path)
103 111
104 if (!eldbus_connection_send(conn, msg, fm_open_reply, NULL, -1)) 112 if (!eldbus_connection_send(conn, msg, fm_open_reply, NULL, -1))
105 { 113 {
106 ERR("Could not send DBus Message"); 114 EINA_LOG_ERR("Could not send DBus Message");
107 eldbus_message_unref(msg); 115 eldbus_message_unref(msg);
108 ecore_idler_add(fm_error_quit_last, NULL); 116 ecore_idler_add(fm_error_quit_last, NULL);
109 } 117 }
@@ -144,7 +152,7 @@ main(int argc, char *argv[])
144 args = ecore_getopt_parse(&options, values, argc, argv); 152 args = ecore_getopt_parse(&options, values, argc, argv);
145 if (args < 0) 153 if (args < 0)
146 { 154 {
147 ERR("Could not parse command line options."); 155 EINA_LOG_ERR("Could not parse command line options.");
148 return EXIT_FAILURE; 156 return EXIT_FAILURE;
149 } 157 }
150 158
@@ -157,7 +165,7 @@ main(int argc, char *argv[])
157 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION); 165 conn = eldbus_connection_get(ELDBUS_CONNECTION_TYPE_SESSION);
158 if (!conn) 166 if (!conn)
159 { 167 {
160 ERR("Could not DBus SESSION bus."); 168 EINA_LOG_ERR("Could not DBus SESSION bus.");
161 retval = EXIT_FAILURE; 169 retval = EXIT_FAILURE;
162 goto end; 170 goto end;
163 } 171 }
diff --git a/src/bin/e_static_grab.c b/src/bin/e_static_grab.c
index d1940fe..8fb7a3e 100644
--- a/src/bin/e_static_grab.c
+++ b/src/bin/e_static_grab.c
@@ -1,4 +1,8 @@
1#include "e.h" 1# ifdef HAVE_CONFIG_H
2# include "config.h"
3# endif
4
5#include <Eet.h>
2 6
3typedef struct _E_Static_Grab E_Static_Grab; 7typedef struct _E_Static_Grab E_Static_Grab;
4typedef struct _E_Static_Grab_Module E_Static_Grab_Module; 8typedef struct _E_Static_Grab_Module E_Static_Grab_Module;
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
deleted file mode 100644
index 464144e..0000000
--- a/src/modules/Makefile.am
+++ /dev/null
@@ -1,250 +0,0 @@
1MAINTAINERCLEANFILES = Makefile.in
2AUTOMAKE_OPTIONS = subdir-objects
3
4SUBDIRS =
5CLEANFILES =
6EXTRA_DIST =
7INSTALL_DATA_HOOKS =
8
9MDIR = $(libdir)/enlightenment/modules
10AM_LDFLAGS = -module -avoid-version
11AM_CPPFLAGS = -I. \
12 -I$(top_srcdir) \
13 -I$(top_srcdir)/src/bin \
14 -I$(top_builddir)/src/bin \
15 -I$(top_srcdir)/src/modules \
16 -DE_BINDIR=\"$(bindir)\"
17AM_CFLAGS = @e_cflags@
18LIBS += @e_libs@ @dlopen_libs@
19
20EDJE_CC = $(EDJE_CC_$(V))
21EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY))
22EDJE_CC_0 = @echo " EDJE_CC " $@; @edje_cc@
23EDJE_CC_1 = @edje_cc@
24
25EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY))
26EDJE_FLAGS_VERBOSE_0 =
27EDJE_FLAGS_VERBOSE_1 = -v
28EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) @EDJE_DEF@
29
30if USE_MODULE_CONNMAN
31include Makefile_connman.am
32endif
33
34if USE_MODULE_BLUEZ4
35include Makefile_bluez4.am
36endif
37
38if USE_MODULE_IBAR
39include Makefile_ibar.am
40endif
41
42if USE_MODULE_CLOCK
43include Makefile_clock.am
44endif
45
46if USE_MODULE_PAGER
47include Makefile_pager.am
48endif
49
50if USE_MODULE_BATTERY
51include Makefile_battery.am
52endif
53
54if USE_MODULE_TEMPERATURE
55include Makefile_temperature.am
56endif
57
58if USE_MODULE_NOTIFICATION
59include Makefile_notification.am
60endif
61
62if USE_MODULE_CPUFREQ
63include Makefile_cpufreq.am
64endif
65
66if USE_MODULE_IBOX
67include Makefile_ibox.am
68endif
69
70if USE_MODULE_START
71include Makefile_start.am
72endif
73
74if USE_MODULE_WINLIST
75include Makefile_winlist.am
76endif
77
78if USE_MODULE_FILEMAN
79include Makefile_fileman.am
80endif
81
82if USE_MODULE_FILEMAN_OPINFO
83include Makefile_fileman_opinfo.am
84endif
85
86if USE_MODULE_WIZARD
87include Makefile_wizard.am
88endif
89
90if USE_MODULE_CONF
91include Makefile_conf.am
92endif
93
94if USE_MODULE_CONF_COMP
95include Makefile_conf_comp.am
96endif
97
98if USE_MODULE_CONF_WALLPAPER2
99include Makefile_conf_wallpaper2.am
100endif
101
102if USE_MODULE_CONF_THEME
103include Makefile_conf_theme.am
104endif
105
106if USE_MODULE_CONF_INTL
107include Makefile_conf_intl.am
108endif
109
110if USE_MODULE_MSGBUS
111include Makefile_msgbus.am
112endif
113
114if USE_MODULE_CONF_APPLICATIONS
115include Makefile_conf_applications.am
116endif
117
118if USE_MODULE_CONF_DISPLAY
119include Makefile_conf_display.am
120endif
121
122if USE_MODULE_CONF_SHELVES
123include Makefile_conf_shelves.am
124endif
125
126if USE_MODULE_CONF_BINDINGS
127include Makefile_conf_bindings.am
128endif
129
130if USE_MODULE_CONF_WINDOW_REMEMBERS
131include Makefile_conf_window_remembers.am
132endif
133
134if USE_MODULE_CONF_WINDOW_MANIPULATION
135include Makefile_conf_window_manipulation.am
136endif
137
138if USE_MODULE_CONF_MENUS
139include Makefile_conf_menus.am
140endif
141
142if USE_MODULE_CONF_DIALOGS
143include Makefile_conf_dialogs.am
144endif
145
146if USE_MODULE_CONF_PERFORMANCE
147include Makefile_conf_performance.am
148endif
149
150if USE_MODULE_CONF_PATHS
151include Makefile_conf_paths.am
152endif
153
154if USE_MODULE_CONF_INTERACTION
155include Makefile_conf_interaction.am
156endif
157
158if USE_MODULE_CONF_RANDR
159include Makefile_conf_randr.am
160endif
161
162if USE_MODULE_GADMAN
163include Makefile_gadman.am
164endif
165
166if USE_MODULE_MIXER
167include Makefile_mixer.am
168endif
169
170if USE_MODULE_ILLUME2
171include Makefile_illume2.am
172include Makefile_illume-home.am
173include Makefile_illume-home-toggle.am
174include Makefile_illume-softkey.am
175include Makefile_illume-keyboard.am
176include Makefile_illume-indicator.am
177include Makefile_illume-kbd-toggle.am
178include Makefile_illume-mode-toggle.am
179include Makefile_illume-bluetooth.am
180endif
181
182if USE_MODULE_SYSCON
183include Makefile_syscon.am
184endif
185
186if USE_MODULE_EVERYTHING
187include Makefile_everything.am
188endif
189
190if USE_MODULE_SYSTRAY
191include Makefile_systray.am
192endif
193
194if USE_MODULE_APPMENU
195include Makefile_appmenu.am
196endif
197
198if USE_MODULE_QUICKACCESS
199include Makefile_quickaccess.am
200endif
201
202if USE_MODULE_TEAMWORK
203include Makefile_teamwork.am
204endif
205
206if USE_MODULE_SHOT
207include Makefile_shot.am
208endif
209
210if USE_MODULE_BACKLIGHT
211include Makefile_backlight.am
212endif
213
214if USE_MODULE_TASKS
215include Makefile_tasks.am
216endif
217
218if USE_MODULE_XKBSWITCH
219include Makefile_xkbswitch.am
220endif
221
222if USE_MODULE_TILING
223include Makefile_tiling.am
224endif
225
226if USE_MODULE_ACCESS
227include Makefile_access.am
228endif
229
230if USE_MODULE_MUSIC_CONTROL
231include Makefile_music_control.am
232endif
233
234if USE_MODULE_CONTACT
235include Makefile_contact.am
236endif
237
238#if HAVE_WAYLAND_DRM
239#include Makefile_wl_drm.am
240#endif
241
242if USE_MODULE_WL_DESKTOP_SHELL
243include Makefile_wl_desktop_shell.am
244endif
245
246if USE_MODULE_WL_SCREENSHOT
247include Makefile_wl_screenshot.am
248endif
249
250install-data-hook: $(INSTALL_DATA_HOOKS)
diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk
new file mode 100644
index 0000000..598eb97
--- /dev/null
+++ b/src/modules/Makefile.mk
@@ -0,0 +1,231 @@
1MDIR = $(libdir)/enlightenment/modules
2MOD_LDFLAGS = -module -avoid-version
3MOD_CPPFLAGS = -I. \
4-I$(top_srcdir) \
5-I$(top_srcdir)/src/bin \
6-I$(top_builddir)/src/bin \
7-I$(top_srcdir)/src/modules \
8@e_cflags@ \
9-DE_BINDIR=\"$(bindir)\"
10
11MOD_LIBS = @e_libs@ @dlopen_libs@
12
13if USE_MODULE_CONNMAN
14include src/modules/Makefile_connman.mk
15endif
16
17if USE_MODULE_BLUEZ4
18include src/modules/Makefile_bluez4.mk
19endif
20
21if USE_MODULE_IBAR
22include src/modules/Makefile_ibar.mk
23endif
24
25if USE_MODULE_CLOCK
26include src/modules/Makefile_clock.mk
27endif
28
29if USE_MODULE_PAGER
30include src/modules/Makefile_pager.mk
31endif
32
33if USE_MODULE_BATTERY
34include src/modules/Makefile_battery.mk
35endif
36
37if USE_MODULE_TEMPERATURE
38include src/modules/Makefile_temperature.mk
39endif
40
41if USE_MODULE_NOTIFICATION
42include src/modules/Makefile_notification.mk
43endif
44
45if USE_MODULE_CPUFREQ
46include src/modules/Makefile_cpufreq.mk
47endif
48
49if USE_MODULE_IBOX
50include src/modules/Makefile_ibox.mk
51endif
52
53if USE_MODULE_START
54include src/modules/Makefile_start.mk
55endif
56
57if USE_MODULE_WINLIST
58include src/modules/Makefile_winlist.mk
59endif
60
61if USE_MODULE_FILEMAN
62include src/modules/Makefile_fileman.mk
63endif
64
65if USE_MODULE_FILEMAN_OPINFO
66include src/modules/Makefile_fileman_opinfo.mk
67endif
68
69if USE_MODULE_WIZARD
70include src/modules/Makefile_wizard.mk
71endif
72
73if USE_MODULE_CONF
74include src/modules/Makefile_conf.mk
75endif
76
77if USE_MODULE_CONF_COMP
78include src/modules/Makefile_conf_comp.mk
79endif
80
81if USE_MODULE_CONF_WALLPAPER2
82include src/modules/Makefile_conf_wallpaper2.mk
83endif
84
85if USE_MODULE_CONF_THEME
86include src/modules/Makefile_conf_theme.mk
87endif
88
89if USE_MODULE_CONF_INTL
90include src/modules/Makefile_conf_intl.mk
91endif
92
93if USE_MODULE_MSGBUS
94include src/modules/Makefile_msgbus.mk
95endif
96
97if USE_MODULE_CONF_APPLICATIONS
98include src/modules/Makefile_conf_applications.mk
99endif
100
101if USE_MODULE_CONF_DISPLAY
102include src/modules/Makefile_conf_display.mk
103endif
104
105if USE_MODULE_CONF_SHELVES
106include src/modules/Makefile_conf_shelves.mk
107endif
108
109if USE_MODULE_CONF_BINDINGS
110include src/modules/Makefile_conf_bindings.mk
111endif
112
113if USE_MODULE_CONF_WINDOW_REMEMBERS
114include src/modules/Makefile_conf_window_remembers.mk
115endif
116
117if USE_MODULE_CONF_WINDOW_MANIPULATION
118include src/modules/Makefile_conf_window_manipulation.mk
119endif
120
121if USE_MODULE_CONF_MENUS
122include src/modules/Makefile_conf_menus.mk
123endif
124
125if USE_MODULE_CONF_DIALOGS
126include src/modules/Makefile_conf_dialogs.mk
127endif
128
129if USE_MODULE_CONF_PERFORMANCE
130include src/modules/Makefile_conf_performance.mk
131endif
132
133if USE_MODULE_CONF_PATHS
134include src/modules/Makefile_conf_paths.mk
135endif
136
137if USE_MODULE_CONF_INTERACTION
138include src/modules/Makefile_conf_interaction.mk
139endif
140
141if USE_MODULE_CONF_RANDR
142include src/modules/Makefile_conf_randr.mk
143endif
144
145if USE_MODULE_GADMAN
146include src/modules/Makefile_gadman.mk
147endif
148
149if USE_MODULE_MIXER
150include src/modules/Makefile_mixer.mk
151endif
152
153if USE_MODULE_ILLUME2
154include src/modules/Makefile_illume2.mk
155include src/modules/Makefile_illume-home.mk
156include src/modules/Makefile_illume-home-toggle.mk
157include src/modules/Makefile_illume-softkey.mk
158include src/modules/Makefile_illume-keyboard.mk
159include src/modules/Makefile_illume-indicator.mk
160include src/modules/Makefile_illume-kbd-toggle.mk
161include src/modules/Makefile_illume-mode-toggle.mk
162include src/modules/Makefile_illume-bluetooth.mk
163endif
164
165if USE_MODULE_SYSCON
166include src/modules/Makefile_syscon.mk
167endif
168
169if USE_MODULE_EVERYTHING
170include src/modules/Makefile_everything.mk
171endif
172
173if USE_MODULE_SYSTRAY
174include src/modules/Makefile_systray.mk
175endif
176
177if USE_MODULE_APPMENU
178include src/modules/Makefile_appmenu.mk
179endif
180
181if USE_MODULE_QUICKACCESS
182include src/modules/Makefile_quickaccess.mk
183endif
184
185if USE_MODULE_TEAMWORK
186include src/modules/Makefile_teamwork.mk
187endif
188
189if USE_MODULE_SHOT
190include src/modules/Makefile_shot.mk
191endif
192
193if USE_MODULE_BACKLIGHT
194include src/modules/Makefile_backlight.mk
195endif
196
197if USE_MODULE_TASKS
198include src/modules/Makefile_tasks.mk
199endif
200
201if USE_MODULE_XKBSWITCH
202include src/modules/Makefile_xkbswitch.mk
203endif
204
205if USE_MODULE_TILING
206include src/modules/Makefile_tiling.mk
207endif
208
209if USE_MODULE_ACCESS
210include src/modules/Makefile_access.mk
211endif
212
213if USE_MODULE_MUSIC_CONTROL
214include src/modules/Makefile_music_control.mk
215endif
216
217if USE_MODULE_CONTACT
218include src/modules/Makefile_contact.mk
219endif
220
221#if HAVE_WAYLAND_DRM
222#include src/modules/Makefile_wl_drm.mk
223#endif
224
225if USE_MODULE_WL_DESKTOP_SHELL
226include src/modules/Makefile_wl_desktop_shell.mk
227endif
228
229#if HAVE_WAYLAND_SCREENSHOT
230#include src/modules/Makefile_wl_screenshot.mk
231#endif
diff --git a/src/modules/Makefile_access.am b/src/modules/Makefile_access.am
deleted file mode 100644
index 2243ba7..0000000
--- a/src/modules/Makefile_access.am
+++ /dev/null
@@ -1,15 +0,0 @@
1accessdir = $(MDIR)/access
2access_DATA = access/module.desktop
3
4EXTRA_DIST += $(access_DATA)
5
6accesspkgdir = $(MDIR)/access/$(MODULE_ARCH)
7accesspkg_LTLIBRARIES = access/module.la
8
9access_module_la_SOURCES = access/e_mod_main.c \
10 access/e_mod_main.h \
11 access/e_mod_config.c
12
13.PHONY: access install-access
14access: $(accesspkg_LTLIBRARIES) $(access_DATA)
15install-access: install-accessDATA install-accesspkgLTLIBRARIES
diff --git a/src/modules/Makefile_access.mk b/src/modules/Makefile_access.mk
new file mode 100644
index 0000000..ee49200
--- /dev/null
+++ b/src/modules/Makefile_access.mk
@@ -0,0 +1,18 @@
1accessdir = $(MDIR)/access
2access_DATA = src/modules/access/module.desktop
3
4EXTRA_DIST += $(access_DATA)
5
6accesspkgdir = $(MDIR)/access/$(MODULE_ARCH)
7accesspkg_LTLIBRARIES = src/modules/access/module.la
8
9src_modules_access_module_la_LIBADD = $(MOD_LIBS)
10src_modules_access_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
11src_modules_access_module_la_LDFLAGS = $(MOD_LDFLAGS)
12src_modules_access_module_la_SOURCES = src/modules/access/e_mod_main.c \
13 src/modules/access/e_mod_main.h \
14 src/modules/access/e_mod_config.c
15
16PHONIES += access install-access
17access: $(accesspkg_LTLIBRARIES) $(access_DATA)
18install-access: install-accessDATA install-accesspkgLTLIBRARIES
diff --git a/src/modules/Makefile_appmenu.am b/src/modules/Makefile_appmenu.am
deleted file mode 100644
index f680a74..0000000
--- a/src/modules/Makefile_appmenu.am
+++ /dev/null
@@ -1,18 +0,0 @@
1appmenudir = $(MDIR)/appmenu
2appmenu_DATA = appmenu/module.desktop \
3 appmenu/e-module-appmenu.edj
4
5EXTRA_DIST += $(appmenu_DATA)
6
7appmenupkgdir = $(MDIR)/appmenu/$(MODULE_ARCH)
8appmenupkg_LTLIBRARIES = appmenu/module.la
9
10appmenu_module_la_SOURCES = appmenu/e_mod_main.c \
11 appmenu/e_mod_dbus_registrar_server.c \
12 appmenu/e_mod_appmenu_render.c \
13 appmenu/e_mod_appmenu_private.h
14
15
16.PHONY: appmenu install-appmenu
17appmenu: $(appmenupkg_LTLIBRARIES) $(appmenu_DATA)
18install-appmenu: install-appmenuDATA install-appmenupkgLTLIBRARIES
diff --git a/src/modules/Makefile_appmenu.mk b/src/modules/Makefile_appmenu.mk
new file mode 100644
index 0000000..596b7ae
--- /dev/null
+++ b/src/modules/Makefile_appmenu.mk
@@ -0,0 +1,21 @@
1appmenudir = $(MDIR)/appmenu
2appmenu_DATA = src/modules/appmenu/module.desktop \
3 src/modules/appmenu/e-module-appmenu.edj
4
5EXTRA_DIST += $(appmenu_DATA)
6
7appmenupkgdir = $(MDIR)/appmenu/$(MODULE_ARCH)
8appmenupkg_LTLIBRARIES = src/modules/appmenu/module.la
9
10src_modules_appmenu_module_la_LIBADD = $(MOD_LIBS)
11src_modules_appmenu_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
12src_modules_appmenu_module_la_LDFLAGS = $(MOD_LDFLAGS)
13src_modules_appmenu_module_la_SOURCES = src/modules/appmenu/e_mod_main.c \
14 src/modules/appmenu/e_mod_dbus_registrar_server.c \
15 src/modules/appmenu/e_mod_appmenu_render.c \
16 src/modules/appmenu/e_mod_appmenu_private.h
17
18
19PHONIES += appmenu install-appmenu
20appmenu: $(appmenupkg_LTLIBRARIES) $(appmenu_DATA)
21install-appmenu: install-appmenuDATA install-appmenupkgLTLIBRARIES
diff --git a/src/modules/Makefile_backlight.am b/src/modules/Makefile_backlight.am
deleted file mode 100644
index 443fc5d..0000000
--- a/src/modules/Makefile_backlight.am
+++ /dev/null
@@ -1,14 +0,0 @@
1backlightdir = $(MDIR)/backlight
2backlight_DATA = backlight/e-module-backlight.edj \
3 backlight/module.desktop
4
5EXTRA_DIST += $(backlight_DATA)
6
7backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH)
8backlightpkg_LTLIBRARIES = backlight/module.la
9
10backlight_module_la_SOURCES = backlight/e_mod_main.c
11
12.PHONY: backlight install-backlight
13backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA)
14install-backlight: install-backlightDATA install-backlightpkgLTLIBRARIES
diff --git a/src/modules/Makefile_backlight.mk b/src/modules/Makefile_backlight.mk
new file mode 100644
index 0000000..b6a24a1
--- /dev/null
+++ b/src/modules/Makefile_backlight.mk
@@ -0,0 +1,17 @@
1backlightdir = $(MDIR)/backlight
2backlight_DATA = src/modules/backlight/e-module-backlight.edj \
3 src/modules/backlight/module.desktop
4
5EXTRA_DIST += $(backlight_DATA)
6
7backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH)
8backlightpkg_LTLIBRARIES = src/modules/backlight/module.la
9
10src_modules_backlight_module_la_LIBADD = $(MOD_LIBS)
11src_modules_backlight_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
12src_modules_backlight_module_la_LDFLAGS = $(MOD_LDFLAGS)
13src_modules_backlight_module_la_SOURCES = src/modules/backlight/e_mod_main.c
14
15PHONIES += backlight install-backlight
16backlight: $(backlightpkg_LTLIBRARIES) $(backlight_DATA)
17install-backlight: install-backlightDATA install-backlightpkgLTLIBRARIES
diff --git a/src/modules/Makefile_battery.am b/src/modules/Makefile_battery.am
deleted file mode 100644
index d3b39dc..0000000
--- a/src/modules/Makefile_battery.am
+++ /dev/null
@@ -1,39 +0,0 @@
1batterydir = $(MDIR)/battery
2battery_DATA = battery/e-module-battery.edj \
3 battery/module.desktop
4
5EXTRA_DIST += $(battery_DATA)
6
7batterypkgdir = $(MDIR)/battery/$(MODULE_ARCH)
8batterypkg_LTLIBRARIES = battery/module.la
9
10battery_module_la_CFLAGS = $(AM_CFLAGS)
11battery_module_la_SOURCES = battery/e_mod_main.h \
12 battery/e_mod_main.c \
13 battery/e_mod_config.c
14
15if HAVE_EEZE
16battery_module_la_SOURCES += battery/e_mod_udev.c
17else
18if HAVE_OPENBSD
19battery_module_la_SOURCES += battery/e_mod_openbsd.c
20else
21battery_module_la_SOURCES += battery/e_mod_upower.c
22endif
23endif
24
25if HAVE_ENOTIFY
26battery_module_la_CFLAGS += @ENOTIFY_CFLAGS@
27battery_module_la_LIBADD = @ENOTIFY_LIBS@
28endif
29
30batgetdir = $(batterypkgdir)
31batget_PROGRAMS = battery/batget
32
33battery_batget_SOURCES = battery/batget.c
34battery_batget_LDADD = @BATTERY_LIBS@
35battery_batget_LDFLAGS = @BATTERY_LDFLAGS@
36
37.PHONY: battery install-battery
38battery: $(batterypkg_LTLIBRARIES) $(battery_DATA) $(batget_PROGRAMS)
39install-battery: install-batteryDATA install-batterypkgLTLIBRARIES install-batgetPROGRAMS
diff --git a/src/modules/Makefile_battery.mk b/src/modules/Makefile_battery.mk
new file mode 100644
index 0000000..fcf1fdd
--- /dev/null
+++ b/src/modules/Makefile_battery.mk
@@ -0,0 +1,43 @@
1batterydir = $(MDIR)/battery
2battery_DATA = src/modules/battery/e-module-battery.edj \
3 src/modules/battery/module.desktop
4
5EXTRA_DIST += $(battery_DATA)
6
7batterypkgdir = $(MDIR)/battery/$(MODULE_ARCH)
8batterypkg_LTLIBRARIES = src/modules/battery/module.la
9
10src_modules_battery_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
11src_modules_battery_module_la_SOURCES = src/modules/battery/e_mod_main.h \
12 src/modules/battery/e_mod_main.c \
13 src/modules/battery/e_mod_config.c
14
15if HAVE_EEZE
16src_modules_battery_module_la_SOURCES += src/modules/battery/e_mod_udev.c
17else
18if HAVE_OPENBSD
19src_modules_battery_module_la_SOURCES += src/modules/battery/e_mod_openbsd.c
20else
21src_modules_battery_module_la_SOURCES += src/modules/battery/e_mod_upower.c
22endif
23endif
24
25src_modules_battery_module_la_LIBADD = $(MOD_LIBS)
26src_modules_battery_module_la_LDFLAGS = $(MOD_LDFLAGS)
27
28if HAVE_ENOTIFY
29src_modules_battery_module_la_CPPFLAGS += @ENOTIFY_CFLAGS@
30src_modules_battery_module_la_LIBADD += @ENOTIFY_LIBS@
31endif
32
33src_modules_battery_batgetdir = $(batterypkgdir)
34src_modules_battery_batget_PROGRAMS = src/modules/battery/batget
35
36src_modules_battery_batget_CPPFLAGS = $(MOD_CPPFLAGS)
37src_modules_battery_batget_SOURCES = src/modules/battery/batget.c
38src_modules_battery_batget_LDADD = @BATTERY_LIBS@
39src_modules_battery_batget_LDFLAGS = @BATTERY_LDFLAGS@
40
41PHONIES += battery install-battery
42battery: $(batterypkg_LTLIBRARIES) $(battery_DATA) $(src_modules_battery_batget_PROGRAMS)
43install-battery: install-batteryDATA install-batterypkgLTLIBRARIES install-src_modules_battery_batgetPROGRAMS
diff --git a/src/modules/Makefile_bluez4.am b/src/modules/Makefile_bluez4.am
deleted file mode 100644
index 6216c88..0000000
--- a/src/modules/Makefile_bluez4.am
+++ /dev/null
@@ -1,22 +0,0 @@
1bluez4dir = $(MDIR)/bluez4
2bluez4_DATA = bluez4/e-module-bluez4.edj \
3 bluez4/module.desktop
4
5EXTRA_DIST += $(bluez4_DATA)
6
7bluez4pkgdir = $(MDIR)/bluez4/$(MODULE_ARCH)
8bluez4pkg_LTLIBRARIES = bluez4/module.la
9
10bluez4_module_la_SOURCES = bluez4/e_mod_main.h \
11 bluez4/e_mod_main.c \
12 bluez4/ebluez4.h \
13 bluez4/ebluez4.c \
14 bluez4/agent.h \
15 bluez4/agent.c
16
17bluez4_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter
18bluez4_module_la_LIBADD = @BLUEZ4_LIBS@
19
20.PHONY: bluez4 install-bluez4
21bluez4: $(bluez4pkg_LTLIBRARIES) $(bluez4_DATA)
22install-bluez4: install-bluez4DATA install-bluez4pkgLTLIBRARIES
diff --git a/src/modules/Makefile_bluez4.mk b/src/modules/Makefile_bluez4.mk
new file mode 100644
index 0000000..0c0c259
--- /dev/null
+++ b/src/modules/Makefile_bluez4.mk
@@ -0,0 +1,23 @@
1bluez4dir = $(MDIR)/bluez4
2bluez4_DATA = src/modules/bluez4/e-module-bluez4.edj \
3 src/modules/bluez4/module.desktop
4
5EXTRA_DIST += $(bluez4_DATA)
6
7bluez4pkgdir = $(MDIR)/bluez4/$(MODULE_ARCH)
8bluez4pkg_LTLIBRARIES = src/modules/bluez4/module.la
9
10src_modules_bluez4_module_la_LDFLAGS = $(MOD_LDFLAGS)
11src_modules_bluez4_module_la_SOURCES = src/modules/bluez4/e_mod_main.h \
12 src/modules/bluez4/e_mod_main.c \
13 src/modules/bluez4/ebluez4.h \
14 src/modules/bluez4/ebluez4.c \
15 src/modules/bluez4/agent.h \
16 src/modules/bluez4/agent.c
17
18src_modules_bluez4_module_la_CPPFLAGS = $(MOD_CPPFLAGS) -Wno-unused-parameter
19src_modules_bluez4_module_la_LIBADD = $(MOD_LIBS) @BLUEZ4_LIBS@
20
21PHONIES += bluez4 install-bluez4
22bluez4: $(bluez4pkg_LTLIBRARIES) $(bluez4_DATA)
23install-bluez4: install-bluez4DATA install-bluez4pkgLTLIBRARIES
diff --git a/src/modules/Makefile_clock.am b/src/modules/Makefile_clock.am
deleted file mode 100644
index b79363d..0000000
--- a/src/modules/Makefile_clock.am
+++ /dev/null
@@ -1,16 +0,0 @@
1clockdir = $(MDIR)/clock
2clock_DATA = clock/e-module-clock.edj \
3 clock/module.desktop
4
5EXTRA_DIST += $(clock_DATA)
6
7clockpkgdir = $(MDIR)/clock/$(MODULE_ARCH)
8clockpkg_LTLIBRARIES = clock/module.la
9
10clock_module_la_SOURCES = clock/e_mod_main.h \
11 clock/e_mod_main.c \
12 clock/e_mod_config.c
13
14.PHONY: clock install-clock
15clock: $(clockpkg_LTLIBRARIES) $(clock_DATA)
16install-clock: install-clockDATA install-clockpkgLTLIBRARIES
diff --git a/src/modules/Makefile_clock.mk b/src/modules/Makefile_clock.mk
new file mode 100644
index 0000000..e41bed6
--- /dev/null
+++ b/src/modules/Makefile_clock.mk
@@ -0,0 +1,19 @@
1clockdir = $(MDIR)/clock
2clock_DATA = src/modules/clock/e-module-clock.edj \
3 src/modules/clock/module.desktop
4
5EXTRA_DIST += $(clock_DATA)
6
7clockpkgdir = $(MDIR)/clock/$(MODULE_ARCH)
8clockpkg_LTLIBRARIES = src/modules/clock/module.la
9
10src_modules_clock_module_la_LIBADD = $(MOD_LIBS)
11src_modules_clock_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
12src_modules_clock_module_la_LDFLAGS = $(MOD_LDFLAGS)
13src_modules_clock_module_la_SOURCES = src/modules/clock/e_mod_main.h \
14 src/modules/clock/e_mod_main.c \
15 src/modules/clock/e_mod_config.c
16
17PHONIES += clock install-clock
18clock: $(clockpkg_LTLIBRARIES) $(clock_DATA)
19install-clock: install-clockDATA install-clockpkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf.am b/src/modules/Makefile_conf.am
deleted file mode 100644
index e514802..0000000
--- a/src/modules/Makefile_conf.am
+++ /dev/null
@@ -1,17 +0,0 @@
1confdir = $(MDIR)/conf
2conf_DATA = conf/e-module-conf.edj \
3 conf/module.desktop
4
5EXTRA_DIST += $(conf_DATA)
6
7confpkgdir = $(MDIR)/conf/$(MODULE_ARCH)
8confpkg_LTLIBRARIES = conf/module.la
9
10conf_module_la_SOURCES = conf/e_mod_main.c \
11 conf/e_mod_main.h \
12 conf/e_conf.c \
13 conf/e_mod_config.c
14
15.PHONY: conf install-conf
16conf: $(confpkg_LTLIBRARIES) $(conf_DATA)
17install-conf: install-confDATA install-confpkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf.mk b/src/modules/Makefile_conf.mk
new file mode 100644
index 0000000..fb8528d
--- /dev/null
+++ b/src/modules/Makefile_conf.mk
@@ -0,0 +1,20 @@
1confdir = $(MDIR)/conf
2conf_DATA = src/modules/conf/e-module-conf.edj \
3 src/modules/conf/module.desktop
4
5EXTRA_DIST += $(conf_DATA)
6
7confpkgdir = $(MDIR)/conf/$(MODULE_ARCH)
8confpkg_LTLIBRARIES = src/modules/conf/module.la
9
10src_modules_conf_module_la_LIBADD = $(MOD_LIBS)
11src_modules_conf_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
12src_modules_conf_module_la_LDFLAGS = $(MOD_LDFLAGS)
13src_modules_conf_module_la_SOURCES = src/modules/conf/e_mod_main.c \
14 src/modules/conf/e_mod_main.h \
15 src/modules/conf/e_conf.c \
16 src/modules/conf/e_mod_config.c
17
18PHONIES += conf install-conf
19conf: $(confpkg_LTLIBRARIES) $(conf_DATA)
20install-conf: install-confDATA install-confpkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf2.mk b/src/modules/Makefile_conf2.mk
new file mode 100644
index 0000000..c520aa3
--- /dev/null
+++ b/src/modules/Makefile_conf2.mk
@@ -0,0 +1,32 @@
1conf2dir = $(MDIR)/conf2
2conf2_DATA = src/modules/conf2/e-module-conf2.edj \
3 src/modules/conf2/module.desktop
4CLEANFILES += src/modules/conf2/e-module-conf2.edj
5EXTRA_DIST += $(conf2_DATA) \
6src/modules/conf2/e-module-conf2.edc \
7src/modules/conf2/module.desktop.in \
8src/modules/conf2/images/volume_knob_ledsoff.png \
9src/modules/conf2/images/volume_knob_move.png \
10src/modules/conf2/images/volume_knob.png \
11src/modules/conf2/images/volume_led_01.png
12
13conf2pkgdir = $(MDIR)/conf2/$(MODULE_ARCH)
14conf2pkg_LTLIBRARIES = src/modules/conf2/module.la
15
16src_modules_conf2_module_la_LDFLAGS = $(MOD_LDFLAGS)
17src_modules_conf2_module_la_SOURCES = src/modules/conf2/e_mod_main.c \
18 src/modules/conf2/e_mod_main.h \
19 src/modules/conf2/e_conf2.c
20
21src_modules_conf2_module_la_CPPFLAGS = $(MOD_CPPFLAGS) @ELM_CFLAGS@
22src_modules_conf2_module_la_LIBADD = $(MOD_LIBS) @ELM_LIBS@
23
24CONF2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(top_srcdir)/src/modules/conf2/images -id $(top_srcdir)/data/themes/img
25
26src/modules/conf2/%.edj: $(top_srcdir)/src/modules/conf2/%.edc Makefile
27 $(EDJE_CC) $(CONF2_EDJE_FLAGS) $< $@
28
29PHONIES += conf2 install-conf2
30conf2: $(conf2pkg_LTLIBRARIES) $(conf2_DATA)
31install-conf2: install-conf2DATA install-conf2pkgLTLIBRARIES
32
diff --git a/src/modules/Makefile_conf_applications.am b/src/modules/Makefile_conf_applications.am
deleted file mode 100644
index 3c5f380..0000000
--- a/src/modules/Makefile_conf_applications.am
+++ /dev/null
@@ -1,19 +0,0 @@
1conf_applicationsdir = $(MDIR)/conf_applications
2conf_applications_DATA = conf_applications/e-module-conf_applications.edj \
3 conf_applications/module.desktop
4
5EXTRA_DIST += $(conf_applications_DATA)
6
7conf_applicationspkgdir = $(MDIR)/conf_applications/$(MODULE_ARCH)
8conf_applicationspkg_LTLIBRARIES = conf_applications/module.la
9
10conf_applications_module_la_SOURCES = conf_applications/e_mod_main.c \
11 conf_applications/e_mod_main.h \
12 conf_applications/e_int_config_apps.c \
13 conf_applications/e_int_config_defapps.c \
14 conf_applications/e_int_config_deskenv.c \
15 conf_applications/e_int_config_apps_personal.c
16
17.PHONY: conf_applications install-conf_applications
18conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA)
19install-conf_applications: install-conf_applicationsDATA install-conf_applicationspkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_applications.mk b/src/modules/Makefile_conf_applications.mk
new file mode 100644
index 0000000..525e547
--- /dev/null
+++ b/src/modules/Makefile_conf_applications.mk
@@ -0,0 +1,22 @@
1conf_applicationsdir = $(MDIR)/conf_applications
2conf_applications_DATA = src/modules/conf_applications/e-module-conf_applications.edj \
3 src/modules/conf_applications/module.desktop
4
5EXTRA_DIST += $(conf_applications_DATA)
6
7conf_applicationspkgdir = $(MDIR)/conf_applications/$(MODULE_ARCH)
8conf_applicationspkg_LTLIBRARIES = src/modules/conf_applications/module.la
9
10src_modules_conf_applications_module_la_LIBADD = $(MOD_LIBS)
11src_modules_conf_applications_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
12src_modules_conf_applications_module_la_LDFLAGS = $(MOD_LDFLAGS)
13src_modules_conf_applications_module_la_SOURCES = src/modules/conf_applications/e_mod_main.c \
14 src/modules/conf_applications/e_mod_main.h \
15 src/modules/conf_applications/e_int_config_apps.c \
16 src/modules/conf_applications/e_int_config_defapps.c \
17 src/modules/conf_applications/e_int_config_deskenv.c \
18 src/modules/conf_applications/e_int_config_apps_personal.c
19
20PHONIES += conf_applications install-conf_applications
21conf_applications: $(conf_applicationspkg_LTLIBRARIES) $(conf_applications_DATA)
22install-conf_applications: install-conf_applicationsDATA install-conf_applicationspkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_bindings.am b/src/modules/Makefile_conf_bindings.am
deleted file mode 100644
index 78084e4..0000000
--- a/src/modules/Makefile_conf_bindings.am
+++ /dev/null
@@ -1,19 +0,0 @@
1conf_bindingsdir = $(MDIR)/conf_bindings
2conf_bindings_DATA = conf_bindings/module.desktop
3
4EXTRA_DIST += $(conf_bindings_DATA)
5
6conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH)
7conf_bindingspkg_LTLIBRARIES = conf_bindings/module.la
8
9conf_bindings_module_la_SOURCES = conf_bindings/e_mod_main.c \
10 conf_bindings/e_mod_main.h \
11 conf_bindings/e_int_config_keybindings.c \
12 conf_bindings/e_int_config_mousebindings.c \
13 conf_bindings/e_int_config_edgebindings.c \
14 conf_bindings/e_int_config_signalbindings.c \
15 conf_bindings/e_int_config_acpibindings.c
16
17.PHONY: conf_bindings install-conf_bindings
18conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA)
19install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_bindings.mk b/src/modules/Makefile_conf_bindings.mk
new file mode 100644
index 0000000..b04a929
--- /dev/null
+++ b/src/modules/Makefile_conf_bindings.mk
@@ -0,0 +1,22 @@
1conf_bindingsdir = $(MDIR)/conf_bindings
2conf_bindings_DATA = src/modules/conf_bindings/module.desktop
3
4EXTRA_DIST += $(conf_bindings_DATA)
5
6conf_bindingspkgdir = $(MDIR)/conf_bindings/$(MODULE_ARCH)
7conf_bindingspkg_LTLIBRARIES = src/modules/conf_bindings/module.la
8
9src_modules_conf_bindings_module_la_LIBADD = $(MOD_LIBS)
10src_modules_conf_bindings_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
11src_modules_conf_bindings_module_la_LDFLAGS = $(MOD_LDFLAGS)
12src_modules_conf_bindings_module_la_SOURCES = src/modules/conf_bindings/e_mod_main.c \
13 src/modules/conf_bindings/e_mod_main.h \
14 src/modules/conf_bindings/e_int_config_keybindings.c \
15 src/modules/conf_bindings/e_int_config_mousebindings.c \
16 src/modules/conf_bindings/e_int_config_edgebindings.c \
17 src/modules/conf_bindings/e_int_config_signalbindings.c \
18 src/modules/conf_bindings/e_int_config_acpibindings.c
19
20PHONIES += conf_bindings install-conf_bindings
21conf_bindings: $(conf_bindingspkg_LTLIBRARIES) $(conf_bindings_DATA)
22install-conf_bindings: install-conf_bindingsDATA install-conf_bindingspkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_comp.am b/src/modules/Makefile_conf_comp.am
deleted file mode 100644
index 9cd84b4..0000000
--- a/src/modules/Makefile_conf_comp.am
+++ /dev/null
@@ -1,16 +0,0 @@
1conf_compdir = $(MDIR)/conf_comp
2conf_comp_DATA = conf_comp/module.desktop
3
4EXTRA_DIST += $(comp_DATA)
5
6conf_comppkgdir = $(MDIR)/conf_comp/$(MODULE_ARCH)
7conf_comppkg_LTLIBRARIES = conf_comp/module.la
8
9conf_comp_module_la_SOURCES = conf_comp/e_mod_main.h \
10 conf_comp/e_mod_main.c \
11 conf_comp/e_mod_config.c \
12 conf_comp/e_mod_config_match.c
13
14.PHONY: conf_comp install-conf_comp
15conf_comp: $(conf_mppkg_LTLIBRARIES) $(conf_comp_DATA)
16install-conf_comp: install-conf_compDATA install-conf_comppkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_comp.mk b/src/modules/Makefile_conf_comp.mk
new file mode 100644
index 0000000..785b163
--- /dev/null
+++ b/src/modules/Makefile_conf_comp.mk
@@ -0,0 +1,19 @@
1conf_compdir = $(MDIR)/conf_comp
2conf_comp_DATA = src/modules/conf_comp/module.desktop
3
4EXTRA_DIST += $(comp_DATA)
5
6conf_comppkgdir = $(MDIR)/conf_comp/$(MODULE_ARCH)
7conf_comppkg_LTLIBRARIES = src/modules/conf_comp/module.la
8
9src_modules_conf_comp_module_la_LIBADD = $(MOD_LIBS)
10src_modules_conf_comp_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
11src_modules_conf_comp_module_la_LDFLAGS = $(MOD_LDFLAGS)
12src_modules_conf_comp_module_la_SOURCES = src/modules/conf_comp/e_mod_main.h \
13 src/modules/conf_comp/e_mod_main.c \
14 src/modules/conf_comp/e_mod_config.c \
15 src/modules/conf_comp/e_mod_config_match.c
16
17PHONIES += conf_comp install-conf_comp
18conf_comp: $(conf_mppkg_LTLIBRARIES) $(conf_comp_DATA)
19install-conf_comp: install-conf_compDATA install-conf_comppkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_dialogs.am b/src/modules/Makefile_conf_dialogs.am
deleted file mode 100644
index 61f5e11..0000000
--- a/src/modules/Makefile_conf_dialogs.am
+++ /dev/null
@@ -1,17 +0,0 @@
1conf_dialogsdir = $(MDIR)/conf_dialogs
2conf_dialogs_DATA = conf_dialogs/e-module-conf_dialogs.edj \
3 conf_dialogs/module.desktop
4
5EXTRA_DIST += $(conf_dialogs_DATA)
6
7conf_dialogspkgdir = $(MDIR)/conf_dialogs/$(MODULE_ARCH)
8conf_dialogspkg_LTLIBRARIES = conf_dialogs/module.la
9
10conf_dialogs_module_la_SOURCES = conf_dialogs/e_mod_main.c \
11 conf_dialogs/e_mod_main.h \
12 conf_dialogs/e_int_config_dialogs.c \
13 conf_dialogs/e_int_config_profiles.c
14
15.PHONY: conf_dialogs install-conf_dialogs
16conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA)
17install-conf_dialogs: install-conf_dialogsDATA install-conf_dialogspkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_dialogs.mk b/src/modules/Makefile_conf_dialogs.mk
new file mode 100644
index 0000000..7355d18
--- /dev/null
+++ b/src/modules/Makefile_conf_dialogs.mk
@@ -0,0 +1,20 @@
1conf_dialogsdir = $(MDIR)/conf_dialogs
2conf_dialogs_DATA = src/modules/conf_dialogs/e-module-conf_dialogs.edj \
3 src/modules/conf_dialogs/module.desktop
4
5EXTRA_DIST += $(conf_dialogs_DATA)
6
7conf_dialogspkgdir = $(MDIR)/conf_dialogs/$(MODULE_ARCH)
8conf_dialogspkg_LTLIBRARIES = src/modules/conf_dialogs/module.la
9
10src_modules_conf_dialogs_module_la_LIBADD = $(MOD_LIBS)
11src_modules_conf_dialogs_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
12src_modules_conf_dialogs_module_la_LDFLAGS = $(MOD_LDFLAGS)
13src_modules_conf_dialogs_module_la_SOURCES = src/modules/conf_dialogs/e_mod_main.c \
14 src/modules/conf_dialogs/e_mod_main.h \
15 src/modules/conf_dialogs/e_int_config_dialogs.c \
16 src/modules/conf_dialogs/e_int_config_profiles.c
17
18PHONIES += conf_dialogs install-conf_dialogs
19conf_dialogs: $(conf_dialogspkg_LTLIBRARIES) $(conf_dialogs_DATA)
20install-conf_dialogs: install-conf_dialogsDATA install-conf_dialogspkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_display.am b/src/modules/Makefile_conf_display.am
deleted file mode 100644
index 24db929..0000000
--- a/src/modules/Makefile_conf_display.am
+++ /dev/null
@@ -1,21 +0,0 @@
1conf_displaydir = $(MDIR)/conf_display
2conf_display_DATA = conf_display/module.desktop
3
4EXTRA_DIST += $(conf_display_DATA)
5
6conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH)
7conf_displaypkg_LTLIBRARIES = conf_display/module.la
8
9conf_display_module_la_SOURCES = conf_display/e_mod_main.c \
10 conf_display/e_mod_main.h \
11 conf_display/e_int_config_display.c \
12 conf_display/e_int_config_screensaver.c \
13 conf_display/e_int_config_dpms.c \
14 conf_display/e_int_config_desklock.c \
15 conf_display/e_int_config_desklock_fsel.c \
16 conf_display/e_int_config_desks.c \
17 conf_display/e_int_config_desk.c
18
19.PHONY: conf_display install-conf_display
20conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA)
21install-conf_display: install-conf_displayDATA install-conf_displaypkgLTLIBRARIES
diff --git a/src/modules/Makefile_conf_display.mk b/src/modules/Makefile_conf_display.mk
new file mode 100644
index 0000000..ff50927
--- /dev/null
+++ b/src/modules/Makefile_conf_display.mk
@@ -0,0 +1,24 @@
1conf_displaydir = $(MDIR)/conf_display
2conf_display_DATA = src/modules/conf_display/module.desktop
3
4EXTRA_DIST += $(conf_display_DATA)
5
6conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH)
7conf_displaypkg_LTLIBRARIES = src/modules/conf_display/module.la
8
9src_modules_conf_display_module_la_LIBADD = $(MOD_LIBS)
10src_modules_conf_display_module_la_CPPFLAGS = $(MOD_CPPFLAGS)
11src_modules_conf_display_module_la_LDFLAGS = $(MOD_LDFLAGS)
12src_modules_conf_display_module_la_SOURCES = src/modules/conf_display/e_mod_main.c \
13 src/modules/conf_display/e_mod_main.h \
14 src/modules/conf_display/e_int_config_display.c \
15 src/modules/conf_display/e_int_config_screensaver.c \
16 src/modules/conf_display/e_int_config_dpms.c \
17 src/modules/conf_display/e_int_config_desklock.c \
18 src/modules/conf_display/e_int_config_desklock_fsel.c \
19 src/modules/conf_display/e_int_config_desks.c \
20 src/modules/conf_display/e_int_config_desk.c
21
22PHONIES += conf_display install-conf_display
23conf_display: $(conf_displaypkg_LTLIBRARIES) $(conf_display_DATA)