summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-07-24 18:09:29 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-07-24 18:09:29 (GMT)
commitf6e73393afbe7ce8d1a5c5fc55565582cb8906cc (patch)
treeb50fe99468a518e705d9ef3b8a1ae1638a07b3dc /Makefile
parent0dd979a856719f16925f84d6be532bd31044fa82 (diff)
downloadswift-contrib-f6e73393afbe7ce8d1a5c5fc55565582cb8906cc.zip
swift-contrib-f6e73393afbe7ce8d1a5c5fc55565582cb8906cc.tar.bz2
Update the build system.
Coverage now works better. Some files are cleaned by default (without the need of CLEANFILES).
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