diff options
| author | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-16 20:50:12 +0000 |
|---|---|---|
| committer | Søren Sandmann Pedersen <sandmann@daimi.au.dk> | 2005-06-16 20:50:12 +0000 |
| commit | b96f539005da57273dc7e2bee13651de4eedf087 (patch) | |
| tree | d56d61c92d58ede161b79f0de9fa51ad679bba81 /src | |
| parent | 01c8cee1736be252348306412ab56b2e03bf2678 (diff) | |
Add Type1 subdirectory to lib/Xfonts, update build system accordingly.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Type1/Makefile.am | 55 | ||||
| -rw-r--r-- | src/Type1/objects.h | 4 | ||||
| -rw-r--r-- | src/Type1/t1funcs.c | 2 | ||||
| -rw-r--r-- | src/Type1/t1info.c | 2 | ||||
| -rw-r--r-- | src/Type1/t1io.c | 3 |
5 files changed, 60 insertions, 6 deletions
diff --git a/src/Type1/Makefile.am b/src/Type1/Makefile.am new file mode 100644 index 0000000..eada3eb --- /dev/null +++ b/src/Type1/Makefile.am @@ -0,0 +1,55 @@ +INCLUDES = \ + -I${top_srcdir}/include/X11/fonts + +noinst_LTLIBRARIES = libtype1.la + +libtype1_la_SOURCES = \ + afm.c \ + AFM.h \ + arith.c \ + arith.h \ + blues.h \ + cidchar.c \ + cluts.h \ + curves.c \ + curves.h \ + digit.h \ + fontfcn.c \ + fontfcn.h \ + fonts.h \ + hdigit.h \ + hints.c \ + hints.h \ + lines.c \ + lines.h \ + objects.c \ + objects.h \ + paths.c \ + paths.h \ + pictures.h \ + range.h \ + regions.c \ + regions.h \ + scanfont.c \ + spaces.c \ + spaces.h \ + strokes.h \ + t1funcs.c \ + t1hdigit.h \ + t1imager.h \ + t1info.c \ + t1intf.h \ + t1io.c \ + t1malloc.c \ + t1snap.c \ + t1stdio.h \ + t1stub.c \ + t1unicode.c \ + t1unicode.h \ + token.c \ + token.h \ + tokst.h \ + trig.h \ + type1.c \ + util.c \ + util.h diff --git a/src/Type1/objects.h b/src/Type1/objects.h index 59a22d6..348297b 100644 --- a/src/Type1/objects.h +++ b/src/Type1/objects.h @@ -47,8 +47,8 @@ /*SHARED*/ /*END SHARED*/ -#include <Xdefs.h> -#include <Xfuncproto.h> +#include <X11/Xdefs.h> +#include <X11/Xfuncproto.h> #ifndef FONTMODULE #include <stdlib.h> #endif diff --git a/src/Type1/t1funcs.c b/src/Type1/t1funcs.c index 076c00b..ef99b93 100644 --- a/src/Type1/t1funcs.c +++ b/src/Type1/t1funcs.c @@ -132,7 +132,7 @@ from The Open Group. #include "fntfilst.h" #include "fontutil.h" -#include "FSproto.h" +#include <X11/fonts/FSproto.h> #include "fontenc.h" #include "t1unicode.h" diff --git a/src/Type1/t1info.c b/src/Type1/t1info.c index f6a5012..aa00aca 100644 --- a/src/Type1/t1info.c +++ b/src/Type1/t1info.c @@ -111,7 +111,7 @@ from The Open Group. #else #include "xf86_ansic.h" #endif -#include "FSproto.h" +#include <X11/fonts/FSproto.h> #ifdef BUILDCID #ifndef FONTMODULE diff --git a/src/Type1/t1io.c b/src/Type1/t1io.c index 0843ae1..ac09b54 100644 --- a/src/Type1/t1io.c +++ b/src/Type1/t1io.c @@ -58,7 +58,6 @@ #include <fcntl.h> #include <unistd.h> #else -#include "Xdefs.h" /* Bool declaration */ #include "Xmd.h" /* INT32 declaration */ #include "xf86_ansic.h" #endif @@ -67,7 +66,7 @@ #ifdef WIN32 #include <X11/Xw32defs.h> #endif -#include "Xdefs.h" +#include <X11/Xdefs.h> /* Constants and variables used in the decryption */ #define c1 ((unsigned short)52845) |