summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2002-08-07 15:00:01 +0000
committerOwen Taylor <otaylor@src.gnome.org>2002-08-07 15:00:01 +0000
commit81d8471ec8a2038c252c6dcd19279bf3ee05d4af (patch)
tree65b0f0c953893e0abcb010c426b5e25f70f6e4ac
parent676c0367f14e1ae58ae04397d39640e06b502d57 (diff)
downloadpango-81d8471ec8a2038c252c6dcd19279bf3ee05d4af.tar.gz
Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com> * modules/hangul/Makefile.am modules/thai/Makefile.am: Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-1-105
-rw-r--r--ChangeLog.pre-1-25
-rw-r--r--ChangeLog.pre-1-45
-rw-r--r--ChangeLog.pre-1-65
-rw-r--r--ChangeLog.pre-1-85
-rw-r--r--modules/hangul/Makefile.am2
-rw-r--r--modules/thai/Makefile.am2
8 files changed, 32 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f5435ae..2b5ded81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/hangul/Makefile.am modules/thai/Makefile.am:
+ Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
+
Mon Aug 5 23:57:59 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-fontmap.c (pango_xft_pattern_hash): Use
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 7f5435ae..2b5ded81 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,8 @@
+Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/hangul/Makefile.am modules/thai/Makefile.am:
+ Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
+
Mon Aug 5 23:57:59 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-fontmap.c (pango_xft_pattern_hash): Use
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 7f5435ae..2b5ded81 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,8 @@
+Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/hangul/Makefile.am modules/thai/Makefile.am:
+ Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
+
Mon Aug 5 23:57:59 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-fontmap.c (pango_xft_pattern_hash): Use
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 7f5435ae..2b5ded81 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,8 @@
+Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/hangul/Makefile.am modules/thai/Makefile.am:
+ Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
+
Mon Aug 5 23:57:59 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-fontmap.c (pango_xft_pattern_hash): Use
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 7f5435ae..2b5ded81 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,8 @@
+Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/hangul/Makefile.am modules/thai/Makefile.am:
+ Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
+
Mon Aug 5 23:57:59 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-fontmap.c (pango_xft_pattern_hash): Use
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 7f5435ae..2b5ded81 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,8 @@
+Wed Aug 7 10:57:49 2002 Owen Taylor <otaylor@redhat.com>
+
+ * modules/hangul/Makefile.am modules/thai/Makefile.am:
+ Add missing XFT_CFLAGS to INCLUDES. (Joe Yandle)
+
Mon Aug 5 23:57:59 2002 Owen Taylor <otaylor@redhat.com>
* pango/pangoxft-fontmap.c (pango_xft_pattern_hash): Use
diff --git a/modules/hangul/Makefile.am b/modules/hangul/Makefile.am
index 32bea6a5..46d0075f 100644
--- a/modules/hangul/Makefile.am
+++ b/modules/hangul/Makefile.am
@@ -47,7 +47,7 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
moddefine = $(X_PREFIX) $(XFT_PREFIX)
moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
-INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(XFT_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS)
pango_hangul_x_la_LDFLAGS = -export-dynamic -avoid-version -module
pango_hangul_x_la_SOURCES = $(x_sources)
diff --git a/modules/thai/Makefile.am b/modules/thai/Makefile.am
index f26f9b3a..9a80ccad 100644
--- a/modules/thai/Makefile.am
+++ b/modules/thai/Makefile.am
@@ -48,7 +48,7 @@ module_LTLIBRARIES = $(X_MODULES) $(XFT_MODULES)
moddefine = $(X_PREFIX) $(XFT_PREFIX)
moduledir = $(libdir)/pango/$(PANGO_MODULE_VERSION)/modules
-INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(X_CFLAGS) $(FREETYPE_CFLAGS)
+INCLUDES = -DPANGO_ENABLE_ENGINE -DG_DISABLE_DEPRECATED -I$(top_srcdir) -I$(top_srcdir)/pango/ $(moddefine) $(XFT_CFLAGS) $(FREETYPE_CFLAGS) $(X_CFLAGS)
pango_thai_x_la_LDFLAGS = -export-dynamic -avoid-version -module
pango_thai_x_la_LIBADD = $(thai_x_libadd)