cedric pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=95808a226a6e7d97f32fad6a485a948ef0415ea5
commit 95808a226a6e7d97f32fad6a485a948ef0415ea5
Author: Cedric BAIL <ced...@osg.samsung.com>
Date: Tue Mar 29 14:53:24 2016 -0700
elementary: add back modules.
---
src/Makefile_Elementary.am | 203 +++++++++++++++++++++
src/modules/elementary/Makefile.am | 10 -
src/modules/elementary/access_output/Makefile.am | 22 ---
.../elementary/datetime_input_ctxpopup/Makefile.am | 23 ---
src/modules/elementary/prefs/Makefile.am | 56 ------
src/modules/elementary/test_entry/Makefile.am | 22 ---
src/modules/elementary/test_map/Makefile.am | 22 ---
src/modules/elementary/web/Makefile.am | 6 -
src/modules/elementary/web/none/Makefile.am | 40 ----
9 files changed, 203 insertions(+), 201 deletions(-)
diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index 9111a4a..f65fef2 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -871,6 +871,209 @@ endif
EXTRA_DIST += \
bin/elementary/test_factory.c
+### Modules
+
+## access_output
+
+moduleaccess_outputpkgdir =
$(libdir)/elementary/modules/access_output/$(MODULE_ARCH)
+moduleaccess_outputpkg_LTLIBRARIES = modules/elementary/access_output/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleaccess_outputpkgLTLIBRARIES =
install-moduleaccess_outputpkgLTLIBRARIES
+$(install-moduleaccess_outputpkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_access_output_module_la_SOURCES =
modules/elementary/access_output/mod.c
+modules_elementary_access_output_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_access_output_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_access_output_module_la_DEPENDENCIES =
@USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_access_output_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
+modules_elementary_access_output_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## datetime_input_ctxpopup
+
+moduledatetime_input_ctxpopuppkgdir =
$(libdir)/elementary/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
+moduledatetime_input_ctxpopuppkg_LTLIBRARIES =
modules/elementary/datetime_input_ctxpopup/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduledatetime_input_ctxpopuppkgLTLIBRARIES =
install-moduledatetime_input_ctxpopuppkgLTLIBRARIES
+$(install-moduledatetime_input_ctxpopuppkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_datetime_input_ctxpopup_module_la_SOURCES = \
+modules/elementary/datetime_input_ctxpopup/datetime_input_ctxpopup.c
+modules_elementary_datetime_input_ctxpopup_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_datetime_input_ctxpopup_module_la_LIBADD =
@USE_ELEMENTARY_LIBS@
+modules_elementary_datetime_input_ctxpopup_module_la_DEPENDENCIES =
@USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_datetime_input_ctxpopup_module_la_LDFLAGS = -module
@EFL_LTMODULE_FLAGS@
+modules_elementary_datetime_input_ctxpopup_module_la_LIBTOOLFLAGS =
--tag=disable-static
+
+## prefs
+
+moduleprefspkgdir = $(libdir)/elementary/modules/prefs/$(MODULE_ARCH)
+moduleprefspkg_LTLIBRARIES = modules/elementary/prefs/module.la
+
+EXTRA_DIST += modules/elementary/prefs/elm_prefs_swallow.edc
+
+prefs_filesdir = $(libdir)/modules/prefs/$(MODULE_ARCH)
+prefs_files_DATA = modules/elementary/prefs/elm_prefs_swallow.edj
+CLEANFILES += $(prefs_files_DATA)
+
+modules/elementary/prefs/elm_prefs_swallow.edj:
modules/elementary/prefs/elm_prefs_swallow.edc bin/edje/edje_cc${EXEEXT}
+ $(AM_V_EDJ) \
+ $(MKDIR_P) modules/elementary/prefs/ ; \
+ $(EDJE_CC) $(EDJE_CC_FLAGS) -id
$(top_srcdir)/src/modules/elementary/prefs/ $< $@
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleprefspkgLTLIBRARIES = install-moduleprefspkgLTLIBRARIES
+$(install-moduleprefspkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_prefs_module_la_SOURCES = \
+modules/elementary/prefs/private.h \
+modules/elementary/prefs/item_widgets.inc \
+modules/elementary/prefs/page_widgets.inc \
+modules/elementary/prefs/prefs_iface.c \
+modules/elementary/prefs/elm_button.c \
+modules/elementary/prefs/elm_check.c \
+modules/elementary/prefs/elm_datetime.c \
+modules/elementary/prefs/elm_entry.c \
+modules/elementary/prefs/elm_label.c \
+modules/elementary/prefs/elm_separator.c \
+modules/elementary/prefs/elm_slider.c \
+modules/elementary/prefs/elm_spinner.c \
+modules/elementary/prefs/elm_swallow.c \
+modules/elementary/prefs/elm_vertical_box.c \
+modules/elementary/prefs/elm_horizontal_box.c \
+modules/elementary/prefs/elm_vertical_frame.c \
+modules/elementary/prefs/elm_horizontal_frame.c
+
+modules_elementary_prefs_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_prefs_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_prefs_module_la_DEPENDENCIES =
@USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_prefs_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_prefs_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## test_entry
+
+moduletest_entrypkgdir = $(libdir)/elementary/modules/test_entry/$(MODULE_ARCH)
+moduletest_entrypkg_LTLIBRARIES = modules/elementary/test_entry/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduletest_entrypkgLTLIBRARIES = install-moduletest_entrypkgLTLIBRARIES
+$(install-moduletest_entrypkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_test_entry_module_la_SOURCES =
modules/elementary/test_entry/mod.c
+modules_elementary_test_entry_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_test_entry_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_test_entry_module_la_DEPENDENCIES =
@USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_test_entry_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_test_entry_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## test_map
+
+moduletest_mappkgdir = $(libdir)/elementary/modules/test_map/$(MODULE_ARCH)
+moduletest_mappkg_LTLIBRARIES = modules/elementary/test_map/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduletest_mappkgLTLIBRARIES = install-moduletest_mappkgLTLIBRARIES
+$(install-moduletest_mappkgLTLIBRARIES): install-libLTLIBRARIES
+
+modules_elementary_test_map_module_la_SOURCES =
modules/elementary/test_map/mod.c
+modules_elementary_test_map_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_test_map_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_test_map_module_la_DEPENDENCIES =
@USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_test_map_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_test_map_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+## web_none
+
+moduleweb_nonepkgdir = $(libdir)/elementary/modules/web/none/$(MODULE_ARCH)
+moduleweb_nonepkg_LTLIBRARIES = modules/elementary/web/none/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleweb_nonepkgLTLIBRARIES = install-moduleweb_nonepkgLTLIBRARIES
+$(install-moduleweb_nonepkgLTLIBRARIES): install-libLTLIBRARIES
+
+BUILT_SOURCES += \
+ modules/elementary/web/none/elm_web_none.eo.h \
+ modules/elementary/web/none/elm_web_none.eo.c
+
+modules_elementary_web_none_module_la_SOURCES = \
+modules/elementary/web/none/elm_web_none.c \
+modules/elementary/web/none/elm_web_none.eo.h
+modules_elementary_web_none_module_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DMODULES_PATH=\"$(libdir)/elementary/modules\" \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+modules_elementary_web_none_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+modules_elementary_web_none_module_la_DEPENDENCIES =
@USE_ELEMENTARY_INTERNAL_LIBS@
+modules_elementary_web_none_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+modules_elementary_web_none_module_la_LIBTOOLFLAGS = --tag=disable-static
+
+### Tests
+
if EFL_ENABLE_TESTS
AM_TESTS_ENVIRONMENT += \
diff --git a/src/modules/elementary/Makefile.am
b/src/modules/elementary/Makefile.am
deleted file mode 100644
index 8ad4392..0000000
--- a/src/modules/elementary/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = \
-prefs \
-test_entry \
-test_map \
-access_output \
-datetime_input_ctxpopup \
-web
diff --git a/src/modules/elementary/access_output/Makefile.am
b/src/modules/elementary/access_output/Makefile.am
deleted file mode 100644
index 941348e..0000000
--- a/src/modules/elementary/access_output/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_builddir) \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(pkglibdir)/modules/access_output/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = mod.c
-
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/elementary/datetime_input_ctxpopup/Makefile.am
b/src/modules/elementary/datetime_input_ctxpopup/Makefile.am
deleted file mode 100644
index 3f1350e..0000000
--- a/src/modules/elementary/datetime_input_ctxpopup/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--DELM_INTERNAL_API_ARGESFSDFEFC=1 \
--I. \
--I$(top_builddir) \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(pkglibdir)/modules/datetime_input_ctxpopup/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = datetime_input_ctxpopup.c
-
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/elementary/prefs/Makefile.am
b/src/modules/elementary/prefs/Makefile.am
deleted file mode 100644
index d7280cb..0000000
--- a/src/modules/elementary/prefs/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-include ../../../Makefile_Elm_Helpers.am
-
-EXTRA_DIST = \
-elm_prefs_swallow.edc
-
-filesdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
-files_DATA = elm_prefs_swallow.edj
-
-elm_prefs_swallow.edj: Makefile elm_prefs_swallow.edc
- $(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) \
- $(top_srcdir)/src/modules/prefs/elm_prefs_swallow.edc \
- $(top_builddir)/src/modules/prefs/elm_prefs_swallow.edj
-
-AM_CPPFLAGS = \
--DELM_INTERNAL_API_ARGESFSDFEFC=1 \
--I. \
--I$(top_builddir) \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DLOCALE_DIR=\"$(localedir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(pkglibdir)/modules/prefs/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = \
-private.h \
-item_widgets.inc \
-page_widgets.inc \
-prefs_iface.c \
-elm_button.c \
-elm_check.c \
-elm_datetime.c \
-elm_entry.c \
-elm_label.c \
-elm_separator.c \
-elm_slider.c \
-elm_spinner.c \
-elm_swallow.c \
-elm_vertical_box.c \
-elm_horizontal_box.c \
-elm_vertical_frame.c \
-elm_horizontal_frame.c
-
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-clean-local:
- rm -f *.edj
diff --git a/src/modules/elementary/test_entry/Makefile.am
b/src/modules/elementary/test_entry/Makefile.am
deleted file mode 100644
index a791506..0000000
--- a/src/modules/elementary/test_entry/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_builddir) \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(pkglibdir)/modules/test_entry/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = mod.c
-
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/elementary/test_map/Makefile.am
b/src/modules/elementary/test_map/Makefile.am
deleted file mode 100644
index 14e7cc2..0000000
--- a/src/modules/elementary/test_map/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
--I. \
--I$(top_builddir) \
--I$(top_srcdir) \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(pkglibdir)/modules/test_map/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = mod.c
-
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/elementary/web/Makefile.am
b/src/modules/elementary/web/Makefile.am
deleted file mode 100644
index 9b7287b..0000000
--- a/src/modules/elementary/web/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-SUBDIRS = \
-none \
-webkit2
diff --git a/src/modules/elementary/web/none/Makefile.am
b/src/modules/elementary/web/none/Makefile.am
deleted file mode 100644
index f3a0f11..0000000
--- a/src/modules/elementary/web/none/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AUTOMAKE_OPTIONS = 1.4 foreign
-MAINTAINERCLEANFILES = Makefile.in
-
-CLEANFILES =
-
-EOLIAN_FLAGS = @DEPS_EOLIAN_FLAGS@ \
- -I$(top_srcdir)/src/lib
-
-include $(top_srcdir)/Makefile_Eolian_Helper.am
-
-AM_CPPFLAGS = \
--DELM_INTERNAL_API_ARGESFSDFEFC=1 \
--DMODULES_PATH=\"$(pkglibdir)/modules\" \
--I. \
--I$(top_builddir) \
--I$(top_srcdir) \
--I$(top_srcdir)/src/imported \
--I$(top_srcdir)/src/lib \
--I$(top_builddir)/src/lib \
--DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
--DLOCALE_DIR=\"$(localedir)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DICON_DIR=\"$(datadir)/icons\" \
--DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(pkglibdir)/modules/web/none/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-BUILT_SOURCES = elm_web_none.eo.h elm_web_none.eo.c
-
-module_la_SOURCES = elm_web_none.c elm_web_none.eo.h
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
-module_la_LIBTOOLFLAGS = --tag=disable-static
-
-EXTRA_DIST = elm_web_none.eo
-
-
--
