From 57d955bbfc1b5154002d6a71d2fe8a3b637b7593 Mon Sep 17 00:00:00 2001 From: thatcher Date: Wed, 18 Jul 2007 13:55:11 +0000 Subject: [PATCH] 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: https://svn.webkit.org/repository/webkit/trunk@24409 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 7 +++++++ Makefile.shared | 9 +++++---- WebKitTools/ChangeLog | 12 ++++++++++++ WebKitTools/Drosera/Makefile | 3 +++ WebKitTools/Drosera/mac/Makefile | 3 ++- WebKitTools/DumpRenderTree/Makefile | 3 ++- WebKitTools/Makefile | 2 +- WebKitTools/Makefile.Drosera | 20 -------------------- WebKitTools/Makefile.shared | 20 -------------------- 9 files changed, 32 insertions(+), 47 deletions(-) create mode 100644 WebKitTools/Drosera/Makefile delete mode 100644 WebKitTools/Makefile.Drosera delete mode 100644 WebKitTools/Makefile.shared diff --git a/ChangeLog b/ChangeLog index 8e92944bdbfb..c1179649e1cf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-07-18 Timothy Hatcher + + 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 Fix build in debug mode. diff --git a/Makefile.shared b/Makefile.shared index df3389ca3b00..a036aacc50e8 100644 --- 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 b22f25b24d65..05fb2cedc8a0 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,15 @@ +2007-07-18 Timothy Hatcher + + 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 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 index 000000000000..4fce09024605 --- /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 7956c67aca60..058c21e1ba38 100644 --- 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 cb4c11a57c67..1f1dbbcb30fd 100644 --- 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 cade71b6c253..a0f946a00077 100644 --- 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 index 6cc76e896606..000000000000 --- 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 index 8a42f12a5dae..000000000000 --- 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: ; -- 2.36.0