Include directives in default configs

[qemu.git] / Makefile

diff --git a/Makefile b/Makefile
index 338977548e5bb8009fd3df569a2773bcf15bc8d5..d3bc0f2c747663a21c4b07a5fa0ed3cd435d4667 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,18 +39,19 @@ endif
 
 SUBDIR_MAKEFLAGS=$(if $(V),,--no-print-directory)
 SUBDIR_DEVICES_MAK=$(patsubst %, %/config-devices.mak, $(TARGET_DIRS))
+SUBDIR_DEVICES_MAK_DEP=$(patsubst %, %/config-devices.mak.d, $(TARGET_DIRS))
 
 config-all-devices.mak: $(SUBDIR_DEVICES_MAK)
        $(call quiet-command,cat $(SUBDIR_DEVICES_MAK) | grep =y | sort -u > $@,"  GEN   $@")
 
+-include $(SUBDIR_DEVICES_MAK_DEP)
+
 %/config-devices.mak: default-configs/%.mak
-       $(call quiet-command,cat $< > $@.tmp, "  GEN   $@")
+       $(call quiet-command,$(SHELL) $(SRC_PATH)/make_device_config.sh $@ $<, "  GEN   $@")
        @if test -f $@; then \
          if cmp -s $@.old $@; then \
-           if ! cmp -s $@ $@.tmp; then \
-             mv $@.tmp $@; \
-             cp -p $@ $@.old; \
-           fi; \
+           mv $@.tmp $@; \
+           cp -p $@ $@.old; \
          else \
            if test -f $@.old; then \
              echo "WARNING: $@ (user modified) out of date.";\