diff options
| -rw-r--r-- | app/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/Makefile b/app/Makefile index 693994dee..7a01447fe 100644 --- a/app/Makefile +++ b/app/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.8 2007/04/27 18:27:54 matthieu Exp $ +# $OpenBSD: Makefile,v 1.9 2007/05/09 06:19:30 matthieu Exp $ .if ${MACHINE} != landisk MKFONTSCALE= mkfontscale @@ -10,8 +10,8 @@ SUBDIR= bdftopcf $(MKFONTSCALE) mkfontdir \ proxymngr rgb rstart scripts sessreg setxkbmap showfont \ smproxy twm viewres x11perf xauth xbiff xcalc \ xclipboard xclock xcmsdb xconsole \ - xdm xdpyinfo xdriinfo xedit xev xeyes xf86dga \ - xfd xfindproxy xfontsel xfs xfsinfo xfwp xgamma xgc xhost \ + xdm xdpyinfo xedit xev xeyes xf86dga \ + xfd xfindproxy xfontsel xfsinfo xfwp xgamma xgc xhost \ xinit xkbcomp xkbevd xkbprint xkbutils xkill xload xlogo \ xlsatoms xlsclients xlsfonts xmag xman xmessage \ xmodmap xmore xphelloworld xplsprinters xpr xprehashprinterlist \ @@ -19,8 +19,15 @@ SUBDIR= bdftopcf $(MKFONTSCALE) mkfontdir \ xsetroot xsm xstdcmap xtrap xvidtune xvinfo xwd xwininfo \ xwud +# Font server doesn't link on architectures with static only libraries +.if ${MACHINE} != landisk && ${MACHINE} != "vax" +SUBDIR += xfs +.endif + # GL -SUBDIR += glxgears glxinfo +.if ${MACHINE} != "sgi" && ${MACHINE} != "vax" +SUBDIR += xdriinfo glxgears glxinfo +.endif # extras SUBDIR += cwm fvwm ssh-askpass xterm xidle xlockmore xsystrace xvctl |