Remove rarely used Makefile targets from the Makefile.

There are many situations in which the targets don't work as expected,
and their primary use is addressed by having the build system default
to building the appropriate architecture.

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

diff --git a/ChangeLog b/ChangeLog
index 7e29a272925c5ac03fe4479d8254f1e48068ea19..5e98ecb9ddbe70a3f5cbdbf1e564e9cf1511705f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-03-13  Mark Rowe  <mrowe@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Remove rarely used Makefile targets from the Makefile.
+
+        There are many situations in which the targets don't work as expected,
+        and their primary use is addressed by having the build system default
+        to building the appropriate architecture.
+
+        * Makefile.shared:
+
 2009-03-11  Jan Michael Alonzo  <jmalonzo@webkit.org>
 
         Reviewed by Holger Freyther.

diff --git a/Makefile b/Makefile
index 217a03548386e22ed68646383be7a03b034db05a..24a6f0d94544cf308967bbbcaa815ead81def704 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,22 +12,6 @@ release r deployment dep deploy:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-universal u:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-x86_64:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64u:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
 clean:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done

diff --git a/Makefile.shared b/Makefile.shared
index dfad6fb54c727e07b21585cb3385ee9ca52dd6a9..aa9fa728d6d9c25197bd8d62d39bc06aa6812c3f 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -12,18 +12,6 @@ release r deployment dep deploy: force
        $(SCRIPTS_PATH)/set-webkit-configuration --release
        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
-universal u: force
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-x86_64: force
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64: force
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-64u: force
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc ppc64 i386 x86_64' | grep -v setenv && exit $${PIPESTATUS[0]} )
-
 clean:
        ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index 45bca062e5f2cc2069b6ba1c6d15d362d0431511..92f5b25037a97fc23d5d089f912636f3e206fc47 100644 (file)
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -12,22 +12,6 @@ release r deployment dep deploy:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
 
-universal u:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-x86_64:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
-64u:
-       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
-       if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done
-
 clean:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
        if [ $$exit_status -ne 0 ]; then exit $$exit_status; fi; done