top level:

        Add a SCRIPTS_PATH variable so Makefiles of differnet nested directories can
        still use this one Makefile.shared as an include.

        * Makefile.shared:

WebKitTools:

        Remove the redundant copies of Makefile.shared and the new Makefile.Drosera.
        Now included the main Makefile.shared and change the SCRIPTS_PATH variable as needed.

        * Drosera/Makefile: Added.
        * Drosera/mac/Makefile:
        * DumpRenderTree/Makefile:
        * Makefile:
        * Makefile.Drosera: Removed.
        * Makefile.shared: Removed.

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

diff --git a/ChangeLog b/ChangeLog
index 8e92944bdbfb695a29eac1cbf12255adee31af6f..c1179649e1cf3fd0d5b27153bca07dc329c306b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-07-18  Timothy Hatcher  <timothy@apple.com>
+
+        Add a SCRIPTS_PATH variable so Makefiles of differnet nested directories can
+        still use this one Makefile.shared as an include.
+
+        * Makefile.shared:
+
 2007-07-12  George Staikos  <staikos@kde.org>
 
         Fix build in debug mode.

diff --git a/Makefile.shared b/Makefile.shared
index df3389ca3b000372508d3f65f980cbb1616a2b60..a036aacc50e8e93ce7e30dae6bc435f8490a3ca8 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -1,20 +1,21 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
 all:
        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 debug d development dev develop: force
-       ../WebKitTools/Scripts/set-webkit-configuration --debug
+       $(SCRIPTS_PATH)/set-webkit-configuration --debug
        ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 release r deployment dep deploy: force
-       ../WebKitTools/Scripts/set-webkit-configuration --release
+       $(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]} )
 
 clean:
-       ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+       ( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 force: ;

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b22f25b24d65dcdf8e39ab012c437603ef6bedf6..05fb2cedc8a09699f47ca228a859dfe4596a4c59 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2007-07-18  Timothy Hatcher  <timothy@apple.com>
+
+        Remove the redundant copies of Makefile.shared and the new Makefile.Drosera.
+        Now included the main Makefile.shared and change the SCRIPTS_PATH variable as needed.
+
+        * Drosera/Makefile: Added.
+        * Drosera/mac/Makefile:
+        * DumpRenderTree/Makefile:
+        * Makefile:
+        * Makefile.Drosera: Removed.
+        * Makefile.shared: Removed.
+
 2007-07-18  Timothy Hatcher  <timothy@apple.com>
 
         The console log was 20px down from the top for no reason, move it up.

diff --git a/WebKitTools/Drosera/Makefile b/WebKitTools/Drosera/Makefile
new file mode 100644 (file)
index 0000000..4fce090
--- /dev/null
+++ b/WebKitTools/Drosera/Makefile
@@ -0,0 +1,3 @@
+OTHER_OPTIONS = -project mac/Drosera.xcodeproj
+SCRIPTS_PATH = ../Scripts
+include ../../Makefile.shared

diff --git a/WebKitTools/Drosera/mac/Makefile b/WebKitTools/Drosera/mac/Makefile
index 7956c67aca60807d7a000401903a839125c71845..058c21e1ba387a8ba4fc43f1444c380eec79ede9 100644 (file)
--- a/WebKitTools/Drosera/mac/Makefile
+++ b/WebKitTools/Drosera/mac/Makefile
@@ -1 +1,2 @@
-include ../../Makefile.Drosera
+SCRIPTS_PATH = ../../Scripts
+include ../../../Makefile.shared

diff --git a/WebKitTools/DumpRenderTree/Makefile b/WebKitTools/DumpRenderTree/Makefile
index cb4c11a57c6739a1426a5bb9d812b73001e69d91..1f1dbbcb30fd47748dc187236083301f6dd7b6b5 100644 (file)
--- a/WebKitTools/DumpRenderTree/Makefile
+++ b/WebKitTools/DumpRenderTree/Makefile
@@ -1 +1,2 @@
-include ../Makefile.shared
+SCRIPTS_PATH = ../Scripts
+include ../../Makefile.shared

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
index cade71b6c2537f9eb241ede5967a70139aca1235..a0f946a0007704f9966afb7a41a8ba625e546fb0 100644 (file)
--- a/WebKitTools/Makefile
+++ b/WebKitTools/Makefile
@@ -1,4 +1,4 @@
-MODULES = Drosera/mac DumpRenderTree
+MODULES = Drosera DumpRenderTree
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

diff --git a/WebKitTools/Makefile.Drosera b/WebKitTools/Makefile.Drosera
deleted file mode 100644 (file)
index 6cc76e8..0000000
--- a/WebKitTools/Makefile.Drosera
+++ /dev/null
@@ -1,20 +0,0 @@
-XCODE_OPTIONS = `perl -I../../Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
-
-all:
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-debug d development dev develop: force
-       ../../Scripts/set-webkit-configuration --debug
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-release r deployment dep deploy: force
-       ../../Scripts/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]} )
-
-clean:
-       ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-force: ;

diff --git a/WebKitTools/Makefile.shared b/WebKitTools/Makefile.shared
deleted file mode 100644 (file)
index 8a42f12..0000000
--- a/WebKitTools/Makefile.shared
+++ /dev/null
@@ -1,20 +0,0 @@
-XCODE_OPTIONS = `perl -I../Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
-
-all:
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-debug d development dev develop: force
-       ../Scripts/set-webkit-configuration --debug
-       ( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-release r deployment dep deploy: force
-       ../Scripts/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]} )
-
-clean:
-       ( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
-
-force: ;