Reviewed by Tim H.

[WebKit-https.git] / Makefile.shared

diff --git a/Makefile.shared b/Makefile.shared
index 8cdb30b1f38a5ae5895a5bb6c73e4a8f93b3133c..325a398dc62f3ff86e58d872e93559ad711f3679 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,16 +1,20 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'`
-XCODE_OPTIONS_NO_CONFIG = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionStringNoConfig()'`
+XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)

 
 all:
        xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
 
 
 all:
        xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
 

-debug d development dev develop:
+debug d development dev develop: force

        ../WebKitTools/Scripts/set-webkit-configuration --debug
        ../WebKitTools/Scripts/set-webkit-configuration --debug

-       xcodebuild $(OTHER_OPTIONS) -configuration Debug $(XCODE_OPTIONS_NO_CONFIG)
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)

 
 

-release r deployment dep deploy:
+release r deployment dep deploy: force

        ../WebKitTools/Scripts/set-webkit-configuration --release
        ../WebKitTools/Scripts/set-webkit-configuration --release

-       xcodebuild $(OTHER_OPTIONS) -configuration Release $(XCODE_OPTIONS_NO_CONFIG)
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+
+universal u: force
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386'

 
 clean:
        xcodebuild -alltargets clean $(XCODE_OPTIONS)
 
 clean:
        xcodebuild -alltargets clean $(XCODE_OPTIONS)

+
+force: ;