From cf173566428ba53538ccae30bc32c04cd02746a2 Mon Sep 17 00:00:00 2001 From: "darin@apple.com" Date: Fri, 24 Dec 2010 19:26:23 +0000 Subject: [PATCH] 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 --- ChangeLog | 11 +++++++++++ Makefile | 2 +- Sources/Makefile.shared | 2 ++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 Sources/Makefile.shared diff --git a/ChangeLog b/ChangeLog index f8fcecd..fe0402a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2010-12-24 Darin Adler + + 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 Reviewed by Kenneth Rohde Christiansen. diff --git a/Makefile b/Makefile index b2a1581..bdf70b2 100644 --- 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 index 0000000..95e48d6 --- /dev/null +++ b/Sources/Makefile.shared @@ -0,0 +1,2 @@ +SCRIPTS_PATH ?= ../../Tools/Scripts +include ../../Makefile.shared -- 1.8.3.1