summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin E Martin <kem@kem.org>2005-07-03 21:43:32 +0000
committerKevin E Martin <kem@kem.org>2005-07-03 21:43:32 +0000
commita0dc7d02bfcaea8c8a60dcbd00795999bd7f8e0a (patch)
tree87d4391d72de343e90e13aeea8e42988491e1420
parentb15a03de6b1897d7c8292e154d0e927f43e3cde0 (diff)
Undo previous change to add ${includedir}/X11/fonts to CFLAGS. Instead,
require all apps to include font headers explicitly -- i.e., from <X11/fonts/*.h> instead of "*.h" or <*.h>.
-rw-r--r--ChangeLog7
-rw-r--r--xfont.pc.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cf8c413..8f0626d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-07-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+ * xfont.pc.in:
+ Undo previous change to add ${includedir}/X11/fonts to CFLAGS.
+ Instead, require all apps to include font headers explicitly --
+ i.e., from <X11/fonts/*.h> instead of "*.h" or <*.h>.
+
+2005-07-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+
* src/Type1/Makefile.am:
* src/bitmap/Makefile.am:
* src/builtins/Makefile.am:
diff --git a/xfont.pc.in b/xfont.pc.in
index e1c4dd9..6b70a1b 100644
--- a/xfont.pc.in
+++ b/xfont.pc.in
@@ -10,5 +10,5 @@ freetypecflags=@FREETYPE_CFLAGS@
Name: Xfont
Description: X font Library
Version: @VERSION@
-Cflags: -I${includedir} -I${includedir}/X11/fonts ${freetypecflags}
+Cflags: -I${includedir} ${freetypecflags}
Libs: -L${libdir} -lXfont ${freetypelibs} ${mathlibs} ${zlibs}