Reviewed by Anders.

        Drosera will be built when you type make.

        * Drosera/Makefile: Added.
        * Makefile: Added.
        * Makefile.shared: Added.

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

diff --git a/Makefile b/Makefile
index bb2a521..770a350 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit
+MODULES = JavaScriptCore JavaScriptGlue WebCore WebKit WebKitTools
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d5eee84..52dfa72 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2006-08-27  Timothy Hatcher  <timothy@apple.com>
+
+        Reviewed by Anders.
+
+        Drosera will be built when you type make.
+
+        * Drosera/Makefile: Added.
+        * Makefile: Added.
+        * Makefile.shared: Added.
+
 2006-08-27  Anders Carlsson  <acarlsson@apple.com>
 
         Forgot to add these.

diff --git a/WebKitTools/Drosera/Makefile b/WebKitTools/Drosera/Makefile
new file mode 100644 (file)
index 0000000..cb4c11a
--- /dev/null
+++ b/WebKitTools/Drosera/Makefile
@@ -0,0 +1 @@
+include ../Makefile.shared

diff --git a/WebKitTools/Makefile b/WebKitTools/Makefile
new file mode 100644 (file)
index 0000000..2a7c02d
--- /dev/null
+++ b/WebKitTools/Makefile
@@ -0,0 +1,13 @@
+MODULES = Drosera
+
+all:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+
+debug d development dev develop:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+
+release r deployment dep deploy:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done
+
+clean:
+       @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; if [ $$? -ne 0 ]; then break; fi; done

diff --git a/WebKitTools/Makefile.shared b/WebKitTools/Makefile.shared
new file mode 100644 (file)
index 0000000..12fda53
--- /dev/null
+++ b/WebKitTools/Makefile.shared
@@ -0,0 +1,17 @@
+XCODE_OPTIONS = `perl -I../Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+
+all:
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+
+debug d development dev develop: force
+       ../Scripts/set-webkit-configuration --debug
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+
+release r deployment dep deploy: force
+       ../Scripts/set-webkit-configuration --release
+       xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS)
+
+clean:
+       xcodebuild -alltargets clean $(XCODE_OPTIONS)
+
+force: ;