top level:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * configure.in: Update code to set up Xcode build directory instead of setting the
        Project Builder build directory.
        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.

Tools:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * CommitLogEditor/Makefile.am: Set up Xcode build directory before invoking xcodebuild.
        * HotSpotFinder/Makefile.am: Set up Xcode build directory before invoking xcodebuild.
        * jst/Makefile.am: Set up Xcode build directory before invoking xcodebuild.

JavaScriptCore:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.

Tests:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.
        * TestBindingsPlugin/Makefile.am: Set up Xcode build directory before invoking xcodebuild.

WebCore:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.

WebKit:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.

WebBrowser:

        Reviewed by Maciej.

        - make building multiple trees with make work better

        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index e65fe7e6cd879fe38a42f5dbab726356e95f1ddf..d32de4e966f4415705e713677b9fa359c51d8e0c 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-06  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - make building multiple trees with make work better
+
+        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.
+
 2005-05-04  Maciej Stachowiak  <mjs@apple.com>
 
         Reviewed by Darin.

diff --git a/JavaScriptCore/Makefile.am b/JavaScriptCore/Makefile.am
index ad8c49e76eec506a95a490c49f6c7efd0e5761d6..aee7b1fefbbb327b3da93132e3b766845b522483 100644 (file)
--- a/JavaScriptCore/Makefile.am
+++ b/JavaScriptCore/Makefile.am
@@ -1,4 +1,8 @@
 all-am:
+       defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
+       defaults delete com.apple.Xcode PBXIntermediatesDirectory || echo -n
        xcodebuild -target All -buildstyle $(BUILDSTYLE)
 clean-am:
+       defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
+       defaults delete com.apple.Xcode PBXIntermediatesDirectory || echo -n
        xcodebuild -target All clean

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index faddb64c19ec8f56eeadd2b597bbefb318f33f08..711d9940e730bf17c5ef1b9f2b5a2f8c9489ce5e 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2005-05-06  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - make building multiple trees with make work better
+
+        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.
+
 2005-05-05  David Hyatt  <hyatt@apple.com>
 
        Eliminate the FOUCS on wired.com.  innerWidth and innerHeight on window should not do a layout that ignores

diff --git a/WebCore/Makefile.am b/WebCore/Makefile.am
index be9bc7baf3d342366ccfd6ed18d7b8b68804a090..d41d06288052f6a315132f2edc61c1e87bff160e 100644 (file)
--- a/WebCore/Makefile.am
+++ b/WebCore/Makefile.am
@@ -1,6 +1,8 @@
 all-am:
-       xcodebuild -buildstyle $(BUILDSTYLE) OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
+       defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
+       defaults delete com.apple.Xcode PBXIntermediatesDirectory || echo -n
+       xcodebuild -buildstyle $(BUILDSTYLE)
 clean-am:
-       xcodebuild clean OBJROOT=$(SYMROOTS) SYMROOT=$(SYMROOTS) DSTROOT=$(SYMROOTS) 
-       rm -rf $(SYMROOTS)/WebCore.build
-       rm -rf $(SYMROOTS)/WebCore.framework
+       defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
+       defaults delete com.apple.Xcode PBXIntermediatesDirectory || echo -n
+       xcodebuild clean

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 15487d6a19cae1e009e0015acbcd2b1eaad04cdf..39102f94c8516af477c9bba4678e91af012e93b2 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-06  Darin Adler  <darin@apple.com>
+
+        Reviewed by Maciej.
+
+        - make building multiple trees with make work better
+
+        * Makefile.am: Set up Xcode build directory before invoking xcodebuild.
+
 2005-05-04  Darin Adler  <darin@apple.com>
 
         Reviewed by Dave Hyatt.

diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index ef8cc4a6cf715da9db1b677df5e4e5967fbcd84a..656c5436abf30f761e46850c761221ec53ac6be1 100644 (file)
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -1,6 +1,10 @@
 all-am:
+       defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
+       defaults delete com.apple.Xcode PBXIntermediatesDirectory || echo -n
        xcodebuild -buildstyle $(BUILDSTYLE)
 clean-am:
+       defaults write com.apple.Xcode PBXProductDirectory "$(SYMROOTS)"
+       defaults delete com.apple.Xcode PBXIntermediatesDirectory || echo -n
        xcodebuild clean
 doc: all
        ../Tools/Scripts/make-docs $(SYMROOTS)/Documentation/WebKit $(SYMROOTS)/WebKit.framework/Headers