Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

consistently provide a tools/<tool>/Makefile.<tool> for inclusion 

wherever the appropriate definitions are used throughout the tree
This commit is contained in:
lukem 2004-02-09 04:30:05 +00:00
parent dfbe2402b8
commit d8b3c89d68
16 changed files with 75 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x11/bin/xkbcomp/Makefile.xkbcomp
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.xkbcomp,v 1.2 2003/11/08 13:57:29 lukem Exp $
# $NetBSD: Makefile.xkbcomp,v 1.3 2004/02/09 04:30:05 lukem Exp $
XKBDISTDIR= ${X11SRCDIR.xc}/programs/xkbcomp/${XKBNAME}
@ -12,8 +12,7 @@ FILES+= ${XKBNAME}.dir
FILESDIR_${XKBNAME}.dir=${X11LIBDIR}/xkb
CLEANFILES+= ${XKBNAME}.dir
XKBCOMPDIR!= cd ${NETBSDSRCDIR}/x11/tools/xkbcomp && ${PRINTOBJDIR}
XKBCOMP= ${XKBCOMPDIR}/xkbcomp
.include "${NETBSDSRCDIR}/x11/tools/xkbcomp/Makefile.xkbcomp"
${XKBNAME}.dir:
${_MKTARGET_CREATE}

13
x11/lib/OSmesa/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2004/02/07 05:47:19 rtr Exp $
# $NetBSD: Makefile,v 1.10 2004/02/09 04:30:05 lukem Exp $
NOLINT= 1 # XTODO: 3dnow.ln barfs on src/math/m_vertices.h
@ -70,17 +70,12 @@ COMPILE.S= ${COMPILE.s} # XXX don't want -traditional-cpp
AFLAGS+= -DUSE_GAS -I. -I${X11SRCDIR.xc}/extras/Mesa/src/SPARC
.endif
.include "${NETBSDSRCDIR}/x11/tools/gen_matypes/Makefile.gen_matypes"
GENMATYPESDIR!= cd ${NETBSDSRCDIR}/x11/tools/gen_matypes && ${PRINTOBJDIR}
GENMATYPES= ${GENMATYPESDIR}/gen_matypes
${GENMATYPES}:
(cd ${NETBSDSRCDIR}/x11/tools/gen_matypes && ${MAKE})
matypes.h: ${GENMATYPES}
matypes.h: ${GEN_MATYPES}
${_MKTARGET_CREATE}
rm -f ${.TARGET}
${GENMATYPES} > ${.TARGET}
${GEN_MATYPES} > ${.TARGET}
CLEANFILES+= matypes.h
DPSRCS+= matypes.h

8
x11/lib/Xt/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2004/02/08 22:13:10 lukem Exp $
# $NetBSD: Makefile,v 1.10 2004/02/09 04:30:05 lukem Exp $
.include <bsd.own.mk>
@ -32,11 +32,7 @@ CPPFLAGS.TMkey.c= -DXKB
LDADD+= -lX11 -lSM -lICE
DPADD+= ${LIBX11} ${LIBSM} ${LIBICE}
MAKESTRSDIR!= cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${PRINTOBJDIR}
MAKESTRS= ${MAKESTRSDIR}/makestrs
${MAKESTRS}:
(cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${MAKE})
.include "${NETBSDSRCDIR}/x11/tools/makestrs/Makefile.makestrs"
STRINGS_FILES= StringDefs.c StringDefs.h Shell.h
STRINGS_TMPLS= util/StrDefs.ct util/StrDefs.ht util/Shell.ht

5
x11/lib/lbxutil/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2003/12/20 12:56:00 rtr Exp $
# $NetBSD: Makefile,v 1.6 2004/02/09 04:30:05 lukem Exp $
NOPIC= 1
@ -20,8 +20,7 @@ CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/X11 \
-I${X11SRCDIR.xc}/programs/Xserver/include \
-I.
MKG3STATESDIR!= cd ${NETBSDSRCDIR}/x11/tools/mkg3states && ${PRINTOBJDIR}
MKG3STATES= ${MKG3STATESDIR}/mkg3states
.include "${NETBSDSRCDIR}/x11/tools/mkg3states/Makefile.mkg3states"
g3states.h:
${_MKTARGET_CREATE}

5
x11/share/fonts/Makefile
View File

@ -1,12 +1,11 @@
# $NetBSD: Makefile,v 1.3 2003/11/08 13:57:30 lukem Exp $
# $NetBSD: Makefile,v 1.4 2004/02/09 04:30:05 lukem Exp $
.include <bsd.own.mk>
SUBDIR= util encodings .WAIT
SUBDIR+=bdf local scaled
FCCACHEDIR!= cd ${NETBSDSRCDIR}/x11/tools/fc-cache && ${PRINTOBJDIR}
FCCACHE= ${FCCACHEDIR}/fc-cache
.include "${NETBSDSRCDIR}/x11/tools/fc-cache/Makefile.fc-cache"
afterinstall:
${_MKMSG_CREATE} ${DESTDIR}${X11FONTDIR}/fonts.cache-1

5
x11/share/fonts/Makefile.mkfontdir
View File

@ -1,10 +1,9 @@
# $NetBSD: Makefile.mkfontdir,v 1.4 2003/11/08 13:57:30 lukem Exp $
# $NetBSD: Makefile.mkfontdir,v 1.5 2004/02/09 04:30:05 lukem Exp $
# Note: needs "install" run in ./encodings first
#
MKFONTDIRDIR!= cd ${NETBSDSRCDIR}/x11/tools/mkfontdir && ${PRINTOBJDIR}
MKFONTDIR= ${MKFONTDIRDIR}/mkfontdir
.include "${NETBSDSRCDIR}/x11/tools/mkfontdir/Makefile.mkfontdir"
afterinstall:
${_MKMSG_CREATE} ${DESTDIR}${FILESDIR}/fonts.dir

10
x11/share/fonts/bdf/Makefile.bdf
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.bdf,v 1.3 2003/11/08 13:57:30 lukem Exp $
# $NetBSD: Makefile.bdf,v 1.4 2004/02/09 04:30:05 lukem Exp $
FILESDIR= ${X11FONTDIR}/${FONTSUBDIR}
.PATH: ${X11SRCDIR.xc}/fonts/bdf/${FONTSUBDIR}
@ -6,12 +6,8 @@ FILESDIR= ${X11FONTDIR}/${FONTSUBDIR}
FONTSUFFIX= .gz
FONTGZIP= | gzip ${GZIPLEVEL:U-9} -cf
BDFTOPCFDIR!= cd ${NETBSDSRCDIR}/x11/tools/bdftopcf && ${PRINTOBJDIR}
BDFTOPCF= ${BDFTOPCFDIR}/bdftopcf
UCS2ANYDIR!= cd ${NETBSDSRCDIR}/x11/tools/ucs2any && ${PRINTOBJDIR}
UCS2ANY= ${UCS2ANYDIR}/ucs2any
.include "${NETBSDSRCDIR}/x11/tools/bdftopcf/Makefile.bdftopcf"
.include "${NETBSDSRCDIR}/x11/tools/ucs2any/Makefile.ucs2any"
.for _F _M in ${UCSFILES} # {
${_F}-${_M}.bdf: ${_F}.bdf

6
x11/share/fonts/encodings/Makefile.enc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.enc,v 1.4 2003/11/08 13:57:30 lukem Exp $
# $NetBSD: Makefile.enc,v 1.5 2004/02/09 04:30:05 lukem Exp $
FILESDIR= ${X11FONTDIR}/${ENCDIR}
.PATH: ${X11SRCDIR.xc}/fonts/${ENCDIR}
@ -16,9 +16,7 @@ CLEANFILES+= ${GZFILES:S/.gz$/.gz.tmp/}
realall: ${FILES}
MKFONTDIRDIR!= cd ${NETBSDSRCDIR}/x11/tools/mkfontdir && ${PRINTOBJDIR}
MKFONTDIR= ${MKFONTDIRDIR}/mkfontdir
.include "${NETBSDSRCDIR}/x11/tools/mkfontdir/Makefile.mkfontdir"
afterinstall:
${_MKMSG_CREATE} ${DESTDIR}${FILESDIR}/encodings.dir

7
x11/tools/bdftopcf/Makefile.bdftopcf Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.bdftopcf,v 1.1 2004/02/09 04:30:05 lukem Exp $
BDFTOPCFDIR!= cd ${NETBSDSRCDIR}/x11/tools/bdftopcf && ${PRINTOBJDIR}
BDFTOPCF= ${BDFTOPCFDIR}/bdftopcf
${BDFTOPCF}:
(cd ${NETBSDSRCDIR}/x11/tools/bdftopcf && ${MAKE})

7
x11/tools/fc-cache/Makefile.fc-cache Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.fc-cache,v 1.1 2004/02/09 04:30:05 lukem Exp $
FCCACHEDIR!= cd ${NETBSDSRCDIR}/x11/tools/fc-cache && ${PRINTOBJDIR}
FCCACHE= ${FCCACHEDIR}/fc-cache
${FCCACHE}:
(cd ${NETBSDSRCDIR}/x11/tools/fc-cache && ${MAKE})

7
x11/tools/gen_matypes/Makefile.gen_matypes Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.gen_matypes,v 1.1 2004/02/09 04:30:05 lukem Exp $
GEN_MATYPESDIR!=cd ${NETBSDSRCDIR}/x11/tools/gen_matypes && ${PRINTOBJDIR}
GEN_MATYPES= ${GEN_MATYPESDIR}/gen_matypes
${GEN_MATYPES}:
(cd ${NETBSDSRCDIR}/x11/tools/gen_matypes && ${MAKE})

7
x11/tools/makestrs/Makefile.makestrs Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.makestrs,v 1.1 2004/02/09 04:30:05 lukem Exp $
MAKESTRSDIR!= cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${PRINTOBJDIR}
MAKESTRS= ${MAKESTRSDIR}/makestrs
${MAKESTRS}:
(cd ${NETBSDSRCDIR}/x11/tools/makestrs && ${MAKE})

7
x11/tools/mkfontdir/Makefile.mkfontdir Normal file
View File

@ -0,0 +1,7 @@
# $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})

7
x11/tools/mkg3states/Makefile.mkg3states Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.mkg3states,v 1.1 2004/02/09 04:30:05 lukem Exp $
MKG3STATESDIR!= cd ${NETBSDSRCDIR}/x11/tools/mkg3states && ${PRINTOBJDIR}
MKG3STATES= ${MKG3STATESDIR}/mkg3states
${MKG3STATES}:
(cd ${NETBSDSRCDIR}/x11/tools/mkg3states && ${MAKE})

7
x11/tools/ucs2any/Makefile.ucs2any Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.ucs2any,v 1.1 2004/02/09 04:30:05 lukem Exp $
UCS2ANYDIR!= cd ${NETBSDSRCDIR}/x11/tools/ucs2any && ${PRINTOBJDIR}
UCS2ANY= ${UCS2ANYDIR}/ucs2any
${UCS2ANY}:
(cd ${NETBSDSRCDIR}/x11/tools/ucs2any && ${MAKE})

7
x11/tools/xkbcomp/Makefile.xkbcomp Normal file
View File

@ -0,0 +1,7 @@
# $NetBSD: Makefile.xkbcomp,v 1.1 2004/02/09 04:30:05 lukem Exp $
XKBCOMPDIR!= cd ${NETBSDSRCDIR}/x11/tools/xkbcomp && ${PRINTOBJDIR}
XKBCOMP= ${XKBCOMPDIR}/xkbcomp
${XKBCOMP}:
(cd ${NETBSDSRCDIR}/x11/tools/xkbcomp && ${MAKE})