diff options
| author | Kevin E Martin <kem@kem.org> | 2005-07-02 21:39:23 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-07-02 21:39:23 +0000 |
| commit | 69ee19fc4131ce168c9bad2602ff2da176a86715 (patch) | |
| tree | 961c35003a0d51f5f055989183634f9917c07831 | |
| parent | 0ea9f882abb9ad56de2bb8b569e21728e13a1ea7 (diff) | |
Make headers needed by bdftopcf public
Set CFLAGS to make public interface actually public
Fix distcheck problem
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | src/bitmap/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fontcache/Makefile.am | 2 | ||||
| -rw-r--r-- | xfont.pc.in | 2 |
5 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2005-07-02 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * Makefile.am: + * src/bitmap/Makefile.am: + Make headers needed by bdftopcf public + + * xfont.pc.in: + Set CFLAGS to make public interface actually public + + * src/fontcache/Makefile.am: + Fix distcheck problem + 2005-07-02 Keith Packard <keithp@keithp.com> * Makefile.am: diff --git a/Makefile.am b/Makefile.am index e4b4b63..d13645c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,6 +25,7 @@ SUBDIRS=src libXfontincludedir = $(includedir)/X11/fonts libXfontinclude_HEADERS = \ + include/X11/fonts/bdfint.h \ include/X11/fonts/bitmap.h \ include/X11/fonts/bufio.h \ include/X11/fonts/fntfil.h \ @@ -36,7 +37,8 @@ libXfontinclude_HEADERS = \ include/X11/fonts/fontmod.h \ include/X11/fonts/fontshow.h \ include/X11/fonts/fontutil.h \ - include/X11/fonts/fontxlfd.h + include/X11/fonts/fontxlfd.h \ + include/X11/fonts/pcf.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xfont.pc diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am index 3fd57c0..4276b24 100644 --- a/src/bitmap/Makefile.am +++ b/src/bitmap/Makefile.am @@ -4,7 +4,6 @@ INCLUDES = \ noinst_LTLIBRARIES = libbitmap.la libbitmap_la_SOURCES = \ - bdfint.h \ bdfread.c \ bdfutils.c \ bitmap.c \ @@ -12,7 +11,6 @@ libbitmap_la_SOURCES = \ bitmaputil.c \ bitscale.c \ fontink.c \ - pcf.h \ pcfread.c \ pcfwrite.c \ snfread.c \ diff --git a/src/fontcache/Makefile.am b/src/fontcache/Makefile.am index 7ade369..1928728 100644 --- a/src/fontcache/Makefile.am +++ b/src/fontcache/Makefile.am @@ -3,6 +3,6 @@ INCLUDES = \ -I${top_srcdir}/include/X11/fonts lib_LTLIBRARIES = libfontcache.la libfontcache_la_CFLAGS = $(FONTCACHEPROTO_CFLAGS) -libfontcache_la_SOURCES = fontcache.c fontcacheint.h fcqueue.h +libfontcache_la_SOURCES = fontcache.c fontcache.h fcqueue.h fontdir = $(includedir)/X11/fonts endif diff --git a/xfont.pc.in b/xfont.pc.in index 6b70a1b..e1c4dd9 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} ${freetypecflags} +Cflags: -I${includedir} -I${includedir}/X11/fonts ${freetypecflags} Libs: -L${libdir} -lXfont ${freetypelibs} ${mathlibs} ${zlibs} |