diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2018-06-16 10:27:10 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2018-06-16 10:28:10 -0700 |
| commit | a88dcf769eb00a4ffc7183a0396d881a28b5a29b (patch) | |
| tree | 6945c974ea35df7c656705460d15f93279bb2c45 | |
| parent | 843c7496260b75b5bc1f5018f293200de428b5c8 (diff) | |
Convert implicit rules to static pattern rules
We're deprecating make implicit rules, preferring static pattern rules,
or just regular rules.
Test: diff build-aosp_dragon.ninja
Change-Id: I450cd49789fe380de20364b45abe8282f84b98c2
| -rw-r--r-- | src/mesa/drivers/dri/i965/Android.mk | 8 | ||||
| -rw-r--r-- | src/util/Android.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/dri/i965/Android.mk b/src/mesa/drivers/dri/i965/Android.mk index 39aa33fa9f..dc473b7dec 100644 --- a/src/mesa/drivers/dri/i965/Android.mk +++ b/src/mesa/drivers/dri/i965/Android.mk @@ -283,15 +283,15 @@ LOCAL_MODULE_CLASS := SHARED_LIBRARIES intermediates := $(call local-generated-sources-dir) -LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ - $(i965_oa_GENERATED_FILES)) +gen := $(addprefix $(intermediates)/, $(i965_oa_GENERATED_FILES)) +LOCAL_GENERATED_SOURCES += $(gen) -$(intermediates)/brw_oa_%.h: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py +$(filter %.h,$(gen)): $(intermediates)/brw_oa_%.h: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(word 2, $^) --header=$@ --chipset=$(basename $*) $< -$(intermediates)/brw_oa_%.c: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py +$(filter %.c,$(gen)): $(intermediates)/brw_oa_%.c: $(LOCAL_PATH)/brw_oa_%.xml $(LOCAL_PATH)/brw_oa.py @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))" @mkdir -p $(dir $@) $(hide) $(MESA_PYTHON2) $(word 2, $^) --code=$@ --chipset=$(basename $*) $< diff --git a/src/util/Android.mk b/src/util/Android.mk index 9b6144268e..e463b63e10 100644 --- a/src/util/Android.mk +++ b/src/util/Android.mk @@ -71,7 +71,7 @@ $(POT): $(LOCAL_PATH)/xmlpool/t_options.h @mkdir -p $(dir $@) xgettext -L C --from-code utf-8 -o $@ $< -$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT) +$(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%.po): $(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT) lang=$(basename $(notdir $@)); \ mkdir -p $(dir $@); \ if [ -f $< ]; then \ |