diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-27 16:09:14 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-27 16:09:14 +0000 |
| commit | 4534fa0c8adb77b7db47101318e0e863edb186ce (patch) | |
| tree | b0ace95925e12601679ab68f6a70370e3bcfc158 /src/fontfile | |
| parent | fda7215c0783ad170eb14f7dda078fac3f134470 (diff) | |
- Remove fontenc from Xfont
- Add a dependency from Xfont on libfontenc
- Add build system for lib/fontenc
- xc/lib/font: Change #include "fontenc.h" to #include
<X11/fonts/fontenc.h> in some places.
- Remove dpsinfo and dpsexec from the app section of symlink.sh
- Fix xp.pc.in to add XPRINT_LIBS/CFLAGS instead of X_LIBS/CFLAGS
Diffstat (limited to 'src/fontfile')
| -rw-r--r-- | src/fontfile/Makefile.am | 3 | ||||
| -rw-r--r-- | src/fontfile/fontencc.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/src/fontfile/Makefile.am b/src/fontfile/Makefile.am index 1ba16b9..6e70425 100644 --- a/src/fontfile/Makefile.am +++ b/src/fontfile/Makefile.am @@ -16,13 +16,10 @@ libfontfile_la_SOURCES = \ decompress.c \ defaults.c \ dirfile.c \ - encparse.c \ ffcheck.c \ fileio.c \ filewr.c \ fontdir.c \ - fontenc.c \ - fontencI.h \ fontencc.c \ fontfile.c \ fontscale.c \ diff --git a/src/fontfile/fontencc.c b/src/fontfile/fontencc.c index cc77748..3e02582 100644 --- a/src/fontfile/fontencc.c +++ b/src/fontfile/fontencc.c @@ -28,7 +28,7 @@ THE SOFTWARE. *not* provide source compatibility, as many of the data structures now have different names. */ -#include "fontenc.h" +#include <X11/fonts/fontenc.h> #include "fontencc.h" extern void ErrorF(const char *f, ...); |