X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=a337125b7171754fa42a6420cf90091c7bc4747b;hb=50146cd1a8a7d4db67f58bbea7ed4ca34a372d22;hp=e3d6c8024005fc294d219c661668dfdc143bd266;hpb=ff5a62e76398cbeca28ca5ab0f8c359593b9a457;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index e3d6c80..a337125 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -305,16 +305,12 @@ endif
 
 # Object and interface files have suffixes tagged with their ways
 ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi
+SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
 endif
 
 #----------------------------------------
 #	C programs
 
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-CC_OPTS += -mno-cygwin -mwin32
-endif
-
 ifneq "$(C_PROG)" ""
 all :: $(C_PROG)
 
@@ -347,10 +343,14 @@ ifeq "$(LIBOBJS)" ""
   endif
 endif
 
+STUBOBJS += $(patsubst %.c,%.o,$(wildcard *_hsc.c))
+SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR)
+
 ifeq "$(IS_CBITS_LIB)" "YES"
 override datadir:=$(libdir)/includes
 INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(HSLIB)"').h
-SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR)
+else
+SRC_CC_OPTS += -Icbits
 endif
 
 endif # HSLIB
@@ -705,6 +705,7 @@ $(LINK) : $(LINK_TARGET)
 # install links to script drivers.
 #
 install ::
+	@$(INSTALL_DIR) $(bindir)
 	@if ( $(PERL) -e '$$fn="$(bindir)/$(LINK)"; exit ((! -f $$fn || -l $$fn) ? 0 : 1);' ); then \
 	   echo "Creating a symbol link from $(LINK_TARGET) to $(LINK) in $(bindir)"; \
 	   $(RM) $(bindir)/$(LINK); \
@@ -979,7 +980,7 @@ SGML_HTML = $(addsuffix .html,$(SGML_DOC))
 # HTML output goes in a subdirectory on its own.
 SGML_TEXT = $(addsuffix .txt,$(SGML_DOC))
 
-$(SGML_DVI) $(SGML_PS) $(SGML_HTML) $(SGML_TEXT) :: $(SGML_SRCS)
+$(SGML_DVI) $(SGML_PS) $(SGML_HTML) $(SGML_TEXT) $(SGML_PDF) :: $(SGML_SRCS)
 
 dvi  :: $(SGML_DVI)
 ps   :: $(SGML_PS)