@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
@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
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 \
# HTML
GEN := \
$(intermediates)/bindings/V8DOMFormData.h \
+ $(intermediates)/bindings/V8DOMTokenList.h \
$(intermediates)/bindings/V8DataGridColumn.h \
$(intermediates)/bindings/V8DataGridColumnList.h \
$(intermediates)/bindings/V8HTMLAllCollection.h \
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 \
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 \
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 \
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 \