diff --git a/x11/tools/Makefile b/x11/tools/Makefile index 05b84339f2f2..d0a071c3e190 100644 --- a/x11/tools/Makefile +++ b/x11/tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/02/09 00:47:16 lukem Exp $ +# $NetBSD: Makefile,v 1.8 2004/03/06 02:55:20 rtr Exp $ # These are used by the 'includes' phase, # and can't assume that ${DESTDIR}${X11INCDIR} has been populated. @@ -7,7 +7,7 @@ SUBDIR= pswrap makestrs .WAIT # The rest of the tools can rely upon 'includes' # -SUBDIR+=bdftopcf fc-cache mkfontdir ucs2any mkg3states -SUBDIR+=makekeys gen_matypes .WAIT xkbcomp +SUBDIR+=bdftopcf fc-cache ucs2any mkg3states +SUBDIR+=makekeys mkfontscale gen_matypes .WAIT xkbcomp .include diff --git a/x11/tools/fc-cache/Makefile b/x11/tools/fc-cache/Makefile index 689e63c45442..15bf63b925b4 100644 --- a/x11/tools/fc-cache/Makefile +++ b/x11/tools/fc-cache/Makefile @@ -1,11 +1,12 @@ -# $NetBSD: Makefile,v 1.4 2004/01/15 13:47:05 dbj Exp $ +# $NetBSD: Makefile,v 1.5 2004/03/06 02:55:20 rtr Exp $ NOMAN= 1 .include HOSTPROG= fc-cache -FONTCONFIGSRC= ${X11SRCDIR.xc}/lib/fontconfig +.PATH: ${X11SRCDIR.xc}/extras/fontconfig/src +FONTCONFIGSRC= ${X11SRCDIR.xc}/extras/fontconfig FREETYPESRC= ${X11SRCDIR.xc}/extras/freetype2/src .PATH: ${FONTCONFIGSRC}/${HOSTPROG} @@ -21,6 +22,7 @@ SRCS+= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \ .PATH: ${FREETYPESRC}/bdf .PATH: ${FREETYPESRC}/cff .PATH: ${FREETYPESRC}/cid +.PATH: ${FREETYPESRC}/gzip .PATH: ${FREETYPESRC}/pcf .PATH: ${FREETYPESRC}/pfr .PATH: ${FREETYPESRC}/psaux @@ -36,7 +38,8 @@ SRCS+= fcatomic.c fcblanks.c fccache.c fccfg.c fccharset.c fcdbg.c \ SRCS+= autohint.c bdf.c cff.c ftbase.c ftbbox.c ftbdf.c ftdebug.c \ ftglyph.c ftinit.c ftmm.c ftsynth.c ftsystem.c fttype1.c \ ftxf86.c pcf.c pfr.c psaux.c pshinter.c psnames.c raster.c \ - sfnt.c smooth.c truetype.c type1.c type1cid.c type42.c winfnt.c + sfnt.c smooth.c truetype.c type1.c type1cid.c type42.c \ + winfnt.c ftgzip.c .PATH: ${X11SRCDIR.xc}/extras/expat/lib SRCS+= xmlparse.c xmlrole.c xmltok.c @@ -46,6 +49,7 @@ SRCS+= xmlparse.c xmlrole.c xmltok.c HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \ -I${DESTDIR}${X11INCDIR}/freetype2 \ -I${X11SRCDIR.xc}/lib/expat \ + -I${X11SRCDIR.xc}/extras/expat/lib \ -DFC_DEFAULT_FONTS='"${X11FONTDIR}/Type1"' -DHAVE_EXPAT \ ${EXPAT_FLAGS} diff --git a/x11/tools/mkfontdir/Makefile b/x11/tools/mkfontdir/Makefile deleted file mode 100644 index 554aefccc74b..000000000000 --- a/x11/tools/mkfontdir/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: Makefile,v 1.3 2003/09/30 06:41:31 lukem Exp $ - -NOMAN= 1 - -.include - -HOSTPROG= mkfontdir -.PATH: ${X11SRCDIR.xc}/programs/${HOSTPROG} - -SRCS= mkfontdir.c - -HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \ - -I${X11SRCDIR.xc}/include/fonts \ - -I${X11SRCDIR.xc}/lib/font/include \ - -I${X11SRCDIR.xc}/programs/Xserver/include \ - -DBDFFORMAT -DPCFFORMAT -DSNFFORMAT -DX_GZIP_FONT_COMPRESSION \ - -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" - -.PATH: ${X11SRCDIR.xc}/lib/font/bitmap -SRCS+= bdfread.c bdfutils.c bitmap.c bitmapfunc.c bitmaputil.c \ - bitscale.c fontink.c pcfread.c snfread.c - -.PATH: ${X11SRCDIR.xc}/lib/font/fontfile -SRCS+= bitsource.c bufio.c decompress.c defaults.c dirfile.c \ - encparse.c fileio.c fontdir.c fontenc.c fontfile.c \ - fontscale.c gunzip.c renderers.c - -.PATH: ${X11SRCDIR.xc}/lib/font/util -SRCS+= atom.c fontaccel.c fontnames.c fontutil.c fontxlfd.c \ - format.c miscutil.c private.c utilbitmap.c - -.PATH: ${X11SRCDIR.xc}/lib/font/stubs -SRCS+= regfpefunc.c - -LDADD+= -lm -lz - -.include -.include diff --git a/x11/tools/mkfontdir/Makefile.mkfontdir b/x11/tools/mkfontdir/Makefile.mkfontdir deleted file mode 100644 index e44328ac34c2..000000000000 --- a/x11/tools/mkfontdir/Makefile.mkfontdir +++ /dev/null @@ -1,7 +0,0 @@ -# $NetBSD: Makefile.mkfontdir,v 1.1 2004/02/09 04:30:05 lukem Exp $ - -MKFONTDIRDIR!= cd ${NETBSDSRCDIR}/x11/tools/mkfontdir && ${PRINTOBJDIR} -MKFONTDIR= ${MKFONTDIRDIR}/mkfontdir - -${MKFONTDIR}: - (cd ${NETBSDSRCDIR}/x11/tools/mkfontdir && ${MAKE}) diff --git a/x11/tools/mkfontscale/Makefile b/x11/tools/mkfontscale/Makefile new file mode 100644 index 000000000000..dbd1fc300ad5 --- /dev/null +++ b/x11/tools/mkfontscale/Makefile @@ -0,0 +1,63 @@ +# $NetBSD: Makefile,v 1.1 2004/03/06 02:55:20 rtr Exp $ + +NOMAN= 1 + +.include + +HOSTPROG= mkfontscale + +.PATH: ${X11SRCDIR.xc}/programs/mkfontscale +SRCS.mkfontscale= mkfontscale.c list.c hash.c ident.c + +FREETYPETOP= ${X11SRCDIR.xc}/extras/freetype2 +FREETYPESRC= ${FREETYPETOP}/src + +#.PATH: ${FREETYPESRC} +.PATH: ${FREETYPESRC}/autohint +.PATH: ${FREETYPESRC}/base +.PATH: ${FREETYPESRC}/bdf +.PATH: ${FREETYPESRC}/cff +.PATH: ${FREETYPESRC}/cid +.PATH: ${FREETYPESRC}/gzip +.PATH: ${FREETYPESRC}/pcf +.PATH: ${FREETYPESRC}/pfr +.PATH: ${FREETYPESRC}/psaux +.PATH: ${FREETYPESRC}/pshinter +.PATH: ${FREETYPESRC}/psnames +.PATH: ${FREETYPESRC}/raster +.PATH: ${FREETYPESRC}/sfnt +.PATH: ${FREETYPESRC}/smooth +.PATH: ${FREETYPESRC}/truetype +.PATH: ${FREETYPESRC}/type1 +.PATH: ${FREETYPESRC}/type42 +.PATH: ${FREETYPESRC}/winfonts +SRCS.freetype= ftapi.c ftbase.c ftbbox.c ftbdf.c ftdebug.c ftglyph.c \ + ftinit.c ftmm.c ftpfr.c ftstroker.c ftsynth.c ftsystem.c \ + fttype1.c ftwinfnt.c ftxf86.c autohint.c bdf.c cff.c \ + type1cid.c ftgzip.c pcf.c pfr.c psaux.c pshinter.c psnames.c \ + raster.c sfnt.c smooth.c truetype.c type1.c type42.c winfnt.c + +.PATH: ${X11SRCDIR.xc}/lib/font/fontfile +.PATH: ${X11SRCDIR.xc}/xc/lib/font/include +SRCS.fontenc= encparse.c fontenc.c + +# XXX we should be declaring some of these on a per basis but +# XXX HOST_CPPFLAGS doesn't support it we could CPPFLAGS= and then +# XXX use CPPFLAGS but thats lame +HOST_CPPFLAGS+= -DFONTENC_NO_LIBFONT \ + ${X11FLAGS.THREADLIB} \ + -DFREETYPE2 -DXFREE86_FT2 \ + -DFONT_ENCODINGS_DIRECTORY=\"${X11FONTDIR}/encodings/encodings.dir\" +HOST_CPPFLAGS+= -I${DESTDIR}${X11INCDIR} \ + -I${DESTDIR}${X11INCDIR}/freetype2 \ + -I${DESTDIR}${X11INCDIR}/X11/fonts \ + -I${X11SRCDIR.xc}/lib/font/include \ + -I${X11SRCDIR.xc}/include/fonts + +SRCS= ${SRCS.mkfontscale} ${SRCS.freetype} ${SRCS.fontenc} + +LDADD= -lz +DPADD= ${LIBZ} + +.include +.include