diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 16:48:08 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-01-21 16:48:08 -0200 |
| commit | 96d428a9632fbdcaa235a3d65d8eb04f86bc6b5e (patch) | |
| tree | 36abaa8203feed50624bb933e52fcdac72f0050e /Makefile | |
| parent | 0f2d73c8f6860869e89c5fe38695798ad4f908d2 (diff) | |
| parent | c9f398e53fedb88df243e32eb9bc50fda4ec44d0 (diff) | |
Merge commit 'c9f398e53fedb88df243e32eb9bc50fda4ec44d0' into upstream-merge
* commit 'c9f398e53fedb88df243e32eb9bc50fda4ec44d0':
debugcon: support for debugging consoles (e.g. Bochs port 0xe9)
Makefile: Update unmodified config-devices.mak automatically
Use vpath directive
oss: workaround for cases when OSS_GETVERSION is not defined
Sparc32: clear exception_index with -1 value
Conflicts:
Makefile.target
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 22 |
1 files changed, 16 insertions, 6 deletions
@@ -24,7 +24,7 @@ configure: ; .PHONY: all clean cscope distclean dvi html info install install-doc \ recurse-all speed tar tarbin test build-all -VPATH=$(SRC_PATH):$(SRC_PATH)/hw +$(call set-vpath, $(SRC_PATH):$(SRC_PATH)/hw) LIBS+=-lz $(LIBS_TOOLS) @@ -42,12 +42,22 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) %/config-devices.mak: default-configs/%.mak $(call quiet-command,cat $< > $@.tmp, " GEN $@") - @if test -f $@ ; then \ - echo "WARNING: $@ out of date." ;\ - echo "Run \"make defconfig\" to regenerate." ; \ - rm $@.tmp ; \ + @if test -f $@; then \ + if cmp -s $@.old $@ || cmp -s $@ $@.tmp; then \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ + else \ + if test -f $@.old; then \ + echo "WARNING: $@ (user modified) out of date.";\ + else \ + echo "WARNING: $@ out of date.";\ + fi; \ + echo "Run \"make defconfig\" to regenerate."; \ + rm $@.tmp; \ + fi; \ else \ - mv $@.tmp $@ ; \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ fi defconfig: |