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 /Slimber
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 'Slimber')
-rw-r--r--Slimber/CLI/Makefile.inc3
-rw-r--r--Slimber/Cocoa/Makefile.inc1
-rw-r--r--Slimber/Makefile.inc3
3 files changed, 1 insertions, 6 deletions
diff --git a/Slimber/CLI/Makefile.inc b/Slimber/CLI/Makefile.inc
index 601929c..974b835 100644
--- a/Slimber/CLI/Makefile.inc
+++ b/Slimber/CLI/Makefile.inc
@@ -7,10 +7,9 @@ SLIMBER_CLI_OBJECTS = \
$(SLIMBER_CLI_TARGET): $(SWIFTEN_TARGET) $(SLIMBER_TARGET) $(SLIMBER_CLI_OBJECTS)
$(QUIET_LINK)$(CXX) -o $(SLIMBER_CLI_TARGET) $(SLIMBER_CLI_OBJECTS) $(LDFLAGS) $(SLIMBER_TARGET) $(SWIFTEN_TARGET) $(LIBS)
-TARGETS += $(SLIMBER_CLI_TARGET)
+#TARGETS += $(SLIMBER_CLI_TARGET)
SLIMBER_TARGETS += $(SLIMBER_CLI_TARGET)
CLEANFILES += \
- $(SLIMBER_CLI_OBJECTS) \
$(SLIMBER_CLI_TARGET)
DEPS += \
$(SLIMBER_CLI_SOURCES:.cpp=.dep) \
diff --git a/Slimber/Cocoa/Makefile.inc b/Slimber/Cocoa/Makefile.inc
index 73b0f5d..28495f7 100644
--- a/Slimber/Cocoa/Makefile.inc
+++ b/Slimber/Cocoa/Makefile.inc
@@ -25,7 +25,6 @@ SLIMBER_COCOA_OBJECTS = \
$(patsubst %.m,%.o,$(patsubst %.mm,%.o,$(patsubst %.cpp,%.o, $(SLIMBER_COCOA_SOURCES))))
CLEANFILES += \
Slimber/Cocoa/PkgInfo \
- $(SLIMBER_COCOA_OBJECTS) \
$(SLIMBER_COCOA_NIBS) \
$(SLIMBER_COCOA_TARGET) \
$(SLIMBER_COCOA_BINARY)
diff --git a/Slimber/Makefile.inc b/Slimber/Makefile.inc
index 539646c..fea164f 100644
--- a/Slimber/Makefile.inc
+++ b/Slimber/Makefile.inc
@@ -6,9 +6,6 @@ SLIMBER_SOURCES = \
SLIMBER_OBJECTS = \
$(SLIMBER_SOURCES:.cpp=.o)
-CLEANFILES += \
- $(SLIMBER_OBJECTS) \
- $(SLIMBER_TARGET)
DEPS += \
$(SLIMBER_SOURCES:.cpp=.dep) \