Updated makefiles used by Apple engineers to fix build with the

new JavaScriptGlue location.

* Makefile: Told this to build JavaScriptGlue. Some day we might
want it to descend into Sources instead and use the Makefile there,
but there are problems with sequencing the project builds, so that
can wait.
* Sources/Makefile.shared: Added.

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

diff --git a/ChangeLog b/ChangeLog
index f8fcecdd51505d24a33dbd3ada445ada7d4ec297..fe0402ab22d1e79671010e2d32f6559f02f7109e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-24  Darin Adler  <darin@apple.com>
+
+        Updated makefiles used by Apple engineers to fix build with the
+        new JavaScriptGlue location.
+
+        * Makefile: Told this to build JavaScriptGlue. Some day we might
+        want it to descend into Sources instead and use the Makefile there,
+        but there are problems with sequencing the project builds, so that
+        can wait.
+        * Sources/Makefile.shared: Added.
+
 2010-12-24  Ryuan Choi  <ryuan.choi@samsung.com>
 
         Reviewed by Kenneth Rohde Christiansen.

diff --git a/Makefile b/Makefile
index b2a15810452d1ebe35e25ec8a54c3ef82b395335..bdf70b22857a53bda017e51c404a9faa9497f019 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-MODULES = JavaScriptCore ANGLE WebCore WebKit WebKit2 Tools 
+MODULES = JavaScriptCore Sources/JavaScriptGlue ANGLE WebCore WebKit WebKit2 Tools 
 
 all:
        @for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \

diff --git a/Sources/Makefile.shared b/Sources/Makefile.shared
new file mode 100644 (file)
index 0000000..95e48d6
--- /dev/null
+++ b/Sources/Makefile.shared
@@ -0,0 +1,2 @@
+SCRIPTS_PATH ?= ../../Tools/Scripts
+include ../../Makefile.shared