fix e module

1 files changed, 15 insertions, 8 deletions

diff --git a/src/enlightenment/Makefile.mk b/src/enlightenment/Makefile.mk
index 71fc9c1..94c13ad 100644
--- a/src/enlightenment/Makefile.mk
+++ b/src/enlightenment/Makefile.mk
@@ -6,28 +6,35 @@ $(wildcard src/enlightenment/images/*.png)
 
 
 if MPDULE
-pkgdir = $(datadir)/$(MODULE_ARCH)
+pkgdir = $(e_module_dir)/empdule/$(E_MODULE_ARCH)
 pkg_LTLIBRARIES = src/enlightenment/module.la
 
 src_enlightenment_module_la_SOURCES = \
 src/enlightenment/e_mod_main.c \
 src/enlightenment/e_mod_main.h \
-src/enlightenment/e_mod_config.c
-
-src_enlightenment_module_la_LIBADD = @E_LIBS@
+src/enlightenment/e_mod_config.c \
+$(ELDBUS_SRC)
+
+src_enlightenment_module_la_CPPFLAGS = \
+-I$(top_builddir) \
+-I$(top_srcdir)/src/bin \
+@E_CFLAGS@ \
+@EFL_CFLAGS@
+src_enlightenment_module_la_LIBADD = @E_LIBS@ @EFL_LIBS@
 src_enlightenment_module_la_LDFLAGS = -module -avoid-version
 
-filesdir = $(datadir)
+filesdir = $(e_module_dir)/empdule
 files_DATA = \
-src/enlightenment/e-module-empdule.edj
-src/enlightenment/module.desktop
+src/enlightenment/e-module-empdule.edj \
+src/enlightenment/module.desktop \
 src/enlightenment/empdule.edj
 
+module.desktop: module.desktop.in
 
 E_EDJE_FLAGS = -v \
              -id $(top_srcdir)/src/enlightenment/images
 
 src/enlightenment/%.edj:  src/enlightenment/%.edc
-        @EDJE_CC@ $(E_EDJE_FLAGS) $< $@
+        @edje_cc@ $(E_EDJE_FLAGS) $< $@
 
 endif