[project @ 2003-07-24 09:29:10 by simonmar]

[ghc-hetmet.git] / ghc / rts / Makefile

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index 0a0fa9d..f46cf95 100644 (file)
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -20,7 +20,7 @@ TOP=..
 # set of suffix rules for compiling C code, using $(HC) rather than $(CC)
 # and prepending "-optc" to $(CC_OPTS).  NB. must be done before including
 # boilerplate.mk below.
-UseGhcForCc = $(shell if (test "x$(BootingFromHc)" = "xYES"); then echo NO; else echo YES; fi)
+UseGhcForCc = YES
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -156,6 +156,7 @@ ifneq "$(GTK_CONFIG)" ""
 ifeq "$(GhcRtsWithFrontPanel)" "YES"
 SRC_HC_OPTS            += `$(GTK_CONFIG) --cflags` -optc-DRTS_GTK_FRONTPANEL
 VisCallbacks_CC_OPTS   += -Wno-unused
+SRC_MKDEPENDC_OPTS     += `$(GTK_CONFIG) --cflags`
 else # GhcRtsWithFrontPanel
 EXCLUDED_SRCS          += $(wildcard Vis*.c)
 endif
@@ -174,12 +175,11 @@ SRC_MKDEPENDC_OPTS += -I. -I../includes
 
 AUTO_APPLY = AutoApply.hc
 
-gen_apply : GenApply.hs
-       $(GHC) -o $@ -I$(GHC_INCLUDE_DIR) GenApply.hs 
-
+ifneq "$(BootingFromHc)" "YES"
 $(AUTO_APPLY): $(GHC_GENAPPLY)
        @$(RM) $@
        $(GHC_GENAPPLY) >$@
+endif
 
 EXTRA_SRCS += $(AUTO_APPLY)