Wed Mar 14 06:06:40 2018 UTC ()
build Tekparse.hin VTparse.hin normally.


(mrg)
diff -r1.15 -r1.16 src/external/mit/xorg/bin/xterm/Makefile
cvs diff -r1.15 -r1.16 src/external/mit/xorg/bin/xterm/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/bin/xterm/Makefile 2015/07/23 09:37:59 1.15
+++ src/external/mit/xorg/bin/xterm/Makefile 2018/03/14 06:06:40 1.16
@@ -1,28 +1,29 @@ @@ -1,28 +1,29 @@
1# $NetBSD: Makefile,v 1.15 2015/07/23 09:37:59 mrg Exp $ 1# $NetBSD: Makefile,v 1.16 2018/03/14 06:06:40 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5PROG= xterm 5PROG= xterm
6SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \ 6SRCS= button.c charproc.c charsets.c cursor.c data.c doublechr.c \
7 fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \ 7 fontutils.c input.c linedata.c menu.c misc.c print.c ptydata.c \
8 screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \ 8 screen.c scrollback.c scrollbar.c tabs.c util.c xstrings.c \
9 TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \ 9 TekPrsTbl.c Tekproc.c VTPrsTbl.c main.c charclass.c precompose.c \
10 wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c 10 wcwidth.c xutf8.c cachedGCs.c xtermcap.c version.c
11 11
12# graphics_regis.c graphics_sixel.c 12# graphics_regis.c graphics_sixel.c
13# xterm.appdata.xml 13# xterm.appdata.xml
14 14
15CPPFLAGS+= -I${X11SRCDIR.${PROG}} \ 15CPPFLAGS+= -I. \
 16 -I${X11SRCDIR.${PROG}} \
16 -I${X11SRCDIR.${PROG}}/../include \ 17 -I${X11SRCDIR.${PROG}}/../include \
17 -I${DESTDIR}${X11INCDIR}/freetype2 \ 18 -I${DESTDIR}${X11INCDIR}/freetype2 \
18 -DPROJECTROOT=${X11ROOTDIR} \ 19 -DPROJECTROOT=${X11ROOTDIR} \
19 -DHAVE_CONFIG_H \ 20 -DHAVE_CONFIG_H \
20 -D_REENTRANT \ 21 -D_REENTRANT \
21 ${X11FLAGS.VERSION} 22 ${X11FLAGS.VERSION}
22 23
23CWARNFLAGS.clang+= -Wno-empty-body 24CWARNFLAGS.clang+= -Wno-empty-body
24 25
25APPDEFS=XTerm.ad XTerm-color.ad 26APPDEFS=XTerm.ad XTerm-color.ad
26 27
27BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad 28BUILDSYMLINKS= XTerm-col.ad XTerm-color.ad
28 29
@@ -34,18 +35,24 @@ DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIB @@ -34,18 +35,24 @@ DPADD+= ${LIBXFT} ${LIBFONTCONFIG} ${LIB
34LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama 35LDADD+= -lXaw -lXmu -lXt -lSM -lICE -lXinerama
35DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA} 36DPADD+= ${LIBXAW} ${LIBXMU} ${LIBXT} ${LIBSM} ${LIBICE} ${LIBXINERAMA}
36LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil 37LDADD+= -lXpm -lXext -lX11 -lcurses -lterminfo -lutil
37DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL} 38DPADD+= ${LIBXPM} ${LIBXEXT} ${LIBX11} ${LIBCURSES} ${LIBTERMINFO} ${LIBUTIL}
38 39
39SUBDIR= resize uxterm 40SUBDIR= resize uxterm
40 41
41.PATH: ${X11SRCDIR.${PROG}} 42.PATH: ${X11SRCDIR.${PROG}}
42 43
43COPTS.input.c+= -Wno-error # uses XKeycodeToKeysym 44COPTS.input.c+= -Wno-error # uses XKeycodeToKeysym
44 45
45# XXXMRG should probably build builtin_icons.h 46# XXXMRG should probably build builtin_icons.h
46 47
 48.SUFFIXES: .def .hin
 49.def.hin:
 50 ${TOOL_AWK} '/^CASE_/{printf "#define %s %d\n", $$1, n++}' < $< >$@
 51DPSRCS+= Tekparse.hin VTparse.hin
 52CLEANFILES+= Tekparse.hin VTparse.hin
 53
47.include "Makefile.inc" 54.include "Makefile.inc"
48 55
49.include <bsd.x11.mk> 56.include <bsd.x11.mk>
50.include <bsd.prog.mk> 57.include <bsd.prog.mk>
51.include <bsd.subdir.mk> 58.include <bsd.subdir.mk>