Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src When using -lcurses, you also need -lterminfo.



details:   https://anonhg.NetBSD.org/src/rev/995d5aff18b3
branches:  trunk
changeset: 751528:995d5aff18b3
user:      he <he%NetBSD.org@localhost>
date:      Sat Feb 06 23:45:24 2010 +0000

description:
When using -lcurses, you also need -lterminfo.
This fixes the build for sun2, and also builds with LDSTATIC=-static,
since archive libraries don't record inter-library dependencies.

diffstat:

 bin/sh/Makefile                    |  6 +++---
 games/atc/Makefile                 |  6 +++---
 games/battlestar/Makefile          |  6 +++---
 games/boggle/boggle/Makefile       |  6 +++---
 games/canfield/canfield/Makefile   |  6 +++---
 games/cribbage/Makefile            |  6 +++---
 games/gomoku/Makefile              |  6 +++---
 games/hangman/Makefile             |  6 +++---
 games/hunt/hunt/Makefile           |  6 +++---
 games/mille/Makefile               |  6 +++---
 games/phantasia/Makefile           |  6 +++---
 games/rain/Makefile                |  6 +++---
 games/robots/Makefile              |  6 +++---
 games/rogue/Makefile               |  6 +++---
 games/sail/Makefile                |  6 +++---
 games/snake/snake/Makefile         |  6 +++---
 games/worm/Makefile                |  6 +++---
 games/worms/Makefile               |  6 +++---
 usr.bin/nvi/build/Makefile         |  6 +++---
 usr.bin/systat/Makefile            |  6 +++---
 usr.bin/talk/Makefile              |  6 +++---
 usr.sbin/altq/altqstat/Makefile    |  6 +++---
 usr.sbin/ipf/ipfstat/Makefile      |  6 +++---
 usr.sbin/isdn/isdnmonitor/Makefile |  4 ++--
 24 files changed, 71 insertions(+), 71 deletions(-)

diffs (truncated from 443 to 300 lines):

diff -r 1fb599775fdd -r 995d5aff18b3 bin/sh/Makefile
--- a/bin/sh/Makefile   Sat Feb 06 23:13:59 2010 +0000
+++ b/bin/sh/Makefile   Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.90 2010/02/03 15:34:37 roy Exp $
+#      $NetBSD: Makefile,v 1.91 2010/02/06 23:45:26 he Exp $
 #      @(#)Makefile    8.4 (Berkeley) 5/5/95
 
 .include <bsd.own.mk>
@@ -15,8 +15,8 @@
 
 DPSRCS+=${GENHDRS}
 
-LDADD+=        -ll -ledit
-DPADD+=        ${LIBL} ${LIBEDIT}
+LDADD+=        -ll -ledit -lterminfo
+DPADD+=        ${LIBL} ${LIBEDIT} ${LIBTERMINFO}
 
 LFLAGS=        -8      # 8-bit lex scanner for arithmetic
 
diff -r 1fb599775fdd -r 995d5aff18b3 games/atc/Makefile
--- a/games/atc/Makefile        Sat Feb 06 23:13:59 2010 +0000
+++ b/games/atc/Makefile        Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.28 2009/10/29 14:27:26 christos Exp $
+#      $NetBSD: Makefile,v 1.29 2010/02/06 23:45:24 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -9,8 +9,8 @@
        main.c tunable.c update.c
 YHEADER=1
 MAN=   atc.6
-LDADD= -ll -lm -lcurses
-DPADD= ${LIBL} ${LIBM} ${LIBCURSES}
+LDADD= -ll -lm -lcurses -lterminfo
+DPADD= ${LIBL} ${LIBM} ${LIBCURSES} ${LIBTERMINFO}
 GAMES= Game_List Killer crossover default easy game_2 \
        Atlantis OHare Tic-Tac-Toe airports box crosshatch game_3 \
        game_4 novice two-corners
diff -r 1fb599775fdd -r 995d5aff18b3 games/battlestar/Makefile
--- a/games/battlestar/Makefile Sat Feb 06 23:13:59 2010 +0000
+++ b/games/battlestar/Makefile Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2001/10/19 03:06:09 tv Exp $
+#      $NetBSD: Makefile,v 1.10 2010/02/06 23:45:24 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  battlestar
@@ -7,8 +7,8 @@
        init.c cypher.c getcom.c parse.c room.c save.c fly.c misc.c \
        globals.c dayfile.c nightfile.c dayobjs.c nightobjs.c words.c
 MAN=   battlestar.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff -r 1fb599775fdd -r 995d5aff18b3 games/boggle/boggle/Makefile
--- a/games/boggle/boggle/Makefile      Sat Feb 06 23:13:59 2010 +0000
+++ b/games/boggle/boggle/Makefile      Sat Feb 06 23:45:24 2010 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.9 1999/02/13 02:54:20 lukem Exp $
+#      $NetBSD: Makefile,v 1.10 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 6/11/93
 
 .include <bsd.own.mk>
 
 PROG=  boggle
 SRCS=  bog.c help.c mach.c prtable.c timer.c word.c
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 MAN=   boggle.6
 .if ${MKSHARE} != "no"
diff -r 1fb599775fdd -r 995d5aff18b3 games/canfield/canfield/Makefile
--- a/games/canfield/canfield/Makefile  Sat Feb 06 23:13:59 2010 +0000
+++ b/games/canfield/canfield/Makefile  Sat Feb 06 23:45:24 2010 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
+#      $NetBSD: Makefile,v 1.8 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  canfield
 MAN=   canfield.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff -r 1fb599775fdd -r 995d5aff18b3 games/cribbage/Makefile
--- a/games/cribbage/Makefile   Sat Feb 06 23:13:59 2010 +0000
+++ b/games/cribbage/Makefile   Sat Feb 06 23:45:24 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.12 1999/02/13 02:54:21 lukem Exp $
+#      $NetBSD: Makefile,v 1.13 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
 
 PROG=  cribbage
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 SRCS=  extern.c crib.c cards.c instr.c io.c score.c support.c
 MAN=   cribbage.6
 HIDEGAME=hidegame
diff -r 1fb599775fdd -r 995d5aff18b3 games/gomoku/Makefile
--- a/games/gomoku/Makefile     Sat Feb 06 23:13:59 2010 +0000
+++ b/games/gomoku/Makefile     Sat Feb 06 23:45:24 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.4 1998/02/18 22:37:31 jtc Exp $
+#      $NetBSD: Makefile,v 1.5 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 7/24/94
 
 PROG=  gomoku
 SRCS=  bdinit.c bdisp.c main.c makemove.c pickmove.c stoc.c
 MAN=   gomoku.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff -r 1fb599775fdd -r 995d5aff18b3 games/hangman/Makefile
--- a/games/hangman/Makefile    Sat Feb 06 23:13:59 2010 +0000
+++ b/games/hangman/Makefile    Sat Feb 06 23:45:24 2010 +0000
@@ -1,12 +1,12 @@
-#      $NetBSD: Makefile,v 1.7 1998/02/18 22:37:31 jtc Exp $
+#      $NetBSD: Makefile,v 1.8 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  hangman
 SRCS=  endgame.c extern.c getguess.c getword.c main.c playgame.c \
        prdata.c prman.c prword.c setup.c
 MAN=   hangman.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 
 .include <bsd.prog.mk>
diff -r 1fb599775fdd -r 995d5aff18b3 games/hunt/hunt/Makefile
--- a/games/hunt/hunt/Makefile  Sat Feb 06 23:13:59 2010 +0000
+++ b/games/hunt/hunt/Makefile  Sat Feb 06 23:45:24 2010 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.6 2010/02/03 15:34:39 roy Exp $
+#      $NetBSD: Makefile,v 1.7 2010/02/06 23:45:25 he Exp $
 
 PROG=  hunt
 SRCS=  connect.c hunt.c otto.c playit.c pathname.c
 MAN=   hunt.6
-LDADD= -lcurses
-DPADD= ${LIBCURSES}
+LDADD= -lcurses -lterminfo
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
 HIDEGAME=hidegame
 
 CPPFLAGS+=-I${.CURDIR}/../huntd
diff -r 1fb599775fdd -r 995d5aff18b3 games/mille/Makefile
--- a/games/mille/Makefile      Sat Feb 06 23:13:59 2010 +0000
+++ b/games/mille/Makefile      Sat Feb 06 23:45:24 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.9 1998/02/18 22:37:31 jtc Exp $
+#      $NetBSD: Makefile,v 1.10 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  mille
 SRCS=  comp.c end.c extern.c init.c mille.c misc.c move.c print.c \
        roll.c save.c types.c varpush.c
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 MAN=   mille.6
 HIDEGAME=hidegame
 
diff -r 1fb599775fdd -r 995d5aff18b3 games/phantasia/Makefile
--- a/games/phantasia/Makefile  Sat Feb 06 23:13:59 2010 +0000
+++ b/games/phantasia/Makefile  Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2004/02/08 22:14:27 lukem Exp $
+#      $NetBSD: Makefile,v 1.34 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 .include <bsd.own.mk>
@@ -6,8 +6,8 @@
 PROG=  phantasia
 SRCS=  fight.c gamesupport.c interplayer.c io.c main.c misc.c phantglobs.c
 
-DPADD= ${LIBM} ${LIBCURSES}
-LDADD= -lm -lcurses
+DPADD= ${LIBM} ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lm -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 USETBL=
diff -r 1fb599775fdd -r 995d5aff18b3 games/rain/Makefile
--- a/games/rain/Makefile       Sat Feb 06 23:13:59 2010 +0000
+++ b/games/rain/Makefile       Sat Feb 06 23:45:24 2010 +0000
@@ -1,9 +1,9 @@
-#      $NetBSD: Makefile,v 1.10 2008/01/28 07:03:59 dholland Exp $
+#      $NetBSD: Makefile,v 1.11 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  rain
 MAN=   rain.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 
 .include <bsd.prog.mk>
diff -r 1fb599775fdd -r 995d5aff18b3 games/robots/Makefile
--- a/games/robots/Makefile     Sat Feb 06 23:13:59 2010 +0000
+++ b/games/robots/Makefile     Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 1999/05/15 23:56:35 christos Exp $
+#      $NetBSD: Makefile,v 1.16 2010/02/06 23:45:25 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  robots
@@ -6,8 +6,8 @@
 SRCS=  auto.c extern.c init_field.c main.c make_level.c move.c move_robs.c \
        play_level.c query.c rnd_pos.c score.c flush_in.c
 MAN=   robots.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff -r 1fb599775fdd -r 995d5aff18b3 games/rogue/Makefile
--- a/games/rogue/Makefile      Sat Feb 06 23:13:59 2010 +0000
+++ b/games/rogue/Makefile      Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2004/01/01 16:05:12 jsm Exp $
+#      $NetBSD: Makefile,v 1.17 2010/02/06 23:45:26 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  rogue
@@ -6,8 +6,8 @@
 SRCS=  hit.c init.c inventory.c level.c machdep.c main.c \
        message.c monster.c move.c object.c pack.c play.c random.c ring.c \
        room.c save.c score.c spec_hit.c throw.c trap.c use.c zap.c
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 MAN=   rogue.6
diff -r 1fb599775fdd -r 995d5aff18b3 games/sail/Makefile
--- a/games/sail/Makefile       Sat Feb 06 23:13:59 2010 +0000
+++ b/games/sail/Makefile       Sat Feb 06 23:45:24 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.16 2009/03/15 03:33:56 dholland Exp $
+#      $NetBSD: Makefile,v 1.17 2010/02/06 23:45:26 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  sail
@@ -6,8 +6,8 @@
        dr_main.c dr_1.c dr_2.c dr_3.c dr_4.c dr_5.c lo_main.c \
        assorted.c game.c globals.c misc.c parties.c sync.c array.c version.c
 MAN=   sail.6
-DPADD= ${LIBCURSES}
-LDADD= -lcurses
+DPADD= ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 
diff -r 1fb599775fdd -r 995d5aff18b3 games/snake/snake/Makefile
--- a/games/snake/snake/Makefile        Sat Feb 06 23:13:59 2010 +0000
+++ b/games/snake/snake/Makefile        Sat Feb 06 23:45:24 2010 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.9 1999/09/14 18:07:21 jsm Exp $
+#      $NetBSD: Makefile,v 1.10 2010/02/06 23:45:26 he Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 
 PROG=  snake
 SRCS=  snake.c
 MAN=   snake.6
-DPADD= ${LIBM} ${LIBCURSES}
-LDADD= -lm -lcurses
+DPADD= ${LIBM} ${LIBCURSES} ${LIBTERMINFO}
+LDADD= -lm -lcurses -lterminfo
 HIDEGAME=hidegame
 SETGIDGAME=yes
 



Home | Main Index | Thread Index | Old Index