[pango/kill-modules: 11/13] Kill module.def and Module.mk

[Behdad Esfahbod <behdad src gnome org>]

commit 24354bccbe1106e34b4297553c51dcba3d6e9fdf
Author: Behdad Esfahbod <behdad behdad org>
Date:   Sun Jul 27 17:39:46 2014 -0400

    Kill module.def and Module.mk

 modules/Makefile.am        |    4 ----
 modules/Module.mk          |    7 -------
 modules/arabic/Makefile.am |    8 +++++++-
 modules/basic/Makefile.am  |    8 +++++++-
 modules/indic/Makefile.am  |    8 +++++++-
 modules/module.def         |    5 -----
 modules/thai/Makefile.am   |    8 +++++++-
 7 files changed, 28 insertions(+), 20 deletions(-)
---
diff --git a/modules/Makefile.am b/modules/Makefile.am
index 5883ea2..be8e285 100644
--- a/modules/Makefile.am
+++ b/modules/Makefile.am
@@ -6,8 +6,4 @@ SUBDIRS =               \
        indic           \
        thai
 
-EXTRA_DIST =           \
-       Module.mk       \
-       module.def
-
 -include $(top_srcdir)/git.mk
diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am
index cf54bd2..7b800cf 100644
--- a/modules/arabic/Makefile.am
+++ b/modules/arabic/Makefile.am
@@ -1,4 +1,10 @@
-include $(top_srcdir)/modules/Module.mk
+INCLUDES =                             \
+       -DG_LOG_DOMAIN=\"Pango\"        \
+       -DPANGO_ENABLE_ENGINE           \
+       $(PANGO_DEBUG_FLAGS)            \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/pango           \
+       $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libpango-arabic-lang.la
 
diff --git a/modules/basic/Makefile.am b/modules/basic/Makefile.am
index 6c9abba..22d657b 100644
--- a/modules/basic/Makefile.am
+++ b/modules/basic/Makefile.am
@@ -1,4 +1,10 @@
-include $(top_srcdir)/modules/Module.mk
+INCLUDES =                             \
+       -DG_LOG_DOMAIN=\"Pango\"        \
+       -DPANGO_ENABLE_ENGINE           \
+       $(PANGO_DEBUG_FLAGS)            \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/pango           \
+       $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES =
 
diff --git a/modules/indic/Makefile.am b/modules/indic/Makefile.am
index df26446..a3f23fd 100644
--- a/modules/indic/Makefile.am
+++ b/modules/indic/Makefile.am
@@ -1,4 +1,10 @@
-include $(top_srcdir)/modules/Module.mk
+INCLUDES =                             \
+       -DG_LOG_DOMAIN=\"Pango\"        \
+       -DPANGO_ENABLE_ENGINE           \
+       $(PANGO_DEBUG_FLAGS)            \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/pango           \
+       $(GLIB_CFLAGS)
 
 noinst_LTLIBRARIES = libpango-indic-lang.la
 
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index 5fae130..4345845 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -1,4 +1,10 @@
-include $(top_srcdir)/modules/Module.mk
+INCLUDES =                             \
+       -DG_LOG_DOMAIN=\"Pango\"        \
+       -DPANGO_ENABLE_ENGINE           \
+       $(PANGO_DEBUG_FLAGS)            \
+       -I$(top_srcdir)                 \
+       -I$(top_srcdir)/pango           \
+       $(GLIB_CFLAGS)
 
 if HAVE_LIBTHAI
 noinst_LTLIBRARIES = libpango-thai-lang.la