Get all the games compiling for iOS

5 files changed, 71 insertions, 27 deletions

diff --git a/backgammon/Makefile b/backgammon/Makefile
index adf28243..50ed4ca4 100644
--- a/backgammon/Makefile
+++ b/backgammon/Makefile
@@ -1,6 +1,20 @@
 #	$NetBSD: Makefile,v 1.6 2001/01/09 03:13:39 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-SUBDIR=	common_source .WAIT backgammon teachgammon
+SUBDIR=	backgammon teachgammon
+TOPTARGETS= all install
 
-.include <bsd.subdir.mk>
+$(TOPTARGETS): $(SUBDIR)
+
+clean:
+	$(MAKE) -C backgammon clean
+	$(MAKE) -C teachgammon clean
+	$(MAKE) -C common_source clean
+
+common_source:
+	$(MAKE) -C $@ $(MAKECMDGOALS)
+
+$(SUBDIR): common_source
+	$(MAKE) -C $@ $(MAKECMDGOALS)
+
+.PHONY: $(TOPTARGETS) $(SUBDIR) clean
diff --git a/backgammon/Makefile.inc b/backgammon/Makefile.inc
deleted file mode 100644
index 26638124..00000000
--- a/backgammon/Makefile.inc
+++ /dev/null
@@ -1,12 +0,0 @@
-#	$NetBSD: Makefile.inc,v 1.8 2012/10/13 19:25:22 dholland Exp $
-
-.include <bsd.own.mk>
-
-LIBCOMMON != cd ${.CURDIR}/../common_source; ${PRINTOBJDIR}
-CPPFLAGS+=-I${.CURDIR}/../common_source
-DPADD+= ${LIBCOMMON}/libcommon.a ${LIBTERMINFO}
-LDADD+=	-L${LIBCOMMON} -lcommon -lterminfo
-
-HIDEGAME=hidegame
-
-.include "../Makefile.inc"
diff --git a/backgammon/backgammon/Makefile b/backgammon/backgammon/Makefile
index 2a8d29b8..7e0336f7 100644
--- a/backgammon/backgammon/Makefile
+++ b/backgammon/backgammon/Makefile
@@ -4,5 +4,28 @@
 PROG=	backgammon
 SRCS=	extra.c main.c move.c text.c version.c
 MAN=	backgammon.6
+COMMONOBJS=	../common_source/allow.o \
+	../common_source/board.o \
+	../common_source/check.o \
+	../common_source/fancy.o \
+	../common_source/init.o \
+	../common_source/odds.o \
+	../common_source/one.o \
+	../common_source/save.o \
+	../common_source/subs.o \
+	../common_source/table.o
 
-.include <bsd.prog.mk>
+all: $(PROG)
+
+$(PROG): $(SRCS) $(COMMONOBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) $(COMMONOBJS) -I../common_source -lncursesw
+	$(STRIP) $(PROG)
+
+install: $(PROG) $(MAN)
+	$(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+	$(GINSTALL) -Dm644 $(MAN) $(DESTDIR)/usr/share/man/man6/$(MAN)
+
+clean:
+	rm -f $(CLEANFILES) $(PROG)
+
+.PHONY: all clean install
diff --git a/backgammon/common_source/Makefile b/backgammon/common_source/Makefile
index 5daf9579..b2c30409 100644
--- a/backgammon/common_source/Makefile
+++ b/backgammon/common_source/Makefile
@@ -1,16 +1,15 @@
 #	$NetBSD: Makefile,v 1.11 2019/09/29 23:44:59 mrg Exp $
 
-LIBISPRIVATE=	yes
-
-LIB=		common
 SRCS=		allow.c board.c check.c fancy.c init.c odds.c \
 		one.c save.c subs.c table.c
+OBJS=		allow.o board.o check.o fancy.o init.o odds.o \
+		one.o save.o subs.o table.o
+
+all: objs
 
-.include <bsd.own.mk>
+objs: $(OBJS)
 
-# Has fallthru comment that is missed
-.if defined(HAVE_GCC) && ${HAVE_GCC} >= 7 && ${ACTIVE_CC} == "gcc"
-COPTS.check.c+=	-Wno-error=implicit-fallthrough
-.endif
+clean:
+	rm -f $(OBJS)
 
-.include <bsd.lib.mk>
+.PHONY: all clean
diff --git a/backgammon/teachgammon/Makefile b/backgammon/teachgammon/Makefile
index af8662ef..c8666a1d 100644
--- a/backgammon/teachgammon/Makefile
+++ b/backgammon/teachgammon/Makefile
@@ -1,9 +1,29 @@
 #	$NetBSD: Makefile,v 1.11 2002/09/18 06:16:39 lukem Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-NOMAN=		# defined
-
 PROG=		teachgammon
 SRCS=		data.c teach.c ttext1.c ttext2.c tutor.c
+COMMONOBJS=	../common_source/allow.o \
+	../common_source/board.o \
+	../common_source/check.o \
+	../common_source/fancy.o \
+	../common_source/init.o \
+	../common_source/odds.o \
+	../common_source/one.o \
+	../common_source/save.o \
+	../common_source/subs.o \
+	../common_source/table.o
+
+all: $(PROG)
+
+$(PROG): $(SRCS) $(COMMONOBJS)
+	$(CC) $(CFLAGS) $(LDFLAGS) -o $(PROG) $(SRCS) $(COMMONOBJS) -I../common_source -lncursesw
+	$(STRIP) $(PROG)
+
+install: $(PROG)
+	$(GINSTALL) -Dm755 $(PROG) $(DESTDIR)/usr/games/$(PROG)
+
+clean:
+	rm -f $(CLEANFILES) $(PROG)
 
-.include <bsd.prog.mk>
+.PHONY: all clean install