Make the nofib build system independent of the GHC build system
authorIan Lynagh <ian@well-typed.com>
Tue, 28 May 2013 19:36:03 +0000 (20:36 +0100)
committerIan Lynagh <ian@well-typed.com>
Tue, 28 May 2013 19:36:03 +0000 (20:36 +0100)
mk/boilerplate.mk
mk/target.mk

index 86696f8..b838b94 100644 (file)
@@ -15,12 +15,6 @@ default : all
 show:
        @echo '$(VALUE)="$($(VALUE))"'
 
-NOFIB_TOP := $(TOP)
-include $(NOFIB_TOP)/../mk/tree.mk
-include $(NOFIB_TOP)/../mk/config.mk
-include $(NOFIB_TOP)/../mk/custom-settings.mk
-TOP := $(NOFIB_TOP)
-
 RM = rm -f
 SIZE = size
 STRIP = strip
@@ -120,11 +114,11 @@ endef
 
 $(eval $(call ghc-ge,6,13))
 
-RUNTEST   = $(NOFIB_TOP)/runstdtest/runstdtest
+RUNTEST   = $(TOP)/runstdtest/runstdtest
 
-include $(NOFIB_TOP)/mk/ghc-paths.mk
-include $(NOFIB_TOP)/mk/ghc-opts.mk
-include $(NOFIB_TOP)/mk/paths.mk
-include $(NOFIB_TOP)/mk/opts.mk
+include $(TOP)/mk/ghc-paths.mk
+include $(TOP)/mk/ghc-opts.mk
+include $(TOP)/mk/paths.mk
+include $(TOP)/mk/opts.mk
 
 -include .depend
index 50455e7..a8c92a2 100644 (file)
@@ -115,7 +115,7 @@ endif # GHCI
 # We do this at the end for cosmetic reasons: it means that the "normal-way"
 # runtests will precede the "other-way" recursive invocations of make
 
-include $(NOFIB_TOP)/mk/ghc-target.mk
+include $(TOP)/mk/ghc-target.mk
 
 # Override suffix rules
-include $(NOFIB_TOP)/mk/suffix.mk
+include $(TOP)/mk/suffix.mk