summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2009-07-31 18:38:11 (GMT)
committerKevin Smith <git@kismith.co.uk>2009-07-31 18:38:11 (GMT)
commit99b65c4dd72105755a7cf95297c9cf69dcbc6446 (patch)
treec6c862f6ef33b2260c44c0229b29f65351223e7c /Makefile
parentfed11bbc3bffd383e097ea63bb92442ce2daf6ed (diff)
parentaa60aa80d2d170a536c246ef6c221f92de7dd8ed (diff)
downloadswift-99b65c4dd72105755a7cf95297c9cf69dcbc6446.zip
swift-99b65c4dd72105755a7cf95297c9cf69dcbc6446.tar.bz2
Merge commit 'origin/master' into roster
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile17
1 files changed, 5 insertions, 12 deletions
diff --git a/Makefile b/Makefile
index 8ea2c13..b93c85f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
include Makefile.config
-CXXFLAGS += -I.
-CFLAGS += -I.
+CXXFLAGS += -I$(PWD)
+CFLAGS += -I$(PWD)
ARFLAGS = rcs
.DEFAULT_GOAL = all
@@ -66,16 +66,9 @@ coverage:
tools/coverage/GenerateCoverageResults.sh
.PHONY: clean
-clean: clean-deps $(CLEAN_TARGETS)
-
- -$(RM) $(CLEANFILES) *.gcov
- -find . -name "*.gcda" -exec rm {} \;
- -find . -name "*.gcno" -exec rm {} \;
-
-.PHONY: clean-deps
-clean-deps:
- -$(RM) $(DEPS)
-
+clean: $(CLEAN_TARGETS)
+ -rm -rf $(CLEANFILES)
+ -find . \( -name "*.dep" -or -name "*.a" -or -name "*.o" -or -name "*.obj" -or -name "*.gcda" -or -name "*.gcno" -or -name "*.gcov" \) -exec rm {} \;
################################################################################
# Automatic dependency detection