Try my hand again at removing ugly testmain target.

1 files changed, 12 insertions, 14 deletions

diff --git a/sys/boot/ficl/Makefile b/sys/boot/ficl/Makefile
index fa65665..04cce5b 100644
--- a/sys/boot/ficl/Makefile
+++ b/sys/boot/ficl/Makefile
@@ -1,13 +1,21 @@
 # $FreeBSD$
 #
 .PATH:			${.CURDIR}/${MACHINE_ARCH}
-LIB=			ficl
-NOPROFILE=		yes
-INTERNALLIB=		yes
-INTERNALSTATICLIB=	yes
 BASE_SRCS=		dict.c ficl.c math64.c stack.c vm.c words.c
 SRCS=			${BASE_SRCS} sysdep.c softcore.c
 CLEANFILES=		softcore.c testmain
+.ifmake testmain
+CFLAGS+=			-DTESTMAIN -D_TESTMAIN
+SRCS+=				testmain.c
+PROG=			testmain
+.include <bsd.prog.mk>
+.else
+LIB=			ficl
+INTERNALLIB=		yes
+INTERNALSTATICLIB=	yes
+NOPROFILE=		yes
+.include <bsd.lib.mk>
+.endif
 
 # Standard softwords
 SOFTWORDS=	softcore.fr jhlocal.fr marker.fr freebsd.fr ficllocal.fr \
@@ -21,14 +29,4 @@ CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/${MACHINE_ARCH} -DFICL_TRACE
 softcore.c:	${SOFTWORDS} softcore.awk
 	(cd ${.CURDIR}/softwords; cat ${SOFTWORDS} | awk -f softcore.awk) > ${.TARGET}
 
-.include <bsd.lib.mk>
-
-testmain:      ${.CURDIR}/testmain.c ${SRCS}
-	@for i in ${BASE_SRCS}; do echo $${i}... ; \
-	  ${CC} -c ${CFLAGS} -DTESTMAIN ${.CURDIR}/$${i}; done
-	@echo softdep.c...
-	@${CC} -c ${CFLAGS} -D_TESTMAIN softcore.c
-	@echo sysdep.c
-	@${CC} -c ${CFLAGS} -DTESTMAIN ${.CURDIR}/${MACHINE_ARCH}/sysdep.c
-	${CC} -o ${.TARGET} ${CFLAGS} ${.CURDIR}/testmain.c ${OBJS}