top level:

        Rubber stamped by Tim Hatcher

        Added "make universal" to build universal binaries

        * Makefile:
        * Makefile.shared:

WebKitTools:

        Rubber stamped by Tim Hatcher

        Added "make universal" to build universal binaries

        * Makefile:
        * Makefile.shared:

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

diff --git a/ChangeLog b/ChangeLog
index dcc6f58544c5ceef71a230468fd5d6c1ed903a58..9d666891ec006d174a5b15ae39838d3e3ced8103 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-27  Brady Eidson  <beidson@apple.com>
+
+        Rubber stamped by Tim Hatcher
+
+        Added "make universal" to build universal binaries
+
+        * Makefile:
+        * Makefile.shared:
+
 2006-10-01  Nikolas Zimmermann  <zimmermann@kde.org>
 
         Reviewed by eseidel.

diff --git a/Makefile b/Makefile
index 770a350414d4ee3622bce886ade28ef94a160881..42283bb6a4197dd1278be39e6e8e6b1a354bbbac 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,5 +9,8 @@ debug d development dev develop:
 release r deployment dep deploy:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
 
+universal u:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+
 clean:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done

diff --git a/Makefile.shared b/Makefile.shared
index 8b9421d883ff8c098be747044c78cebf396c1531..325a398dc62f3ff86e58d872e93559ad711f3679 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -11,6 +11,9 @@ release r deployment dep deploy: force
        ../WebKitTools/Scripts/set-webkit-configuration --release
        xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
 
+universal u: force
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386'
+
 clean:
        xcodebuild -alltargets clean $(XCODE_OPTIONS)
 

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e37b79889a13562f0c0fca2455f2fe6a5083543d..c113eecbed332bf4044b929adca24343b3a271a2 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2006-10-27  Brady Eidson  <beidson@apple.com>
+
+        Rubber stamped by Tim Hatcher
+
+        Added "make universal" to build universal binaries
+
+        * Makefile:
+        * Makefile.shared:
+
 2006-10-26  Sam Weinig  <sam.weinig@gmail.com>
 
         Reviewed by Geoff.

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index 378feb97fdcb3d897ee15dcfd254e357b8f1042a..05624248ac0d21852980d2fe30b78218716adeb0 100644 (file)
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -9,5 +9,8 @@ debug d development dev develop:
 release r deployment dep deploy:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
 
+universal u:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+
 clean:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done

diff --git a/WebKitTools/Makefile.shared b/WebKitTools/Makefile.shared
index 12fda5331c993247692e02bff61003c0b7e44d0e..0f8c148dbc0cf5ba46b7e8ca9644613f203e878b 100644 (file)
--- a/WebKitTools/Makefile.shared
+++ b/WebKitTools/Makefile.shared
@@ -11,6 +11,9 @@ release r deployment dep deploy: force
        ../Scripts/set-webkit-configuration --release
        xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
 
+universal u: force
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386'
+
 clean:
        xcodebuild -alltargets clean $(XCODE_OPTIONS)