diff options
| author | Steve Block <steveblock@google.com> | 2011-05-09 20:27:07 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2011-05-10 16:23:40 +0100 |
| commit | eec79d06faf2e975e341002d30fc473746b11c72 (patch) | |
| tree | 5ed7c78713f986d1a6cc1be8427ed97dd19c72af /WebCore | |
| parent | c90770b5611e18c8c9362a2b18a28bfbd7b03d1d (diff) | |
| download | external_webkit-eec79d06faf2e975e341002d30fc473746b11c72.zip external_webkit-eec79d06faf2e975e341002d30fc473746b11c72.tar.gz external_webkit-eec79d06faf2e975e341002d30fc473746b11c72.tar.bz2 | |
Clean up makefiles in preparation for new Source/ directory
Change-Id: Iebb4d96933c59028f024ac29b348b98d13a29610
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/Android.derived.mk | 3 | ||||
| -rw-r--r-- | WebCore/Android.jscbindings.mk | 26 | ||||
| -rw-r--r-- | WebCore/Android.v8bindings.mk | 4 |
3 files changed, 16 insertions, 17 deletions
diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk index 5d345b4..3c8f577 100644 --- a/WebCore/Android.derived.mk +++ b/WebCore/Android.derived.mk @@ -77,7 +77,7 @@ LOCAL_GENERATED_SOURCES += $(GEN) # HTML entity table GEN := $(intermediates)/html/HTMLEntityTable.cpp -$(GEN): SCRIPT := $(LOCAL_PATH)/../WebCore/html/parser/create-html-entity-table +$(GEN): SCRIPT := $(LOCAL_PATH)/html/parser/create-html-entity-table $(GEN): WEBKITPY_RESOURCES_DIRECTORY := $(LOCAL_PATH)/../Tools/Scripts/webkitpy $(GEN): PRIVATE_CUSTOM_TOOL = $(dir $@)$(notdir $(SCRIPT)) -o $@ $< $(GEN): $(LOCAL_PATH)/html/parser/HTMLEntityNames.in @@ -229,4 +229,3 @@ LOCAL_GENERATED_SOURCES += $(GEN) endif LOCAL_SRC_FILES += $(LOCAL_GENERATED_SOURCES) - diff --git a/WebCore/Android.jscbindings.mk b/WebCore/Android.jscbindings.mk index ff5fff1..b65d62e 100644 --- a/WebCore/Android.jscbindings.mk +++ b/WebCore/Android.jscbindings.mk @@ -46,19 +46,19 @@ BINDING_C_INCLUDES := \ $(JAVASCRIPTCORE_PATH)/wrec \ $(JAVASCRIPTCORE_PATH)/ForwardingHeaders \ \ - $(base_intermediates)/WebCore/bindings/js \ - $(base_intermediates)/WebCore/dom \ - $(base_intermediates)/WebCore/fileapi \ - $(base_intermediates)/WebCore/html/canvas \ - $(base_intermediates)/WebCore/inspector \ - $(base_intermediates)/WebCore/loader/appcache \ - $(base_intermediates)/WebCore/page \ - $(base_intermediates)/WebCore/plugins \ - $(base_intermediates)/WebCore/storage \ - $(base_intermediates)/WebCore/svg \ - $(base_intermediates)/WebCore/webaudio \ - $(base_intermediates)/WebCore/workers \ - $(base_intermediates)/WebCore/xml + $(WEBCORE_INTERMEDIATES_PATH)/bindings/js \ + $(WEBCORE_INTERMEDIATES_PATH)/dom \ + $(WEBCORE_INTERMEDIATES_PATH)/fileapi \ + $(WEBCORE_INTERMEDIATES_PATH)/html/canvas \ + $(WEBCORE_INTERMEDIATES_PATH)/inspector \ + $(WEBCORE_INTERMEDIATES_PATH)/loader/appcache \ + $(WEBCORE_INTERMEDIATES_PATH)/page \ + $(WEBCORE_INTERMEDIATES_PATH)/plugins \ + $(WEBCORE_INTERMEDIATES_PATH)/storage \ + $(WEBCORE_INTERMEDIATES_PATH)/svg \ + $(WEBCORE_INTERMEDIATES_PATH)/webaudio \ + $(WEBCORE_INTERMEDIATES_PATH)/workers \ + $(WEBCORE_INTERMEDIATES_PATH)/xml LOCAL_SRC_FILES += \ bindings/js/DOMObjectHashTableMap.cpp \ diff --git a/WebCore/Android.v8bindings.mk b/WebCore/Android.v8bindings.mk index 0aecefb..7ced649 100644 --- a/WebCore/Android.v8bindings.mk +++ b/WebCore/Android.v8bindings.mk @@ -36,8 +36,8 @@ BINDING_C_INCLUDES := \ $(LOCAL_PATH)/bridge/jni/v8 \ $(LOCAL_PATH)/bridge/jsc \ \ - $(base_intermediates)/WebCore/bindings \ - $(base_intermediates)/WebCore/svg \ + $(WEBCORE_INTERMEDIATES_PATH)/bindings \ + $(WEBCORE_INTERMEDIATES_PATH)/svg \ $(base_intermediates)/JavaScriptCore LOCAL_SRC_FILES += \ |