summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--ChangeLog.pre-1-107
-rw-r--r--ChangeLog.pre-1-27
-rw-r--r--ChangeLog.pre-1-47
-rw-r--r--ChangeLog.pre-1-67
-rw-r--r--ChangeLog.pre-1-87
-rw-r--r--pango/Makefile.am1
-rw-r--r--pangoft2.pc.in2
-rw-r--r--tests/Makefile.am4
9 files changed, 47 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4176614d..7f79db45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Thu Jun 6 15:01:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pangoft2.pc.in (Cflags): Add @FREETYPE_CFLAGS@
+
+ * tests/Makefile.am (INCLUDES): Add XFT_CFLAGS.
+ gtk/Makefile.am (INCLUDES): Add back FREETYPE_CFLAGS.
+
Thu Jun 6 08:54:26 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Update the versioning to reflect '1.1.x'
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 4176614d..7f79db45 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,10 @@
+Thu Jun 6 15:01:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pangoft2.pc.in (Cflags): Add @FREETYPE_CFLAGS@
+
+ * tests/Makefile.am (INCLUDES): Add XFT_CFLAGS.
+ gtk/Makefile.am (INCLUDES): Add back FREETYPE_CFLAGS.
+
Thu Jun 6 08:54:26 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Update the versioning to reflect '1.1.x'
diff --git a/ChangeLog.pre-1-2 b/ChangeLog.pre-1-2
index 4176614d..7f79db45 100644
--- a/ChangeLog.pre-1-2
+++ b/ChangeLog.pre-1-2
@@ -1,3 +1,10 @@
+Thu Jun 6 15:01:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pangoft2.pc.in (Cflags): Add @FREETYPE_CFLAGS@
+
+ * tests/Makefile.am (INCLUDES): Add XFT_CFLAGS.
+ gtk/Makefile.am (INCLUDES): Add back FREETYPE_CFLAGS.
+
Thu Jun 6 08:54:26 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Update the versioning to reflect '1.1.x'
diff --git a/ChangeLog.pre-1-4 b/ChangeLog.pre-1-4
index 4176614d..7f79db45 100644
--- a/ChangeLog.pre-1-4
+++ b/ChangeLog.pre-1-4
@@ -1,3 +1,10 @@
+Thu Jun 6 15:01:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pangoft2.pc.in (Cflags): Add @FREETYPE_CFLAGS@
+
+ * tests/Makefile.am (INCLUDES): Add XFT_CFLAGS.
+ gtk/Makefile.am (INCLUDES): Add back FREETYPE_CFLAGS.
+
Thu Jun 6 08:54:26 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Update the versioning to reflect '1.1.x'
diff --git a/ChangeLog.pre-1-6 b/ChangeLog.pre-1-6
index 4176614d..7f79db45 100644
--- a/ChangeLog.pre-1-6
+++ b/ChangeLog.pre-1-6
@@ -1,3 +1,10 @@
+Thu Jun 6 15:01:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pangoft2.pc.in (Cflags): Add @FREETYPE_CFLAGS@
+
+ * tests/Makefile.am (INCLUDES): Add XFT_CFLAGS.
+ gtk/Makefile.am (INCLUDES): Add back FREETYPE_CFLAGS.
+
Thu Jun 6 08:54:26 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Update the versioning to reflect '1.1.x'
diff --git a/ChangeLog.pre-1-8 b/ChangeLog.pre-1-8
index 4176614d..7f79db45 100644
--- a/ChangeLog.pre-1-8
+++ b/ChangeLog.pre-1-8
@@ -1,3 +1,10 @@
+Thu Jun 6 15:01:48 2002 Owen Taylor <otaylor@redhat.com>
+
+ * pangoft2.pc.in (Cflags): Add @FREETYPE_CFLAGS@
+
+ * tests/Makefile.am (INCLUDES): Add XFT_CFLAGS.
+ gtk/Makefile.am (INCLUDES): Add back FREETYPE_CFLAGS.
+
Thu Jun 6 08:54:26 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Update the versioning to reflect '1.1.x'
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 198fc34e..a42ccbc4 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -26,6 +26,7 @@ INCLUDES = \
-DG_DISABLE_DEPRECATED \
$(XFT_CFLAGS) \
$(FONTCONFIG_CFLAGS) \
+ $(FREETYPE_CFLAGS) \
$(X_CFLAGS) \
-I$(top_srcdir)
diff --git a/pangoft2.pc.in b/pangoft2.pc.in
index e3bf16c0..13ace234 100644
--- a/pangoft2.pc.in
+++ b/pangoft2.pc.in
@@ -8,5 +8,5 @@ Description: Freetype 2.0 font support for Pango
Version: @VERSION@
Requires: pango
Libs: -L${libdir} -lpangoft2-@PANGO_API_VERSION@ @PKGCONFIG_FREETYPE_LIBS@
-Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@
+Cflags: -I${includedir}/pango-1.0 @FONTCONFIG_CFLAGS@ @FREETYPE_CFLAGS@
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 27f9331d..4614025c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,8 +27,10 @@ endif
INCLUDES = \
-I$(top_srcdir) \
$(GLIB_CFLAGS) \
- $(X_CFLAGS) \
+ $(XFT_CFLAGS) \
+ $(FONTCONFIG_CFLAGS) \
$(FREETYPE_CFLAGS) \
+ $(X_CFLAGS) \
$(X_DEFINES) \
$(XFT_DEFINES) \
$(FT2_DEFINES) \