From c2fc87167b086680aa8b7190e497e834413bfc7d Mon Sep 17 00:00:00 2001
From: stuconnolly <stuart02@gmail.com>
Date: Mon, 7 May 2012 14:04:58 +0000
Subject: Update make files to support accepting xcode default settings.

---
 Frameworks/QueryKit/Makefile                       | 27 ++++++++++++++++++++++
 .../QueryKit/QueryKit.xcodeproj/project.pbxproj    | 10 +-------
 Makefile                                           | 11 +++++----
 3 files changed, 34 insertions(+), 14 deletions(-)
 create mode 100644 Frameworks/QueryKit/Makefile

diff --git a/Frameworks/QueryKit/Makefile b/Frameworks/QueryKit/Makefile
new file mode 100644
index 00000000..d6322e51
--- /dev/null
+++ b/Frameworks/QueryKit/Makefile
@@ -0,0 +1,27 @@
+# $Id$
+
+CONFIG=Debug
+OPTIONS=
+
+BUILD_CONFIG?=$(CONFIG)
+
+CP=ditto --rsrc
+RM=rm
+
+.PHONY: querykit test clean clean-all latest
+
+querykit:
+	xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) build
+
+test:
+	xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" -target Tests $(OPTIONS) build
+
+clean:
+	xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) -nodependencies clean
+
+clean-all:
+	xcodebuild -project QueryKit.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) clean
+
+latest:
+	svn update
+	make querykit
diff --git a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
index 8b5221ae..5a226510 100644
--- a/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
+++ b/Frameworks/QueryKit/QueryKit.xcodeproj/project.pbxproj
@@ -230,7 +230,6 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 17E596A614F307CE0054EE08 /* Build configuration list for PBXNativeTarget "Tests" */;
 			buildPhases = (
-				17E5969914F307CE0054EE08 /* Resources */,
 				17E5969A14F307CE0054EE08 /* Sources */,
 				17E5969B14F307CE0054EE08 /* Frameworks */,
 				17E5969C14F307CE0054EE08 /* ShellScript */,
@@ -291,13 +290,6 @@
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		17E5969914F307CE0054EE08 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
 		8DC2EF520486A6940098B216 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
@@ -319,7 +311,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
+			shellScript = "\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/Makefile b/Makefile
index 8b9015c3..f27b61f3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,7 @@
 # $Id$
 
 CONFIG=Debug
+OPTIONS=
 
 BUILD_CONFIG?=$(CONFIG)
 
@@ -10,19 +11,19 @@ RM=rm
 .PHONY: sequel-pro test clean clean-all localize latest
 
 sequel-pro:
-	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" build
+	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) build
 
 test:
-	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" -target "Unit Tests" build
+	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" -target "Unit Tests" $(OPTIONS) build
 
 clean:
-	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" -nodependencies clean
+	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) -nodependencies clean
 
 clean-all:
-	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" clean
+	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" $(OPTIONS) clean
 
 localize:
-	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" -target Localize
+	xcodebuild -project sequel-pro.xcodeproj -configuration "$(BUILD_CONFIG)" CFLAGS="$(SP_CFLAGS)" $(OPTIONS) -target Localize
 
 latest:
 	svn update
-- 
cgit v1.2.3