games: remove trailing whitespace in *.c and *.h

[bsdgames-darwin.git] / Makefile

diff --git a/Makefile b/Makefile
index b9801a46c9600c0fcf0d7bd41752564ec3ce8d46..fbb0be58618401312e6906f09c3d1485f8d0dd2c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,48 @@
-#      $NetBSD: Makefile,v 1.28 2013/09/01 18:37:06 dholland Exp $
+#      $NetBSD: Makefile,v 1.31 2021/01/02 03:21:39 nat Exp $

 #      @(#)Makefile    8.3 (Berkeley) 7/24/94
 
 #      @(#)Makefile    8.3 (Berkeley) 7/24/94
 

-# Missing: dungeon warp
-# Moved: chess
-# Don't belong: xneko xroach
-
-.include <bsd.own.mk>
-

 SUBDIR=        adventure arithmetic atc \
        backgammon banner battlestar bcd boggle \
        caesar canfield cgram ching colorbars countmail cribbage \
 SUBDIR=        adventure arithmetic atc \
        backgammon banner battlestar bcd boggle \
        caesar canfield cgram ching colorbars countmail cribbage \

-       dm factor fish fortune gomoku \
-       hack hangman hunt larn mille monop morse number \
+       dm factor fish gomoku \
+       hack hals_end hangman hunt larn mille monop morse number \

        phantasia pig pom ppt primes quiz \
        phantasia pig pom ppt primes quiz \

-       rain random robots rogue sail snake tetris trek \
-       wargames worm worms wtf wump
+       rain random robots rogue sail snake testpat tetris trek \
+       wargames warp worm worms wtf wump
+TOPTARGETS= all clean install
+
+PREFIX        ?= /usr
+LOCALSTATEDIR ?= /var
+SYSCONFDIR    ?= /etc
+ROOT          := $(shell pwd)
+
+export ROOT PREFIX LOCALSTATEDIR SYSCONFDIR
+
+$(TOPTARGETS): $(SUBDIR)
+
+$(SUBDIR): config.h
+       +$(MAKE) -C $@ $(MAKECMDGOALS)
+
+config.h:
+       @echo "#define PREFIX \"$(PREFIX)\"" > config.h
+       @echo "#define LOCALSTATEDIR \"$(LOCALSTATEDIR)\"" >> config.h
+       @echo "#define SYSCONFDIR \"$(SYSCONFDIR)\"" >> config.h
+
+update:
+       TEMP=$$(mktemp -d); \
+       cd ~/Documents/BSD/NetBSD; \
+       git format-patch -o $$TEMP $(shell cat upstream-commit) games; \
+       git rev-list HEAD -1 games/ > $(ROOT)/upstream-commit; \
+       cd $(ROOT); \
+       for patch in $$TEMP/*.patch; do \
+               if [ "$$(filterdiff -x '*/Makefile' --strip=1 $$patch --clean)" = "" ]; then \
+                       echo "Skipping $$(basename $$patch) because it's empty"; \
+               else \
+                       filterdiff -x '*/Makefile' --strip=1 $$patch | git am; \
+               fi; \
+       done

 
 

-.if ${MKCXX} != "no"
-SUBDIR+=       dab 
-.endif
+clean:
+       rm -f config.h

 
 

-.include <bsd.subdir.mk>
+.PHONY: $(TOPTARGETS) $(SUBDIR) update