X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Ftarget.mk;h=7522603eb53f0d0697849061c82d1c17838fde0a;hb=eb6fb4cf7742dbdd10d1fa0702ff85b1c49084d4;hp=0f1153689eecfa7bb336ee75d63ebf585d16c53a;hpb=ad428ac635f656fb716029ca011d3f3915e2ad65;p=ghc-hetmet.git

diff --git a/mk/target.mk b/mk/target.mk
index 0f11536..7522603 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -155,7 +155,7 @@ ifneq "$(MKDEPENDC_SRCS)" ""
 	$(MKDEPENDC) -f .depend $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(MKDEPENDC_SRCS) 
 endif
 ifneq "$(MKDEPENDHS_SRCS)" ""
-	$(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(HC_OPTS) $(MKDEPENDHS_SRCS)
+	$(MKDEPENDHS) -M -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(HC_OPTS)) $(MKDEPENDHS_SRCS)
 endif
 
 
@@ -301,19 +301,8 @@ else
 $(HS_PROG) :: $(HS_OBJS)
 	$(CC) -o $@ $(HC_BOOT_CC_OPTS) $(HC_BOOT_LD_OPTS) $(HS_OBJS) $(HC_BOOT_LIBS)
 endif
-endif
-
-# Object and interface files have suffixes tagged with their ways
-ifneq "$(way)" ""
-SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
-endif
 
-# add syslib dependencies and current package name
-SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
-ifneq "$(PACKAGE)" ""
-SRC_HC_OPTS += -package-name $(PACKAGE)
-else
-# No library, we are actually building the tools
+# for building a Haskell program, we add FptoolsHcOpts
 SRC_HC_OPTS += $(FptoolsHcOpts)
 endif
 
@@ -337,7 +326,7 @@ endif
 #
 # Outputs:
 #   $(LIBRARY)		the name of the library.a
-#   $(GHIC_LIBRARY)	the name of the library.o (for GHCi0
+#   $(GHIC_LIBRARY)	the name of the library.o (for GHCi)
 #   $(LIBOBJS)		objects to put in library
 #   $(STUBOBJS)		more objects to put in library
 # 
@@ -347,8 +336,18 @@ endif
 
 ifneq "$(PACKAGE)" ""
 
+# add syslib dependencies and current package name
+SRC_HC_OPTS += -package-name $(PACKAGE)
+SRC_HC_OPTS += $(patsubst %, -package %, $(PACKAGE_DEPS))
+
 ifeq "$(IS_CBITS_LIB)" "YES"
 _cbits := _cbits
+STUBOBJS += $(HSC_C_OBJS)
+# Add _hsc.c files to the cbits library
+C_SRCS += $(wildcard ../*_hsc.c)
+# Make .hsc.h include files from the directory above visible
+# (and the cbits/ library too).
+SRC_CC_OPTS += -I.. -I.
 endif
 
 LIBRARY      = libHS$(PACKAGE)$(_cbits)$(_way).a
@@ -366,11 +365,10 @@ ifeq "$(LIBOBJS)" ""
   endif
 endif
 
-STUBOBJS += $(HSC_C_OBJS)
 SRC_CC_OPTS += -I$(GHC_INCLUDE_DIR) -I$(GHC_RUNTIME_DIR)
 
 ifeq "$(IS_CBITS_LIB)" "YES"
-override datadir:=$(libdir)/includes
+override datadir:=$(libdir)/include
 INSTALL_DATAS += Hs$(shell perl -e 'print ucfirst "$(PACKAGE)"').h
 else
 SRC_CC_OPTS += -Icbits
@@ -381,7 +379,7 @@ endif # PACKAGE
 #----------------------------------------
 #	Libraries/archives
 #
-# Build $(LIBRARY) from $(LIBOJBS)+$(STUBOBJS)
+# Build $(LIBRARY) from $(LIBOBJS)+$(STUBOBJS)
 #
 # Inputs:
 #   $(LIBOBJS)
@@ -414,11 +412,22 @@ ifneq "$(way)" "u"
 
 SRC_HC_OPTS += -split-objs
 
+ifeq "$(ArSupportsInput)" ""
 define BUILD_LIB
 $(RM) $@
 (echo $(STUBOBJS); $(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o') | xargs ar q $@
 $(RANLIB) $@
 endef
+else
+define BUILD_LIB
+$(RM) $@
+echo $(STUBOBJS) > $@.list
+$(FIND) $(patsubst %.$(way_)o,%,$(LIBOBJS)) -name '*.$(way_)o' >> $@.list
+$(AR) $(AR_OPTS) $@ $(ArSupportsInput) $@.list
+$(RM) $@.list
+$(RANLIB) $@
+endef
+endif
 
 # Extra stuff for compiling Haskell files with $(SplitObjs):
 
@@ -519,10 +528,13 @@ endif # GHCI_LIBRARY
 #
 
 ifeq "$(DLLized)" "YES"
+SRC_CC_OPTS += -DDLLized
 
 ifneq "$(PACKAGE)" ""
 
 SRC_BLD_DLL_OPTS += --export-all --output-def=HS$(PACKAGE)$(_cbits)$(_way).def DllVersionInfo.$(way_)o
+
+ifneq "$(PACKAGE) $(IS_CBITS_LIB)" "std YES"
 ifneq "$(PACKAGE)" "rts"
 SRC_BLD_DLL_OPTS += -lHSstd_cbits_imp -L$(GHC_LIB_DIR)/std/cbits
 SRC_BLD_DLL_OPTS += -lHSrts_$(way_)imp -L$(GHC_RUNTIME_DIR)
@@ -532,6 +544,8 @@ ifneq "$(PACKAGE)" "std"
   endif
 endif
 endif
+endif
+
 SRC_BLD_DLL_OPTS += -lgmp -L. -L$(GHC_RUNTIME_DIR)/gmp
 ifeq "$(IS_CBITS_LIB)" ""
 SRC_BLD_DLL_OPTS += $(patsubst %,-lHS%_$(way_)imp, $(PACKAGE_DEPS))
@@ -967,11 +981,11 @@ install-strip::
 	@$(MAKE) EXTRA_INSTALL_OPTS='-s' install                                	
 endif
 
-###########################################
+##############################################################################
 #
 #	Targets: check tags show
 #
-###########################################
+##############################################################################
 
 #------------------------------------------------------------
 # 			Check
@@ -1009,11 +1023,14 @@ endif
 #
 
 show:
-	@echo '$(VALUE)=$($(VALUE))'
+	@echo '$(VALUE)="$($(VALUE))"'
 
-#--------------------------------------------------------------------------
-# SGML Documentation
+################################################################################
+#
+#			SGML Documentation
 #
+################################################################################
+
 .PHONY: dvi ps html pdf rtf
 
 ifneq "$(SGML_DOC)" ""
@@ -1052,11 +1069,11 @@ extraclean ::
 	$(RM) -rf $(SGML_DOC)
 endif
 
-###########################################
+##############################################################################
 #
 #	Targets: clean
 #
-###########################################
+##############################################################################
 
 # we have to be careful about recursion here; since all the clean
 # targets are recursive, we don't want to make eg. distclean depend on
@@ -1081,11 +1098,11 @@ maintainer-clean:: extraclean
 	@echo 'deletes files that may need special tools to rebuild.'
 	rm -f $(MOSTLY_CLEAN_FILES) $(CLEAN_FILES) $(DIST_CLEAN_FILES) $(MAINTAINER_CLEAN_FILES)
 
-#################################################################################
+################################################################################
 #
 #			Way management
 #
-#################################################################################
+################################################################################
 
 # Here is the ingenious jiggery pokery that allows you to build multiple versions
 # of a program in a single build tree.
@@ -1140,6 +1157,16 @@ $(LIB_WAY_TARGETS) :
 
 endif	# if way
 
+# -------------------------------------------------------------------------
+# Object and interface files have suffixes tagged with their ways
+
+ifneq "$(way)" ""
+SRC_HC_OPTS += -hisuf $(way_)hi -hcsuf $(way_)hc -osuf $(way_)o
+endif
+
+# -------------------------------------------------------------------------
+# Rules to invoke the current target recursively for each way
+
 ifneq "$(WAYS)" ""
 ifeq "$(way)" ""