From 3aef7e29f71c3ffc28dcc97f8f487b839207e7ca Mon Sep 17 00:00:00 2001 From: simonmar Date: Wed, 14 Jun 2000 11:07:47 +0000 Subject: [PATCH] [project @ 2000-06-14 11:07:47 by simonmar] move "boot :: all" after target.mk, so we make dependencies in the current directory before going on to build the driver. This still doesn't really work because GNU make doesn't re-load the .depend file, but it's heading in the right direction. also, clean ghc-inplace and ghc. --- ghc/driver/Makefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ghc/driver/Makefile b/ghc/driver/Makefile index 3245add..819be30 100644 --- a/ghc/driver/Makefile +++ b/ghc/driver/Makefile @@ -1,5 +1,5 @@ #----------------------------------------------------------------------------- -# $Id: Makefile,v 1.33 2000/06/14 10:27:07 simonmar Exp $ +# $Id: Makefile,v 1.34 2000/06/14 11:07:47 simonmar Exp $ # TOP=.. @@ -21,9 +21,6 @@ LINK = ghc SUBDIRS = mangler split stats -# we need the driver for generating dependencies... -boot :: all - # ----------------------------------------------------------------------------- # Create driver configuration @@ -85,6 +82,8 @@ ghc-inplace : ghc echo exec $(FPTOOLS_TOP_ABS)/ghc/driver/ghc -B$(FPTOOLS_TOP_ABS) $$\* >>$@ chmod 755 $@ +CLEAN_FILES += ghc-inplace + # ----------------------------------------------------------------------------- # package configuration files... @@ -115,6 +114,9 @@ INSTALL_DATAS += ghc-usage.txt include $(TOP)/mk/target.mk +# we need the driver for generating dependencies... +boot :: all + # ----------------------------------------------------------------------------- # Create link to from ghc-x.xx to ghc... @@ -131,6 +133,8 @@ $(LINK) : $(HS_PROG) exit 1; \ fi; +CLEAN_FILES += $(LINK) + install :: @if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \ echo "Creating a symbol link from $(HS_PROG) to $(LINK) in $(bindir)"; \ -- 1.7.10.4