Generate files correctly

Instead of creating them at . and moving to the right place, just
create them at the right place. This way any additional files
created will be in the right place as well.

Change-Id: I6102bbcee2b4bec3f780fdbed20ba15c9d1a6017

diff --git a/WebCore/Android.derived.mk b/WebCore/Android.derived.mk
index e2cf096..7c2e8e4 100644 (file)
--- a/WebCore/Android.derived.mk
+++ b/WebCore/Android.derived.mk
@@ -59,12 +59,10 @@ LOCAL_GENERATED_SOURCES += $(GEN)
 
 GEN := $(intermediates)/html/DocTypeStrings.cpp
 $(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl
-$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $<
+$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) $(dir $@) $<
 $(GEN): $(LOCAL_PATH)/html/DocTypeStrings.gperf
        $(transform-generated-source)
-       @mv ./DocTypeStrings.cpp $@
-# we have to do this dep by hand:
-$(intermediates)/html/HTMLDocument.o : $(GEN)
+LOCAL_GENERATED_SOURCES += $(GEN)
 
 
 # HTML entity table
@@ -86,10 +84,9 @@ LOCAL_GENERATED_SOURCES += $(GEN)
 
 GEN := $(intermediates)/platform/ColorData.cpp
 $(GEN): SCRIPT := $(LOCAL_PATH)/make-hash-tools.pl
-$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) . $<
+$(GEN): PRIVATE_CUSTOM_TOOL = perl $(SCRIPT) $(dir $@) $<
 $(GEN): $(LOCAL_PATH)/platform/ColorData.gperf
        $(transform-generated-source)
-       @mv ./ColorData.cpp $@
 LOCAL_GENERATED_SOURCES += $(GEN)