Better crunchgen support.

1 files changed, 19 insertions, 13 deletions

diff --git a/usr.bin/less/Makefile.bsd-wrapper b/usr.bin/less/Makefile.bsd-wrapper
index 77f3e363d86..598ed421401 100644
--- a/usr.bin/less/Makefile.bsd-wrapper
+++ b/usr.bin/less/Makefile.bsd-wrapper
@@ -1,6 +1,4 @@
-#	$OpenBSD: Makefile.bsd-wrapper,v 1.4 1996/09/25 03:59:03 etheisen Exp $
-
-LINKS=		${BINDIR}/less ${BINDIR}/more ${BINDIR}/less ${BINDIR}/page
+#	$OpenBSD: Makefile.bsd-wrapper,v 1.5 1996/09/25 06:38:33 etheisen Exp $
 
 #
 # less config
@@ -9,12 +7,21 @@ PREFIX=		/usr
 DATADIR=	$(PREFIX)/share/misc
 LESS_HLP=	more.help
 LIBS=		-ltermcap
+LINKS=		${BINDIR}/less ${BINDIR}/more ${BINDIR}/less ${BINDIR}/page
 MAN=		less.1 lesskey.1
 MLINKS=		less.1 more.1 less.1 page.1
 CLEANFILES=	config.cache config.log $(MAN)
 
 #
-# XXX - crunchgen crap
+# Wrapped flags
+#
+WCFLAGS=	CFLAGS="$(CFLAGS)"
+WLDFLAGS=	LDFLAGS="$(LDSTATIC)"
+
+all: config.status gnu_build
+
+#
+# crunchgen
 #
 OBJS=	main.o screen.o brac.o ch.o charset.o cmdbuf.o \
 	command.o decode.o edit.o filename.o forwback.o \
@@ -22,14 +29,7 @@ OBJS=	main.o screen.o brac.o ch.o charset.o cmdbuf.o \
 	lsystem.o mark.o optfunc.o option.o opttbl.o os.o \
 	output.o position.o prompt.o search.o signal.o \
 	tags.o ttyin.o version.o
-
-#
-# Wrapped flags
-#
-WCFLAGS=	CFLAGS="$(CFLAGS)"
-WLDFLAGS=	LDFLAGS="$(LDSTATIC)"
-
-all: config.status gnu_build
+$(OBJS): config.status cg_build
 
 .FORCE: .IGNORE
 
@@ -43,6 +43,12 @@ config.status:
 gnu_build:
 	$(MAKE) $(WCFLAGS) $(WLDFLAGS) LIBS=$(LIBS) datadir=$(DATADIR) LESS_HLP=$(LESS_HLP)
 
+#
+# crunchgen build
+#
+cg_build:
+	$(MAKE) $(WCFLAGS) $(WLDFLAGS) LIBS=$(LIBS) datadir=$(DATADIR) LESS_HLP=$(LESS_HLP) $(OBJS)
+
 install: gnu_install maninstall _SUBDIRUSE
 .if defined(LINKS) && !empty(LINKS)
 	@set ${LINKS}; \
@@ -84,7 +90,7 @@ lint:
 tags:
 	# Nothing here so far...
 
-.include <../Makefile.inc>
+.include <bsd.prog.mk>
 .include <bsd.obj.mk>
 .include <bsd.subdir.mk>
 .include <bsd.man.mk>