android: fix generation of <va/va_version.h>

Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>

diff --git a/va/Android.mk b/va/Android.mk
index d031814..686874f 100755 (executable)
--- a/va/Android.mk
+++ b/va/Android.mk
@@ -50,7 +50,6 @@ LOCAL_COPY_HEADERS := \
        va.h \
        va_version.h \
        va_backend.h \
-       va_version.h.in \
        x11/va_dricommon.h 
 
 LOCAL_COPY_HEADERS_TO := libva/va
@@ -62,14 +61,12 @@ LOCAL_SHARED_LIBRARIES := libdl libdrm libcutils liblog
 
 include $(BUILD_SHARED_LIBRARY)
 
-intermediates := $(local-intermediates-dir)
-GEN := $(intermediates)/va_version.h
-$(GEN): PRIVATE_GEN_VERSION := $(LOCAL_PATH)/../build/gen_version.sh
-$(GEN): PRIVATE_INPUT_FILE := $(LOCAL_PATH)/va_version.h.in
-$(GEN): PRIVATE_CUSTOM_TOOL = sh $(PRIVATE_GEN_VERSION) $(LOCAL_PATH)/.. $(PRIVATE_INPUT_FILE) > $@
-$(GEN): $(LOCAL_PATH)/va_version.h
+GEN := $(LOCAL_PATH)/va_version.h
+$(GEN): SCRIPT := $(LOCAL_PATH)/../build/gen_version.sh
+$(GEN): PRIVATE_PATH := $(LOCAL_PATH)
+$(GEN): PRIVATE_CUSTOM_TOOL = sh $(SCRIPT) $(LOCAL_PATH)/.. $(LOCAL_PATH)/va_version.h.in > $@
+$(GEN): $(LOCAL_PATH)/%.h : $(LOCAL_PATH)/%.h.in
        $(transform-generated-source)
-
 LOCAL_GENERATED_SOURCES += $(GEN) 
 
 # For libva-android