[oe-commits] org.oe.dev Webkit: update local copy of Makefiles

[koen commit]

Webkit: update local copy of Makefiles

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e9e7550c64fb618ca229a869b9a5ccae9c437121
ViewMTN: http://monotone.openembedded.org/revision.psp?id=e9e7550c64fb618ca229a869b9a5ccae9c437121
Files:
1
packages/webkit/webkit/Makefile.shared
packages/webkit/webkit/WebKit.pro
Diffs:

#
# mt diff -rc9345b9b580c92e4838cf8121553c85f735d1aaf -re9e7550c64fb618ca229a869b9a5ccae9c437121
#
# 
# 
# patch "packages/webkit/webkit/Makefile.shared"
#  from [dc6db91a44fe03b497caf9ed6a058f22412249fa]
#    to [4571aedc66a52b2d05fcb37b50ee169ffdc1b721]
# 
# patch "packages/webkit/webkit/WebKit.pro"
#  from [c4db9377c267835f4ec934a4d53207e26c25b99c]
#    to [63fd1bd947de2d3abe6a011685e6173bf0a804e1]
# 
============================================================
--- packages/webkit/webkit/Makefile.shared	dc6db91a44fe03b497caf9ed6a058f22412249fa
+++ packages/webkit/webkit/Makefile.shared	4571aedc66a52b2d05fcb37b50ee169ffdc1b721
@@ -1,20 +1,21 @@
-XCODE_OPTIONS = `perl -I../WebKitTools/Scripts -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
+SCRIPTS_PATH ?= ../WebKitTools/Scripts
+XCODE_OPTIONS = `perl -I$(SCRIPTS_PATH) -Mwebkitdirs -e 'print XcodeOptionString()'` $(ARGS)
 
 all:
 	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 debug d development dev develop: force
-	../WebKitTools/Scripts/set-webkit-configuration --debug
+	$(SCRIPTS_PATH)/set-webkit-configuration --debug
 	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 release r deployment dep deploy: force
-	../WebKitTools/Scripts/set-webkit-configuration --release
+	$(SCRIPTS_PATH)/set-webkit-configuration --release
 	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 universal u: force
 	( xcodebuild $(OTHER_OPTIONS) $(XCODE_OPTIONS) 'ARCHS=ppc i386' | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 clean:
-	( xcodebuild -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
+	( xcodebuild $(OTHER_OPTIONS) -alltargets clean $(XCODE_OPTIONS) | grep -v setenv && exit $${PIPESTATUS[0]} )
 
 force: ;
============================================================
--- packages/webkit/webkit/WebKit.pro	c4db9377c267835f4ec934a4d53207e26c25b99c
+++ packages/webkit/webkit/WebKit.pro	63fd1bd947de2d3abe6a011685e6173bf0a804e1
@@ -1,8 +1,9 @@ SUBDIRS += \
 TEMPLATE = subdirs
 CONFIG += ordered
 !gdk-port:CONFIG += qt-port
 qt-port:SUBDIRS += WebKitQt/Plugins
 SUBDIRS += \
+        JavaScriptCore/pcre/dftables.pro \
         WebCore \
         JavaScriptCore/kjs/testkjs.pro