diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2014-07-27 17:39:46 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2015-04-04 16:13:07 -0700 |
| commit | cfe9ce995d7e12a3e3f64c923123337d5dba25b0 (patch) | |
| tree | 1de1ca394eeacf9f546d05d3bdba3a71869bd8cb | |
| parent | 88c066452a252149d1e51387ae989f532603820c (diff) | |
| download | pango-cfe9ce995d7e12a3e3f64c923123337d5dba25b0.tar.gz | |
Kill module.def and Module.mk
| -rw-r--r-- | modules/Makefile.am | 4 | ||||
| -rw-r--r-- | modules/Module.mk | 7 | ||||
| -rw-r--r-- | modules/arabic/Makefile.am | 8 | ||||
| -rw-r--r-- | modules/basic/Makefile.am | 8 | ||||
| -rw-r--r-- | modules/indic/Makefile.am | 8 | ||||
| -rw-r--r-- | modules/module.def | 5 | ||||
| -rw-r--r-- | modules/thai/Makefile.am | 8 |
7 files changed, 28 insertions, 20 deletions
diff --git a/modules/Makefile.am b/modules/Makefile.am index 5883ea23..be8e285e 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/Module.mk b/modules/Module.mk deleted file mode 100644 index bdac1018..00000000 --- a/modules/Module.mk +++ /dev/null @@ -1,7 +0,0 @@ -INCLUDES = \ - -DG_LOG_DOMAIN=\"Pango\" \ - -DPANGO_ENABLE_ENGINE \ - $(PANGO_DEBUG_FLAGS) \ - -I$(top_srcdir) \ - -I$(top_srcdir)/pango \ - $(GLIB_CFLAGS) diff --git a/modules/arabic/Makefile.am b/modules/arabic/Makefile.am index cf54bd29..7b800cfd 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 6c9abba9..22d657b2 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 df26446f..a3f23fd7 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/module.def b/modules/module.def deleted file mode 100644 index 6e673874..00000000 --- a/modules/module.def +++ /dev/null @@ -1,5 +0,0 @@ -EXPORTS - script_engine_create - script_engine_list - script_engine_init - script_engine_exit diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am index 5fae130a..4345845d 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 |