elementary: add edje_external back in.

2 files changed, 69 insertions, 59 deletions

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
index dae18d6318..4d2f1420aa 100644
--- a/src/Makefile_Elementary.am
+++ b/src/Makefile_Elementary.am
@@ -1074,6 +1074,75 @@ modules_elementary_web_none_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LI
 modules_elementary_web_none_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
 modules_elementary_web_none_module_la_LIBTOOLFLAGS = --tag=disable-static
 
+## edje_external
+
+moduleedje_externalpkgdir = $(libdir)/edje/modules/elm/$(MODULE_ARCH)
+moduleedje_externalpkg_LTLIBRARIES = edje_external/elementary/module.la
+
+# Workaround for broken parallel install support in automake (relink issue)
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=7328
+install_moduleedje_externalpkgLTLIBRARIES = install-moduleedje_externalpkgLTLIBRARIES
+$(install_moduleedje_externalpkgLTLIBRARIES): install-libLTLIBRARIES
+
+edje_external_elementary_module_la_SOURCES = \
+	edje_external/elementary/private.h \
+	edje_external/elementary/modules.inc \
+	edje_external/elementary/elm.c \
+	edje_external/elementary/elm_actionslider.c \
+	edje_external/elementary/elm_bg.c \
+	edje_external/elementary/elm_bubble.c \
+	edje_external/elementary/elm_button.c \
+	edje_external/elementary/elm_calendar.c \
+	edje_external/elementary/elm_check.c \
+	edje_external/elementary/elm_clock.c \
+	edje_external/elementary/elm_entry.c \
+	edje_external/elementary/elm_fileselector.c \
+	edje_external/elementary/elm_fileselector_button.c \
+	edje_external/elementary/elm_fileselector_entry.c \
+	edje_external/elementary/elm_frame.c \
+	edje_external/elementary/elm_gengrid.c \
+	edje_external/elementary/elm_genlist.c \
+	edje_external/elementary/elm_hoversel.c \
+	edje_external/elementary/elm_icon.c \
+	edje_external/elementary/elm_index.c \
+	edje_external/elementary/elm_label.c \
+	edje_external/elementary/elm_list.c \
+	edje_external/elementary/elm_map.c \
+	edje_external/elementary/elm_multibuttonentry.c \
+	edje_external/elementary/elm_naviframe.c \
+	edje_external/elementary/elm_notify.c \
+	edje_external/elementary/elm_panes.c \
+	edje_external/elementary/elm_photocam.c \
+	edje_external/elementary/elm_progressbar.c \
+	edje_external/elementary/elm_radio.c \
+	edje_external/elementary/elm_scroller.c \
+	edje_external/elementary/elm_segment_control.c \
+	edje_external/elementary/elm_slider.c \
+	edje_external/elementary/elm_slideshow.c \
+	edje_external/elementary/elm_spinner.c \
+	edje_external/elementary/elm_thumb.c \
+	edje_external/elementary/elm_toolbar.c \
+	edje_external/elementary/elm_video.c \
+	edje_external/elementary/elm_web.c
+
+edje_external_elementary_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 \
+-I$(top_builddir)/src/edje_externals \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+edje_external_elementary_module_la_LIBADD = @USE_ELEMENTARY_LIBS@
+edje_external_elementary_module_la_DEPENDENCIES = @USE_ELEMENTARY_INTERNAL_LIBS@
+edje_external_elementary_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
+edje_external_elementary_module_la_LIBTOOLFLAGS = --tag=disable-static
+
 ### Tests
 
 if EFL_ENABLE_TESTS
diff --git a/src/edje_external/elementary/Makefile.am b/src/edje_external/elementary/Makefile.am
deleted file mode 100644
index c1645b6daf..0000000000
--- a/src/edje_external/elementary/Makefile.am
+++ /dev/null
@@ -1,59 +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=\"$(datadir)/$(PACKAGE)\" \
--DPACKAGE_LIB_DIR=\"$(libdir)\" \
--DELEMENTARY_BUILD \
-@ELEMENTARY_CFLAGS@
-
-pkgdir = $(libdir)/edje/modules/elm/$(MODULE_EDJE)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = private.h \
-modules.inc \
-elm.c \
-elm_actionslider.c \
-elm_bg.c \
-elm_bubble.c \
-elm_button.c \
-elm_calendar.c \
-elm_check.c \
-elm_clock.c \
-elm_entry.c \
-elm_fileselector.c \
-elm_fileselector_button.c \
-elm_fileselector_entry.c \
-elm_frame.c \
-elm_gengrid.c \
-elm_genlist.c \
-elm_hoversel.c \
-elm_icon.c \
-elm_index.c \
-elm_label.c \
-elm_list.c \
-elm_map.c \
-elm_multibuttonentry.c \
-elm_naviframe.c \
-elm_notify.c \
-elm_panes.c \
-elm_photocam.c \
-elm_progressbar.c \
-elm_radio.c \
-elm_scroller.c \
-elm_segment_control.c \
-elm_slider.c \
-elm_slideshow.c \
-elm_spinner.c \
-elm_thumb.c \
-elm_toolbar.c \
-elm_video.c \
-elm_web.c
-
-module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
-module_la_LDFLAGS = -no-undefined -module -avoid-version -shared -fPIC