X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Ftarget.mk;h=37a72bcc0c5243ea24035e699e072891191d3da0;hp=92188257c1eebd50564805237ace2810658a7ed5;hb=74e1368d4688ee16f6decdf2cd3ebe27506b26ba;hpb=006a18ea83799c0d4255071a2f8c08d3e9c7d84f

diff --git a/mk/target.mk b/mk/target.mk
index 9218825..37a72bc 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -83,6 +83,12 @@ ifneq "$(BootingFromHc)" "YES"
 PKGCONF_DEP = $(STAMP_PKG_CONF)
 endif
 
+ifeq "$(USE_NEW_MKDEPEND_FLAGS)" "YES"
+MKDEPENDHS_FLAGS = -dep-makefile .depend $(foreach way,$(WAYS),-dep-suffix $(way))
+else
+MKDEPENDHS_FLAGS = -optdep-f -optdep.depend $(foreach way,$(WAYS),-optdep-s -optdep$(way))
+endif
+
 depend :: $(MKDEPENDHS_SRCS) $(MKDEPENDC_SRCS) $(PKGCONF_DEP)
 	@$(RM) .depend
 	@touch .depend
@@ -93,7 +99,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) $(filter-out -split-objs, $(HC_OPTS)) $(MKDEPENDHS_SRCS)
+	$(MKDEPENDHS) -M $(MKDEPENDHS_FLAGS) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(HC_OPTS)) $(MKDEPENDHS_SRCS)
 endif
 
 
@@ -372,14 +378,14 @@ $(LIBRARY): $(LIBOBJS) $(LIBRARY).o $(LIB_DEPS)
 DLLTOOL=dlltool
 
 $(LIBRARY).def: $(LIBOBJS)
-	$(DLLTOOL) --output-def $@ --export-all $(LIBOBJS)
+	$(DLLTOOL) -D $(LIBRARY) --output-def $@ --export-all $(LIBOBJS)
 
 $(LIBRARY).o:
-	$(DLLTOOL) --output-exp $(LIBRARY).o $(LIBOBJS)
+	$(DLLTOOL) -D $(LIBRARY) --output-exp $(LIBRARY).o $(LIBOBJS)
 
 # Generates library.dll.a; by MinGW conventions, this is the dll's import library
 $(LIBRARY).a: $(LIBOBJS) $(LIBRARY).def
-	$(DLLTOOL) --def $(LIBRARY).def --output-lib $@
+	$(DLLTOOL) -D $(LIBRARY) --def $(LIBRARY).def --output-lib $@
 
 #
 # Version information is baked into a DLL by having the DLL include DllVersionInfo.o.
@@ -494,15 +500,6 @@ ifneq "$(TAGS_C_SRCS)" ""
 endif
 	@( DEREFFED=`ls -l Makefile | sed -e 's/.*-> \(.*\)/\1/g'` && $(RM) `dirname $$DEREFFED`/TAGS && $(CP) TAGS `dirname $$DEREFFED` ) 2>/dev/null || echo TAGS file generated, perhaps copy over to source tree?
 
-#------------------------------------------------------------
-# 			Makefile debugging
-# to see the effective value used for a Makefile variable, do
-#  make show VALUE=MY_VALUE
-#
-
-show:
-	@echo '$(VALUE)="$($(VALUE))"'
-
 ################################################################################
 #
 #			DocBook XML Documentation
@@ -596,7 +593,7 @@ maintainer-clean:: extraclean
 
 ifneq "$(way)" ""
 ifeq "$(findstring $(way), $(WAYS))" ""
-$(error Unknown way $(way))
+$(error Unknown way $(way) of $(WAYS))
 endif
 endif