X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=utils%2Frunghc%2FMakefile;h=0b606de6384049fd4680d3e5a1bd21f4cb4482dd;hb=785e4ab34b25c6f023183d6fabf5e74b27b416f9;hp=ef55c320a0c61e4a3acc2eb5b607143cc92f67fc;hpb=5b846fa36eee0f96c4c47128706d0131f8bb4113;p=ghc-hetmet.git

diff --git a/utils/runghc/Makefile b/utils/runghc/Makefile
index ef55c32..0b606de 100644
--- a/utils/runghc/Makefile
+++ b/utils/runghc/Makefile
@@ -1,45 +1,9 @@
-TOP=../..
-include $(TOP)/mk/boilerplate.mk
-
-# Beyond stage 1, honour any Mac OS X depolyment target options.  If we use 
-# these options in stage 1 we get a linker error if the bootstrap compiler is
-#  for a more recent OS version
-ifeq "$(stage)" "2"
-SRC_CC_OPTS += $(MACOSX_DEPLOYMENT_CC_OPTS)
-SRC_HC_OPTS += $(addprefix -optc, $(MACOSX_DEPLOYMENT_CC_OPTS))
-SRC_LD_OPTS += $(addprefix -optl, $(MACOSX_DEPLOYMENT_LD_OPTS))
-endif
-
-# We have two version: the inplace version compiled by the bootstrap compiler
-#   and the install version compiled by the stage 1 compiler
-ifeq "$(stage)" "2"
-HS_PROG           = runghc$(exeext)
-else
-HS_PROG           = runghc-inplace$(exeext)
-endif
-INSTALL_PROGS   += $(HS_PROG)
-
-UseGhcForCc = YES
-SRC_MKDEPENDC_OPTS += -I$(GHC_INCLUDE_DIR)
 
-SRC_HC_OPTS += -Wall
-
-RUNHASKELL_PROG = runhaskell$(exeext)
-all :: $(RUNHASKELL_PROG)
-
-$(RUNHASKELL_PROG) : $(HS_PROG)
-	$(CP) $< $(RUNHASKELL_PROG)
-
-CLEAN_FILES += $(RUNHASKELL_PROG)
+TOP=../..
+ENABLE_SHELL_WRAPPERS = YES
 
-ifneq "$(NO_INSTALL_RUNHASKELL)" "YES"
-INSTALL_PROGS += $(RUNHASKELL_PROG)
-endif
+include $(TOP)/mk/boilerplate.mk
+include $(TOP)/mk/cabal.mk
 
-binary-dist::
-	$(INSTALL_DIR)                $(BIN_DIST_DIR)/utils/runghc
-	$(INSTALL_DATA)    Makefile   $(BIN_DIST_DIR)/utils/runghc/
-	$(INSTALL_PROGRAM) $(HS_PROG) $(BIN_DIST_DIR)/utils/runghc/
-	$(INSTALL_PROGRAM) $(RUNHASKELL_PROG) $(BIN_DIST_DIR)/utils/runghc/
+# XXX Need to make runhaskell somehow
 
-include $(TOP)/mk/target.mk