[Pre generate object list and use new dependency features of ghc 6.4 in makefile
John Meacham <john@repetae.net>**20050420003221] hunk ./Makefile 2
+all:   jhc
+
hunk ./Makefile 7
-GHCOPTS=   -O     -pgmF drift-ghc  -F $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) -fwarn-type-defaults   -fallow-undecidable-instances  -fglasgow-exts -fallow-overlapping-instances
+GHCOPTS=   -O   -pgmF drift-ghc  -F $(GHCDEBUGOPTS) $(GHCINC) $(PACKAGES) -fwarn-type-defaults   -fallow-undecidable-instances  -fglasgow-exts -fallow-overlapping-instances
hunk ./Makefile 16
-OBJS=$(shell perl ./collect_deps.prl Main.o < depend.make)
+BUILTSOURCES= PrimitiveOperators.hs RawFiles.hs FrontEnd/HsParser.hs FlagDump.hs FlagOpts.hs
hunk ./Makefile 19
+# OBJS is defined in 'depend.make'
+# OBJS=$(shell perl ./collect_deps.prl Main.o < depend.make)
+#
+-include depend.make
+
+
hunk ./Makefile 27
-all: depend.make  jhc
hunk ./Makefile 44
-RawFiles.hs:  data/HsFFI.h data/jhc_rts.c
-	perl ./op_raw.prl $(basename $@)  $^ > $@
hunk ./Makefile 45
-FrontEnd/HsParser.hs: FrontEnd/HsParser.ly
-	happy -a -g -c FrontEnd/HsParser.ly
-
hunk ./Makefile 69
-depend: $(ALLHS)
-	$(HC) -M -optdep-f -optdepdepend.make $(HC_OPTS) $(ALLHS)
+depend: depend.make
hunk ./Makefile 71
+depend.make: $(BUILTSOURCES) $(ALLHS)
+	$(HC) -M -optdep-f -optdepdepend.make $(HC_OPTS) Main.hs
+	echo OBJS=`perl ./collect_deps.prl Main.o < depend.make` >> depend.make  
+
+# $(ALLHS)
+
hunk ./Makefile 80
-builtfiles: PrimitiveOperators.hs RawFiles.hs FrontEnd/HsParser.hs FlagDump.hs FlagOpts.hs
hunk ./Makefile 82
-	rm -f PrimitiveOperators.hs RawFiles.hs FrontEnd/HsParser.hs FlagDump.hs FlagOpts.hs
+	rm -f $(BUILTSOURCES) depend.make
hunk ./Makefile 84
+builtfiles: $(BUILTSOURCES)
hunk ./Makefile 88
+
+# Various rules for generated Haskell files
+
hunk ./Makefile 97
-.PHONY: depend clean regress hsdocs
+RawFiles.hs:  data/HsFFI.h data/jhc_rts.c
+	perl ./op_raw.prl $(basename $@)  $^ > $@
hunk ./Makefile 100
--include depend.make
+FrontEnd/HsParser.hs: FrontEnd/HsParser.ly
+	happy -a -g -c FrontEnd/HsParser.ly
+
+.PHONY: depend clean realclean builtfiles clean-ho  regress hsdocs
+