diff options
| author | Kevin E Martin <kem@kem.org> | 2005-07-03 16:10:05 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-07-03 16:10:05 +0000 |
| commit | bf4070d02196cab1de62d5fe19be9a1aa74a87c7 (patch) | |
| tree | 7c1389bfc285e6dbf48eec9cabc39b72b37bdaa6 | |
| parent | 932edb23b47440397447265bf72ad7932fd80070 (diff) | |
Change include dir now that public headers are referenced by
<X11/fonts/*.h>
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | src/Type1/Makefile.am | 2 | ||||
| -rw-r--r-- | src/bitmap/Makefile.am | 2 | ||||
| -rw-r--r-- | src/builtins/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fc/Makefile.am | 4 | ||||
| -rw-r--r-- | src/fontcache/Makefile.am | 2 | ||||
| -rw-r--r-- | src/fontfile/Makefile.am | 2 | ||||
| -rw-r--r-- | src/stubs/Makefile.am | 2 | ||||
| -rw-r--r-- | src/util/Makefile.am | 2 |
9 files changed, 22 insertions, 9 deletions
@@ -1,3 +1,16 @@ +2005-07-03 Kevin E. Martin <kem-at-freedesktop-dot-org> + + * src/Type1/Makefile.am: + * src/bitmap/Makefile.am: + * src/builtins/Makefile.am: + * src/fc/Makefile.am: + * src/fontcache/Makefile.am: + * src/fontfile/Makefile.am: + * src/stubs/Makefile.am: + * src/util/Makefile.am: + Change include dir now that public headers are referenced + by <X11/fonts/*.h> + 2005-07-02 Keith Packard <keithp@keithp.com> * .cvsignore: diff --git a/src/Type1/Makefile.am b/src/Type1/Makefile.am index eada3eb..105bf24 100644 --- a/src/Type1/Makefile.am +++ b/src/Type1/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = \ - -I${top_srcdir}/include/X11/fonts + -I${top_srcdir}/include noinst_LTLIBRARIES = libtype1.la diff --git a/src/bitmap/Makefile.am b/src/bitmap/Makefile.am index 4276b24..e3ef040 100644 --- a/src/bitmap/Makefile.am +++ b/src/bitmap/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = \ - -I${top_srcdir}/include/X11/fonts + -I${top_srcdir}/include noinst_LTLIBRARIES = libbitmap.la diff --git a/src/builtins/Makefile.am b/src/builtins/Makefile.am index f7041e0..dffc876 100644 --- a/src/builtins/Makefile.am +++ b/src/builtins/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = \ - -I${top_srcdir}/include/X11/fonts \ + -I${top_srcdir}/include \ -I${top_srcdir}/src/bitmap noinst_LTLIBRARIES = libbuiltins.la diff --git a/src/fc/Makefile.am b/src/fc/Makefile.am index 512eea1..120fbeb 100644 --- a/src/fc/Makefile.am +++ b/src/fc/Makefile.am @@ -1,5 +1,5 @@ -INCLUDES = \ - -I${top_srcdir}/include/X11/fonts +INCLUDES = \ + -I${top_srcdir}/include noinst_LTLIBRARIES = libfc.la diff --git a/src/fontcache/Makefile.am b/src/fontcache/Makefile.am index 1928728..111ba7d 100644 --- a/src/fontcache/Makefile.am +++ b/src/fontcache/Makefile.am @@ -1,6 +1,6 @@ if XFONT_FONTCACHE INCLUDES = \ - -I${top_srcdir}/include/X11/fonts + -I${top_srcdir}/include lib_LTLIBRARIES = libfontcache.la libfontcache_la_CFLAGS = $(FONTCACHEPROTO_CFLAGS) libfontcache_la_SOURCES = fontcache.c fontcache.h fcqueue.h diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am index 6e70425..01c7b13 100644 --- a/src/fontfile/Makefile.am +++ b/src/fontfile/Makefile.am @@ -2,7 +2,7 @@ FONTDIR=${libdir}/X11/fonts FONTENCDEFS = -DFONT_ENCODINGS_DIRECTORY=\"$(FONTDIR)/encodings/encodings.dir\" INCLUDES = \ - -I${top_srcdir}/include/X11/fonts \ + -I${top_srcdir}/include \ $(FONTENCDEFS) noinst_LTLIBRARIES = libfontfile.la diff --git a/src/stubs/Makefile.am b/src/stubs/Makefile.am index a3f0198..d9f4942 100644 --- a/src/stubs/Makefile.am +++ b/src/stubs/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = \ - -I${top_srcdir}/include/X11/fonts + -I${top_srcdir}/include noinst_LTLIBRARIES = libstubs.la diff --git a/src/util/Makefile.am b/src/util/Makefile.am index 97377ba..f9010d6 100644 --- a/src/util/Makefile.am +++ b/src/util/Makefile.am @@ -1,5 +1,5 @@ INCLUDES = \ - -I${top_srcdir}/include/X11/fonts + -I${top_srcdir}/include noinst_LTLIBRARIES = libutil.la |