Merge Webkit at r68651 : Fix Makefiles.

Two perl scripts now generate .cpp files as well as .h files:
http://trac.webkit.org/changeset/68521/trunk/WebCore/css/makevalues.pl
http://trac.webkit.org/changeset/65942/trunk/WebCore/css/makeprop.pl

Change-Id: Ic820536494d259200a69e07711d8cf19d5654b31

diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index 7c2e8e4..ad77a12 100644 (file)
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -38,7 +38,12 @@ endif
        @cat $^ > $(@:%.h=%.in)
        @cp -f $(SCRIPT) $(dir $@)
        @cd $(dir $@) ; perl ./$(notdir $(SCRIPT))
-LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_GENERATED_SOURCES += $(GEN)  $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/%.h
+
 
 GEN := $(intermediates)/css/CSSValueKeywords.h
 $(GEN): SCRIPT := $(LOCAL_PATH)/css/makevalues.pl
@@ -52,7 +57,11 @@ else
        @perl -ne 'print lc' $< > $(@:%.h=%.in)
 endif
        @cd $(dir $@); perl makevalues.pl
-LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_GENERATED_SOURCES += $(GEN)  $(GEN:%.h=%.cpp)
+
+# We also need the .cpp files, which are generated as side effects of the
+# above rules.  Specifying this explicitly makes -j2 work.
+$(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/css/%.cpp : $(intermediates)/css/%.h
 
 
 # DOCTYPE strings

diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index efdf73e..8de2856 100644 (file)
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -146,12 +146,6 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 GEN := \
     $(intermediates)/bindings/V8Blob.h \
     $(intermediates)/bindings/V8BlobBuilder.h \
-<<<<<<< HEAD
-=======
-    $(intermediates)/bindings/V8DOMTokenList.h \
-    $(intermediates)/bindings/V8DataGridColumn.h \
-    $(intermediates)/bindings/V8DataGridColumnList.h \
->>>>>>> webkit.org at r68651
     $(intermediates)/bindings/V8File.h \
     $(intermediates)/bindings/V8FileError.h \
     $(intermediates)/bindings/V8FileList.h \
@@ -170,6 +164,7 @@ $(patsubst %.h,%.cpp,$(GEN)): $(intermediates)/bindings/%.cpp : $(intermediates)
 # HTML
 GEN := \
     $(intermediates)/bindings/V8DOMFormData.h \
+    $(intermediates)/bindings/V8DOMTokenList.h \
     $(intermediates)/bindings/V8DataGridColumn.h \
     $(intermediates)/bindings/V8DataGridColumnList.h \
     $(intermediates)/bindings/V8HTMLAllCollection.h \

diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk
index bfa4d1d..e87ca3d 100644 (file)
--- a/WebCore/Android.jscbindings.mk
+++ b/WebCore/Android.jscbindings.mk
@@ -86,14 +86,10 @@ LOCAL_SRC_FILES += \
        bindings/js/JSDOMBinding.cpp \
        bindings/js/JSDOMFormDataCustom.cpp \
        bindings/js/JSDOMGlobalObject.cpp \
-<<<<<<< HEAD
        bindings/js/JSDOMMimeTypeArrayCustom.cpp \
        bindings/js/JSDOMPluginArrayCustom.cpp \
        bindings/js/JSDOMPluginCustom.cpp \
        bindings/js/JSDOMStringMapCustom.cpp \
-=======
-       bindings/js/JSDOMTokenList.cpp \
->>>>>>> webkit.org at r68651
        bindings/js/JSDOMWindowBase.cpp \
        bindings/js/JSDOMWindowCustom.cpp \
        bindings/js/JSDOMWindowShell.cpp \

diff --git a/WebCore/Android.mk b/WebCore/Android.mk
index e148dcb..a7c3754 100644 (file)
--- a/WebCore/Android.mk
+++ b/WebCore/Android.mk
@@ -282,15 +282,13 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        html/parser/CSSPreloadScanner.cpp \
        html/ColorInputType.cpp \
        html/DOMFormData.cpp \
-<<<<<<< HEAD
+       html/DOMTokenList.cpp \
        html/DateComponents.cpp \
-=======
        html/DateInputType.cpp \
        html/DateTimeInputType.cpp \
        html/DateTimeLocalInputType.cpp \
        html/EmailInputType.cpp \
        html/FileInputType.cpp \
->>>>>>> webkit.org at r68651
        html/FormDataList.cpp \
        html/HTMLAllCollection.cpp \
        html/HTMLCollection.cpp \
@@ -309,22 +307,19 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES) \
        html/ImageDocument.cpp \
        html/ImageInputType.cpp \
        html/ImageResizerThread.cpp \
-<<<<<<< HEAD
-       html/LabelsNodeList.cpp \
-       html/StepRange.cpp \
-=======
        html/InputType.cpp \
        html/IsIndexInputType.cpp \
+       html/LabelsNodeList.cpp \
        html/MediaDocument.cpp \
        html/MonthInputType.cpp \
        html/NumberInputType.cpp \
        html/PasswordInputType.cpp \
->>>>>>> webkit.org at r68651
        html/PluginDocument.cpp \
        html/RadioInputType.cpp \
        html/RangeInputType.cpp \
        html/ResetInputType.cpp \
        html/SearchInputType.cpp \
+       html/StepRange.cpp \
        html/SubmitInputType.cpp \
        html/TelephoneInputType.cpp \
        html/TextDocument.cpp \

diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk
index c39e805..aa85532 100644 (file)
--- a/WebCore/Android.v8bindings.mk
+++ b/WebCore/Android.v8bindings.mk
@@ -112,6 +112,7 @@ LOCAL_SRC_FILES += \
        bindings/v8/custom/V8CustomVoidCallback.cpp \
        bindings/v8/custom/V8DOMFormDataCustom.cpp \
        bindings/v8/custom/V8DOMStringMapCustom.cpp \
+       bindings/v8/custom/V8DOMTokenListCustom.cpp \
        bindings/v8/custom/V8DOMWindowCustom.cpp \
        bindings/v8/custom/V8DataGridColumnListCustom.cpp \
        bindings/v8/custom/V8DedicatedWorkerContextCustom.cpp \