projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a8783f0
)
make the clean_libraries target work, so you can "make clean" in libraries/
author
Ian Lynagh
<igloo@earth.li>
Sat, 30 May 2009 18:47:50 +0000
(18:47 +0000)
committer
Ian Lynagh
<igloo@earth.li>
Sat, 30 May 2009 18:47:50 +0000
(18:47 +0000)
ghc.mk
patch
|
blob
|
history
rules/build-package.mk
patch
|
blob
|
history
diff --git
a/ghc.mk
b/ghc.mk
index
61e17ee
..
aecbb5c
100644
(file)
--- a/
ghc.mk
+++ b/
ghc.mk
@@
-894,10
+894,14
@@
CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
CLEAN_FILES += libraries/bootstrapping.conf
CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
CLEAN_FILES += libraries/bootstrapping.conf
-clean : clean_files
+clean : clean_files clean_libraries
+
.PHONY: clean_files
clean_files :
$(RM) $(CLEAN_FILES)
.PHONY: clean_files
clean_files :
$(RM) $(CLEAN_FILES)
+
+.PHONY: clean_libraries
+clean_libraries:
$(RM) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2))
$(RM) -r $(patsubst %, libraries/%/dist-install, $(PACKAGES) $(PACKAGES_STAGE2))
$(RM) -r $(patsubst %, libraries/%/dist-boot, $(PACKAGES) $(PACKAGES_STAGE2))
$(RM) -r $(patsubst %, libraries/%/dist, $(PACKAGES) $(PACKAGES_STAGE2))
$(RM) -r $(patsubst %, libraries/%/dist-install, $(PACKAGES) $(PACKAGES_STAGE2))
$(RM) -r $(patsubst %, libraries/%/dist-boot, $(PACKAGES) $(PACKAGES_STAGE2))
diff --git
a/rules/build-package.mk
b/rules/build-package.mk
index
8fa110f
..
b5a1239
100644
(file)
--- a/
rules/build-package.mk
+++ b/
rules/build-package.mk
@@
-45,10
+45,8
@@
$(call all-target,$1,all_$1_$2)
$(call clean-target,$1,$2,$1/$2)
# This give us things like
# all_libraries: all_libraries/base_dist-install
$(call clean-target,$1,$2,$1/$2)
# This give us things like
# all_libraries: all_libraries/base_dist-install
-# clean_libraries: clean_libraries/base_dist-install
ifneq "$$($1_$2_GROUP)" ""
all_$$($1_$2_GROUP): all_$1_$2
ifneq "$$($1_$2_GROUP)" ""
all_$$($1_$2_GROUP): all_$1_$2
-clean_$$($1_$2_GROUP): clean_$1_$2
endif
distclean : clean_$1_$2_config
endif
distclean : clean_$1_$2_config