From 1291159d7b9d7264029c6c43f0c62e4970ed161c Mon Sep 17 00:00:00 2001 From: zrj Date: Wed, 25 Apr 2018 19:18:06 +0300 Subject: [PATCH] adventure(6): Separate hostprog. --- games/adventure/Makefile | 17 +++-------------- games/adventure/Makefile.inc | 1 + games/adventure/{ => adventure}/Makefile | 10 +++++----- games/adventure/setup/Makefile | 9 +++++++++ 4 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 games/adventure/Makefile.inc copy games/adventure/{ => adventure}/Makefile (67%) create mode 100644 games/adventure/setup/Makefile diff --git a/games/adventure/Makefile b/games/adventure/Makefile index c128f5ebd8..4f49693652 100644 --- a/games/adventure/Makefile +++ b/games/adventure/Makefile @@ -1,14 +1,3 @@ -# @(#)Makefile 8.1 (Berkeley) 6/12/93 -# $FreeBSD: src/games/adventure/Makefile,v 1.7.6.1 2001/04/25 09:28:42 ru Exp $ - -PROG= adventure -SRCS= main.c init.c done.c save.c subr.c vocab.c wizard.c io.c data.c crc.c -MAN= adventure.6 -CLEANFILES=data.c setup.nx setup.no - -build-tools: setup.nx - -data.c: glorkz setup.nx - ./setup.nx ${.CURDIR}/glorkz > data.c - -.include +SUBDIR= setup +SUBDIR+= adventure +.include diff --git a/games/adventure/Makefile.inc b/games/adventure/Makefile.inc new file mode 100644 index 0000000000..01b5f23410 --- /dev/null +++ b/games/adventure/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/games/adventure/Makefile b/games/adventure/adventure/Makefile similarity index 67% copy from games/adventure/Makefile copy to games/adventure/adventure/Makefile index c128f5ebd8..d2f8d3c00d 100644 --- a/games/adventure/Makefile +++ b/games/adventure/adventure/Makefile @@ -1,14 +1,14 @@ # @(#)Makefile 8.1 (Berkeley) 6/12/93 # $FreeBSD: src/games/adventure/Makefile,v 1.7.6.1 2001/04/25 09:28:42 ru Exp $ +.PATH: ${.CURDIR}/.. + PROG= adventure SRCS= main.c init.c done.c save.c subr.c vocab.c wizard.c io.c data.c crc.c MAN= adventure.6 -CLEANFILES=data.c setup.nx setup.no - -build-tools: setup.nx +CLEANFILES=data.c -data.c: glorkz setup.nx - ./setup.nx ${.CURDIR}/glorkz > data.c +data.c: glorkz setup.c + ${.OBJDIR}/../setup/setup.nx ${.CURDIR}/../glorkz > data.c .include diff --git a/games/adventure/setup/Makefile b/games/adventure/setup/Makefile new file mode 100644 index 0000000000..c47b1fcf52 --- /dev/null +++ b/games/adventure/setup/Makefile @@ -0,0 +1,9 @@ +.PATH: ${.CURDIR}/.. + +PROG= setup +CFLAGS+=-I${.CURDIR}/.. + +# this setup is used in place, it is not installed anywhere +install: + +.include -- 2.41.0