[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

darin at apple.com darin at apple.com
Fri Jan 21 14:41:29 UTC 2011


The following commit has been merged in the debian/experimental branch:
commit 83aef95c4f5c6a75929e25136998ff7c3e744839
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 19:26:23 2010 +0000

    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: http://svn.webkit.org/repository/webkit/trunk@74644 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index f8fcecd..fe0402a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-24  Darin Adler  <darin at 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 at samsung.com>
 
         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

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list