[Swift-commit] r3997 - SwiftApps/SwiftR

[noreply at svn.ci.uchicago.edu]

Author: tga
Date: 2011-01-18 11:30:56 -0600 (Tue, 18 Jan 2011)
New Revision: 3997

Modified:
   SwiftApps/SwiftR/Makefile
Log:
Tweaks to makefile:
* Forces rebuild of SwiftR package always, without checking for modification
* Avoids copying over swift directory unless you run clean


Modified: SwiftApps/SwiftR/Makefile
===================================================================
--- SwiftApps/SwiftR/Makefile	2011-01-18 16:35:23 UTC (rev 3996)
+++ SwiftApps/SwiftR/Makefile	2011-01-18 17:30:56 UTC (rev 3997)
@@ -12,8 +12,13 @@
 all: build
 
 
-build: $(TBALL)
+build: Swift/inst/swift/bin/swift
+	R CMD build Swift
 
+# Target to make sure that swift exists
+Swift/inst/swift/bin/swift:
+	mkdir -p Swift/inst/swift
+	cp -pr $(SWIFT_PATH)/* Swift/inst/swift
 
 publish: $(TBALL)
 	cp $(TBALL) ~/public_html
@@ -25,10 +30,7 @@
 	rm -rf Swift/inst/swift/*
 	rm $(TBALL)
 
-$(TBALL): 
-	mkdir -p Swift/inst/swift
-	cp -pr $(SWIFT_PATH)/* Swift/inst/swift
-	R CMD build Swift
+$(TBALL): build
 
 checkversion: 
 	echo SwiftR version is $(SWIFTR_VERSION) according to Swift/DESCRIPTION file