From: darin <darin@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 4 May 2005 23:50:05 +0000 (+0000)
Subject:         Reviewed by Dave Hyatt.
X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=commitdiff_plain;h=ea9eb3bec8a20f0fc6b4fd4d5f7e54c9d02e0e36

    Reviewed by Dave Hyatt.

        - fixed build rules to match other projects

        * JavaScriptCore.pbproj/project.pbxproj: Set deployment target to 10.3 in the build styles.
        When built without a build style (by Apple B&I) we want to get the target from the
        environment. But when built with a build style (by Safari engineers and others), we want
        to use 10.3.

        * Makefile.am: Took out extra parameters that make command-line building different from
        Xcode building. Now that this is fixed, you should not get a full rebuild if you switch
        from command line to Xcode or back.


git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9107 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index b14740792bb0..2027d37f3e05 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,18 @@
+2005-05-04  Darin Adler  <darin@apple.com>
+
+        Reviewed by Dave Hyatt.
+
+        - fixed build rules to match other projects
+
+        * JavaScriptCore.pbproj/project.pbxproj: Set deployment target to 10.3 in the build styles.
+        When built without a build style (by Apple B&I) we want to get the target from the
+        environment. But when built with a build style (by Safari engineers and others), we want
+        to use 10.3.
+
+        * Makefile.am: Took out extra parameters that make command-line building different from
+        Xcode building. Now that this is fixed, you should not get a full rebuild if you switch
+        from command line to Xcode or back.
+
 2005-05-04  Maciej Stachowiak  <mjs@apple.com>
 
         - revert presumably accidental change to mozilla JS test expected results, this
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 0f484806e471..c5ccd9a83864 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -10,6 +10,7 @@
 				DEBUG_DEFINES = "";
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
 				GCC_OPTIMIZATION_LEVEL = 0;
+				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				PREBINDING = NO;
 				SECTORDER_FLAGS = "";
 				STYLE_LDFLAGS = "";
@@ -19,6 +20,7 @@
 		};
 		014CEA450018CDF011CA2923 = {
 			buildSettings = {
+				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				PREBINDING = NO;
 				SECTORDER_FLAGS = "";
 				STYLE_LDFLAGS = "";
@@ -2655,6 +2657,7 @@
 		F58C8A1D025BD408018635CA = {
 			buildSettings = {
 				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
+				MACOSX_DEPLOYMENT_TARGET = 10.3;
 				PREBINDING = NO;
 				SECTORDER_FLAGS = "";
 				STYLE_LDFLAGS = "";
diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index 77a0f901a786..ad8c49e76eec 100644
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -1,6 +1,4 @@
 all-am:
-	xcodebuild -target All -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
+	xcodebuild -target All -buildstyle $(BUILDSTYLE)
 clean-am:
-	xcodebuild -target All clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS)
-	rm -rf $(SYMROOTS)/JavaScriptCore.build
-	rm -rf $(SYMROOTS)/JavaScriptCore.framework
+	xcodebuild -target All clean