From 12173fb1ee1d2f1d8a3e6eac21176785c3964b01 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Thu, 19 Mar 1998 23:32:09 +0000 Subject: do not use in-source libraries; they are really problematic with obj@ and obj/ links --- games/backgammon/Makefile | 4 ++-- games/backgammon/backgammon/Makefile | 11 ++++++----- games/backgammon/common_source/Makefile | 13 ------------- games/backgammon/teachgammon/Makefile | 10 ++++++---- 4 files changed, 14 insertions(+), 24 deletions(-) delete mode 100644 games/backgammon/common_source/Makefile diff --git a/games/backgammon/Makefile b/games/backgammon/Makefile index 127d8e03635..924ee3fea28 100644 --- a/games/backgammon/Makefile +++ b/games/backgammon/Makefile @@ -1,5 +1,5 @@ -# $OpenBSD: Makefile,v 1.3 1998/03/19 11:13:01 pjanzen Exp $ +# $OpenBSD: Makefile,v 1.4 1998/03/19 23:31:57 deraadt Exp $ -SUBDIR= common_source backgammon teachgammon +SUBDIR=backgammon teachgammon .include diff --git a/games/backgammon/backgammon/Makefile b/games/backgammon/backgammon/Makefile index d32873a3b7a..5f365a258fd 100644 --- a/games/backgammon/backgammon/Makefile +++ b/games/backgammon/backgammon/Makefile @@ -1,12 +1,13 @@ -# $OpenBSD: Makefile,v 1.3 1998/03/19 11:13:03 pjanzen Exp $ +# $NetBSD: Makefile,v 1.6 1995/03/21 15:04:52 cgd Exp $ # @(#)Makefile 8.1 (Berkeley) 5/31/93 PROG= backgammon -CFLAGS+=-I${.CURDIR}/../common_source -SRCS= extra.c main.c move.c text.c +CFLAGS+=-DV7 -I${.CURDIR}/../common_source +SRCS= allow.c board.c check.c extra.c fancy.c init.c main.c move.c \ + odds.c one.c save.c subs.c table.c text.c MAN= backgammon.6 -DPADD= ${.CURDIR}/../common_source/libcommon.a ${LIBTERMCAP} -LDADD= -L${.CURDIR}/../common_source -lcommon -ltermcap +DPADD= ${LIBTERMCAP} ${LIBCOMPAT} +LDADD= -ltermcap -lcompat .PATH: ${.CURDIR}/../common_source HIDEGAME=hidegame diff --git a/games/backgammon/common_source/Makefile b/games/backgammon/common_source/Makefile deleted file mode 100644 index 0ee5a3ef9d9..00000000000 --- a/games/backgammon/common_source/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# $OpenBSD: Makefile,v 1.1 1998/03/19 11:13:13 pjanzen Exp $ - -LIB= common -SRCS= allow.c board.c check.c fancy.c init.c odds.c one.c save.c subs.c \ - table.c - -NOPROFILE= noprofile -NOPIC= nopic - -# only needed during build -libinstall:: - -.include diff --git a/games/backgammon/teachgammon/Makefile b/games/backgammon/teachgammon/Makefile index 3bfcd2162a0..397ac5593e8 100644 --- a/games/backgammon/teachgammon/Makefile +++ b/games/backgammon/teachgammon/Makefile @@ -2,13 +2,15 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 PROG= teachgammon -CFLAGS+=-I${.CURDIR}/../common_source -SRCS= data.c teach.c ttext1.c ttext2.c tutor.c -DPADD= ${.CURDIR}/../common_source/libcommon.a ${LIBTERMCAP} -LDADD= -L${.CURDIR}/../common_source -lcommon -ltermcap +CFLAGS+=-DV7 -I${.CURDIR}/../common_source +SRCS= allow.c board.c check.c data.c fancy.c init.c odds.c one.c save.c \ + subs.c table.c teach.c ttext1.c ttext2.c tutor.c +DPADD= ${LIBTERMCAP} ${LIBCOMPAT} +LDADD= -ltermcap -lcompat HIDEGAME=hidegame NOMAN= noman .PATH: ${.CURDIR}/../common_source +.include "../../Makefile.inc" .include -- cgit v1.2.3