Introduce SRC_DEPS variable

Instead of passing package dependencies via `SRC_HC_OPTS=-package ...`
we rather pass them via `SRC_DEPS`, allowing the build system to
know about the dependency.

gc/fibheaps/Makefile

@@ -3,8 +3,8 @@ include $(TOP)/mk/boilerplate.mk
 
 NORM_OPTS = 300000
 
-SRC_HC_OPTS += -package array
 SRC_RUNTEST_OPTS += +RTS -K64m -RTS
+SRC_DEPS = array
 
 ifeq "$(HEAP)" "LARGE"
 SRC_RUNTEST_OPTS += +RTS -H128m -RTS

gc/gc_bench/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_HC_OPTS += -cpp -package old-time
+SRC_HC_OPTS += -cpp
+SRC_DEPS = old-time
 
 # kLongLivedTreeDepth	  = 17 :: Int
 # kArraySize	 	     = 500000 :: Int

gc/happy/Makefile

@@ -3,7 +3,8 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 NORM_OPTS = TestInput.y
-SRC_HC_OPTS += -cpp -package containers
+SRC_HC_OPTS += -cpp
+SRC_DEPS = containers
 EXCLUDED_SRCS += TestInput.hs
 
 ifeq "$(HEAP)" "LARGE"

gc/spellcheck/Makefile

@@ -7,7 +7,7 @@ all boot :: input
 input : words
 	cat words words words words words words words words words words >$@
 
-SRC_HC_OPTS += -package containers
+SRC_DEPS = containers
 NORM_OPTS = words input
 
 ifeq "$(HEAP)" "LARGE"

imaginary/kahan/Makefile

@@ -6,4 +6,4 @@ FAST_OPTS =  150000
 NORM_OPTS = 1500000
 SLOW_OPTS = 7500000
 
-SRC_HC_OPTS += -package array
+SRC_DEPS = array

mk/ghc-opts.mk

@@ -59,7 +59,7 @@ endif
 # All the standard gluing together, as in the comment right at the front
 
 
-HC_OPTS            = $(BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS) $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS)
+HC_OPTS            = $(BOOTSTRAPPING_PACKAGE_CONF_HC_OPTS) $(SRC_HC_OPTS) $(WAY$(_way)_HC_OPTS) $($*_HC_OPTS) $(EXTRA_HC_OPTS) $(addprefix -package, $(SRC_DEPS))
 ifeq "$(HC_VERSION_GE_6_13)" "YES"
 HC_OPTS           += -rtsopts
 endif

parallel/blackscholes/Makefile

@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 PROG_ARGS = 10000 15000000
-SRC_HC_OPTS += -package parallel
+SRC_DEPS += parallel
 
 include $(TOP)/mk/target.mk
 

parallel/coins/Makefile

@@ -7,6 +7,6 @@ include $(TOP)/mk/boilerplate.mk
 # This version builds a list of the results, and needs a lot of memory:
 SRC_RUNTEST_OPTS += 3 873
 
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk

parallel/gray/Makefile

@@ -13,6 +13,7 @@
 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_HC_OPTS += -package parallel -package parsec -fvia-C -fexcess-precision
+SRC_HC_OPTS = -fvia-C -fexcess-precision
+SRC_DEPS = parallel parsec
 
 include $(TOP)/mk/target.mk

parallel/linsolv/Makefile

 TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
-SRC_HC_OPTS += -cpp -DSTRATEGIES -package random -package parallel
+SRC_HC_OPTS += -cpp -DSTRATEGIES
+SRC_DEPS = random parallel
 
 # 28 = version
 # 83 = input

parallel/mandel/Makefile

@@ -3,6 +3,6 @@ include $(TOP)/mk/boilerplate.mk
 
 SRC_RUNTEST_OPTS += -2.0 -2.0 2.0 2.0 1024 1024 256
 SRC_RUNTEST_OPTS += -stdout-binary
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk

parallel/matmult/Makefile

@@ -9,7 +9,7 @@ include $(TOP)/mk/boilerplate.mk
 FAST_OPTS = 100 1 10
 NORM_OPTS = 600 1 10
 SLOW_OPTS = 1000 1 10
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 # FAST_OPTS = 
 # NORM_OPTS = 

parallel/minimax/Makefile

@@ -3,11 +3,11 @@ include $(TOP)/mk/boilerplate.mk
 
 SRCS = Board.hs \
        Game.hs \
-		 Prog.hs \
-		 Tree.hs \
-		 Wins.hs \
-		 Main.hs
-HC_OPTS += -package parallel -package random
+       Prog.hs \
+       Tree.hs \
+       Wins.hs \
+       Main.hs
+SRC_DEPS = parallel random
 
 PROG_ARGS = 4 6
 

parallel/nbody/Makefile

@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 PROG_ARGS = 3000
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk
 

parallel/parfib/Makefile

@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 SRC_RUNTEST_OPTS += 43 11
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk

parallel/partak/Makefile

@@ -5,6 +5,6 @@ include $(TOP)/mk/boilerplate.mk
 FAST_OPTS = 34 15 8
 NORM_OPTS = 36 17 8
 SLOW_OPTS = 34 18 8
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk

parallel/partree/Makefile

@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 PROG_ARGS = 300 100
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk
 

parallel/prsa/Makefile

@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 PROG_ARGS = 500000
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk
 

parallel/queens/Makefile

@@ -2,6 +2,6 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 SRC_RUNTEST_OPTS += 13
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk

parallel/ray/Makefile

@@ -2,7 +2,7 @@ TOP = ../..
 include $(TOP)/mk/boilerplate.mk
 
 PROG_ARGS = 1000
-SRC_HC_OPTS += -package parallel
+SRC_DEPS = parallel
 
 include $(TOP)/mk/target.mk