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
+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.
-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: ;
+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.
--- /dev/null
+OTHER_OPTIONS = -project mac/Drosera.xcodeproj
+SCRIPTS_PATH = ../Scripts
+include ../../Makefile.shared
-include ../../Makefile.Drosera
+SCRIPTS_PATH = ../../Scripts
+include ../../../Makefile.shared
-include ../Makefile.shared
+SCRIPTS_PATH = ../Scripts
+include ../../Makefile.shared
-MODULES = Drosera/mac DumpRenderTree
+MODULES = Drosera DumpRenderTree
all:
@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \
+++ /dev/null
-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: ;
+++ /dev/null
-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: ;