summaryrefslogtreecommitdiffstats
path: root/gnu
diff options
context:
space:
mode:
authorbrooks <brooks@FreeBSD.org>2014-07-17 18:24:34 +0000
committerbrooks <brooks@FreeBSD.org>2014-07-17 18:24:34 +0000
commitea5a037d1f7b17969046da0165700dcc51245472 (patch)
tree3ff2151befbc35e13a819af1c5dc8b2239bd1183 /gnu
parent1dcd5569710eaeea64703d6bb3affedc5cc74ce1 (diff)
downloadFreeBSD-src-ea5a037d1f7b17969046da0165700dcc51245472.zip
FreeBSD-src-ea5a037d1f7b17969046da0165700dcc51245472.tar.gz
Replace all uses of libncurses and libtermcap with their wide character
variants. This allows usable file system images (i.e. those with both a shell and an editor) to be created with only one copy of the curses library. Exp-run: antoine PR: 189842 Discussed with: bapt Sponsored by: DARPA, AFRL
Diffstat (limited to 'gnu')
-rw-r--r--gnu/lib/libreadline/readline/Makefile4
-rw-r--r--gnu/usr.bin/gdb/gdb/Makefile4
-rw-r--r--gnu/usr.bin/gdb/gdbtui/Makefile4
-rw-r--r--gnu/usr.bin/gdb/kgdb/Makefile4
-rw-r--r--gnu/usr.bin/texinfo/info/Makefile4
5 files changed, 10 insertions, 10 deletions
diff --git a/gnu/lib/libreadline/readline/Makefile b/gnu/lib/libreadline/readline/Makefile
index 6ebea3a..f09e943 100644
--- a/gnu/lib/libreadline/readline/Makefile
+++ b/gnu/lib/libreadline/readline/Makefile
@@ -23,7 +23,7 @@ ${.OBJDIR}/${_h}: ${SRCDIR}/${_h}
${INSTALL} ${.ALLSRC} ${.TARGET}
.endfor
-DPADD= ${LIBTERMCAP}
-LDADD= -ltermcap
+DPADD= ${LIBTERMCAPW}
+LDADD= -ltermcapw
.include <bsd.lib.mk>
diff --git a/gnu/usr.bin/gdb/gdb/Makefile b/gnu/usr.bin/gdb/gdb/Makefile
index 473ffa3..9da4da1 100644
--- a/gnu/usr.bin/gdb/gdb/Makefile
+++ b/gnu/usr.bin/gdb/gdb/Makefile
@@ -11,8 +11,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
# global symbols visible.
LDFLAGS+= -Wl,-E
-DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
-LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcap -lgnuregex
+DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
+LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex
NO_PIE= yes
diff --git a/gnu/usr.bin/gdb/gdbtui/Makefile b/gnu/usr.bin/gdb/gdbtui/Makefile
index 34946ea..8369b7f 100644
--- a/gnu/usr.bin/gdb/gdbtui/Makefile
+++ b/gnu/usr.bin/gdb/gdbtui/Makefile
@@ -12,8 +12,8 @@ GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
# global symbols visible.
LDFLAGS+= -Wl,-E
-DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} ${LIBGNUREGEX}
-LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcap -lgnuregex
+DPADD= ${GDBLIBS} ${BULIBS} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} ${LIBGNUREGEX}
+LDADD= ${GDBLIBS} ${BULIBS} -lm ${LIBREADLINE} -ltermcapw -lgnuregex
NO_PIE= yes
diff --git a/gnu/usr.bin/gdb/kgdb/Makefile b/gnu/usr.bin/gdb/kgdb/Makefile
index 7a7542a..bbc886b 100644
--- a/gnu/usr.bin/gdb/kgdb/Makefile
+++ b/gnu/usr.bin/gdb/kgdb/Makefile
@@ -8,9 +8,9 @@ BULIBS= ${OBJ_BU}/libbfd/libbfd.a ${OBJ_BU}/libopcodes/libopcodes.a \
${OBJ_BU}/libiberty/libiberty.a
GDBLIBS= ${OBJ_GDB}/libgdb/libgdb.a
-DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAP} \
+DPADD= ${GDBLIBS} ${BULIBS} ${LIBKVM} ${LIBM} ${LIBREADLINE} ${LIBTERMCAPW} \
${LIBGNUREGEX}
-LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LIBREADLINE} -ltermcap \
+LDADD= ${GDBLIBS} ${BULIBS} -lkvm${GDB_SUFFIX} -lm ${LIBREADLINE} -ltermcapw \
-lgnuregex
.if defined(GDB_CROSS_DEBUGGER)
diff --git a/gnu/usr.bin/texinfo/info/Makefile b/gnu/usr.bin/texinfo/info/Makefile
index a68a1c6..de95af6 100644
--- a/gnu/usr.bin/texinfo/info/Makefile
+++ b/gnu/usr.bin/texinfo/info/Makefile
@@ -10,8 +10,8 @@ SRCS= dir.c display.c doc.c dribble.c echo-area.c filesys.c \
CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
-DPADD= ${LIBTERMCAP} ${LIBTXI}
-LDADD= -ltermcap ${LIBTXI}
+DPADD= ${LIBTERMCAPW} ${LIBTXI}
+LDADD= -ltermcapw ${LIBTXI}
NO_PIE= yes
OpenPOWER on IntegriCloud