Sun Nov 18 01:22:49 2018 UTC ()
Comment out LIBDPLIBS so that this can be built outside of the tree.


(uwe)
diff -r1.86 -r1.87 src/lib/libcurses/Makefile
cvs diff -r1.86 -r1.87 src/lib/libcurses/Makefile (expand / switch to unified diff)

--- src/lib/libcurses/Makefile 2018/10/25 10:36:56 1.86
+++ src/lib/libcurses/Makefile 2018/11/18 01:22:49 1.87
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.86 2018/10/25 10:36:56 uwe Exp $ 1# $NetBSD: Makefile,v 1.87 2018/11/18 01:22:49 uwe Exp $
2# @(#)Makefile 8.2 (Berkeley) 1/2/94 2# @(#)Makefile 8.2 (Berkeley) 1/2/94
3 3
4.include <bsd.own.mk> 4.include <bsd.own.mk>
5 5
6WARNS= 2 6WARNS= 2
7 7
8CPPFLAGS+=-I${.CURDIR} -I${NETBSDSRCDIR}/lib/libterminfo 8CPPFLAGS+=-I${.CURDIR} -I${NETBSDSRCDIR}/lib/libterminfo
9.if defined(DEBUG_CURSES) 9.if defined(DEBUG_CURSES)
10CPPFLAGS+=-g -DDEBUG 10CPPFLAGS+=-g -DDEBUG
11.endif 11.endif
12.if defined(SMALL) 12.if defined(SMALL)
13CPPFLAGS+=-DSMALL 13CPPFLAGS+=-DSMALL
14.endif 14.endif
@@ -29,27 +29,27 @@ SRCS= acs.c addbytes.c addch.c addchnstr @@ -29,27 +29,27 @@ SRCS= acs.c addbytes.c addch.c addchnstr
29MAN= curses.3 curses_addch.3 curses_addchstr.3 curses_addstr.3 \ 29MAN= curses.3 curses_addch.3 curses_addchstr.3 curses_addstr.3 \
30 curses_attributes.3 curses_background.3 curses_border.3 \ 30 curses_attributes.3 curses_background.3 curses_border.3 \
31 curses_chgat.3 curses_clear.3 curses_color.3 \ 31 curses_chgat.3 curses_clear.3 curses_color.3 \
32 curses_cursor.3 curses_default_colors.3 \ 32 curses_cursor.3 curses_default_colors.3 \
33 curses_delch.3 curses_deleteln.3 curses_echochar.3 curses_fileio.3 \ 33 curses_delch.3 curses_deleteln.3 curses_echochar.3 curses_fileio.3 \
34 curses_inch.3 curses_input.3 curses_insch.3 curses_insertln.3 \ 34 curses_inch.3 curses_input.3 curses_insch.3 curses_insertln.3 \
35 curses_insdelln.3 curses_keyname.3 curses_line.3 curses_pad.3 \ 35 curses_insdelln.3 curses_keyname.3 curses_line.3 curses_pad.3 \
36 curses_print.3 curses_refresh.3 curses_scanw.3 curses_screen.3 \ 36 curses_print.3 curses_refresh.3 curses_scanw.3 curses_screen.3 \
37 curses_scroll.3 curses_slk.3 curses_standout.3 curses_termcap.3 \ 37 curses_scroll.3 curses_slk.3 curses_standout.3 curses_termcap.3 \
38 curses_touch.3 curses_tty.3 curses_underscore.3 curses_window.3 38 curses_touch.3 curses_tty.3 curses_underscore.3 curses_window.3
39INCS= curses.h unctrl.h 39INCS= curses.h unctrl.h
40INCSDIR=/usr/include 40INCSDIR=/usr/include
41 41
42LIBDPLIBS+= terminfo ${.CURDIR}/../libterminfo 42# LIBDPLIBS+= terminfo ${.CURDIR}/../libterminfo
43 43
44.if !defined(DISABLE_WCHAR) 44.if !defined(DISABLE_WCHAR)
45CPPFLAGS+=-DHAVE_WCHAR 45CPPFLAGS+=-DHAVE_WCHAR
46SRCS+= cchar.c add_wch.c add_wchstr.c addwstr.c echo_wchar.c ins_wch.c \ 46SRCS+= cchar.c add_wch.c add_wchstr.c addwstr.c echo_wchar.c ins_wch.c \
47 insstr.c ins_wstr.c get_wch.c get_wstr.c in_wch.c in_wchstr.c \ 47 insstr.c ins_wstr.c get_wch.c get_wstr.c in_wch.c in_wchstr.c \
48 inwstr.c 48 inwstr.c
49.else 49.else
50CPPFLAGS+=-DDISABLE_WCHAR 50CPPFLAGS+=-DDISABLE_WCHAR
51.endif 51.endif
52 52
53MLINKS+= curses_addch.3 addch.3 curses_addchstr.3 addchnstr.3 \ 53MLINKS+= curses_addch.3 addch.3 curses_addchstr.3 addchnstr.3 \
54 curses_addchstr.3 addchstr.3 curses_addstr.3 addnstr.3 \ 54 curses_addchstr.3 addchstr.3 curses_addstr.3 addnstr.3 \
55 curses_addstr.3 addstr.3 \ 55 curses_addstr.3 addstr.3 \