X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FMakefile;h=8b344b0aad82ee0e797633a60f708fe98904b1c5;hb=9e6162f9d0102d1f5738bf78258b24ea5a647ea4;hp=ee75feee97c274575296230c00a56f457c4bfc1a;hpb=5b4f5a6aa8f384573f0f11bc744d5637a1f3bc09;p=ghc-hetmet.git

diff --git a/ghc/rts/Makefile b/ghc/rts/Makefile
index ee75fee..8b344b0 100644
--- a/ghc/rts/Makefile
+++ b/ghc/rts/Makefile
@@ -38,6 +38,7 @@ ALL_DIRS = hooks parallel
 
 ifeq "$(HOSTPLATFORM)" "i386-unknown-mingw32"
 ALL_DIRS += win32
+EXCLUDED_SRCS += Itimer.c Select.c Signals.c
 endif
 
 ifneq "$(DLLized)" "YES"
@@ -132,6 +133,21 @@ ifeq "$(HaveLibMingwEx)" "YES"
 PACKAGE_CPP_OPTS += -DHAVE_LIBMINGWEX
 endif
 
+ifeq "$(DotnetSupport)" "YES"
+
+# 
+# Would like to just use SUBDIRS here, but need to
+# descend into dotnet/ earlier than that.
+#
+all ::
+	$(MAKE) -C dotnet all
+
+# But use SUBDIRS for other recursive targets.
+SUBDIRS += dotnet
+
+LIBOBJS += dotnet/Invoke.o
+endif
+
 #-----------------------------------------------------------------------------
 # Include the Front panel code?
 
@@ -140,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
@@ -167,6 +184,8 @@ $(AUTO_APPLY): $(GHC_GENAPPLY)
 
 EXTRA_SRCS += $(AUTO_APPLY)
 
+CLEAN_FILES += $(AUTO_APPLY)
+
 # -----------------------------------------------------------------------------
 #
 #  Building DLLs is only supported on mingw32 at the moment.