projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove a done TODO item
[ghc-hetmet.git]
/
ghc.mk
diff --git
a/ghc.mk
b/ghc.mk
index
f77f9eb
..
64d317b
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-53,7
+53,6
@@
#
# * 2966 make sure --with-gcc does the right thing (#2966)
# * 1693 make distclean
#
# * 2966 make sure --with-gcc does the right thing (#2966)
# * 1693 make distclean
-# * 2689 make maintainer-clean
# * 3173 make install with DESTDIR
# Possible cleanups:
# * 3173 make install with DESTDIR
# Possible cleanups:
@@
-134,6
+133,8
@@
show:
# -----------------------------------------------------------------------------
# Include subsidiary build-system bits
# -----------------------------------------------------------------------------
# Include subsidiary build-system bits
+include mk/tree.mk
+
ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
include mk/config.mk
ifeq "$(ProjectVersion)" ""
ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
include mk/config.mk
ifeq "$(ProjectVersion)" ""
@@
-211,6
+212,10
@@
include rules/c-objs.mk
# -----------------------------------------------------------------------------
# Suffix rules
# -----------------------------------------------------------------------------
# Suffix rules
+# Suffix rules cause "make clean" to fail on Windows (trac #3233)
+# so we don't make any when cleaning.
+ifneq "$(CLEANING)" "YES"
+
include rules/hs-suffix-rules-srcdir.mk
include rules/hs-suffix-rules.mk
include rules/hs-suffix-rules-srcdir.mk
include rules/hs-suffix-rules.mk
@@
-227,6
+232,8
@@
$(foreach way,$(ALL_WAYS),\
include rules/c-suffix-rules.mk
include rules/c-suffix-rules.mk
+endif
+
# -----------------------------------------------------------------------------
# Building package-data.mk files from .cabal files
# -----------------------------------------------------------------------------
# Building package-data.mk files from .cabal files
@@
-741,6
+748,7
@@
$(eval $(call bindist,.,\
$(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \
mk/fix_install_names.sh \
mk/project.mk \
$(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \
mk/fix_install_names.sh \
mk/project.mk \
+ libraries/dph/LICENSE \
))
# mk/project.mk gets an absolute path, so we manually include it in
# the bindist with a relative path
))
# mk/project.mk gets an absolute path, so we manually include it in
# the bindist with a relative path