Updated makefiles used by Apple engineers to fix build with the

darinadler · darinadler · commit d603f8e1adbc · 2010-12-24T19:26:23.000Z
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. Canonical link: https://commits.webkit.org/64983@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@74644 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git 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
@@ -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
@@ -0,0 +1,2 @@
+SCRIPTS_PATH ?= ../../Tools/Scripts
+include ../../Makefile.shared

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-MODULES = JavaScriptCore ANGLE WebCore WebKit WebKit2 Tools`
	`1`	`+MODULES = JavaScriptCore Sources/JavaScriptGlue ANGLE WebCore WebKit WebKit2 Tools`
`2`	`2`
`3`	`3`	`all:`
`4`	`4`	`@for dir in $(MODULES); do ${MAKE} $@ -C $$dir; exit_status=$$?; \`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+SCRIPTS_PATH ?= ../../Tools/Scripts`
	`2`	`+include ../../Makefile.shared`