diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-10-18 15:43:46 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-10-18 15:43:46 -0200 |
| commit | 9d955a47e38d0b479d4670b76da5235d407861a6 (patch) | |
| tree | 1ac0735767b92f03b2a49f71f72034a34246b38a /Makefile | |
| parent | 89ed5c8564250d84eb3071abdcc8bba6e326901e (diff) | |
| parent | afbaa7b4382faced3c364606a5e5d5389462147b (diff) | |
Merge commit 'afbaa7b4382faced3c364606a5e5d5389462147b' into upstream-merge
* commit 'afbaa7b4382faced3c364606a5e5d5389462147b': (24 commits)
virtio-net: unify vhost-net start/stop
virtio: invoke set_status callback on reset
net: delay freeing peer host device
console: Avoid dereferencing NULL active_console
exec: Fix compilation error for debug code
rc4030: Fix compilation error in debug code
mipsnet: Fix compiler warning in debug code
block/vvfat: Fix compiler warning in debug code
virtio-9p: Use GCC_FMT_ATTR and fix a format warning
blockdev: Use GCC_FMT_ATTR (format checking)
Use GCC_FMT_ATTR (format checking)
Replace most gcc format attributes by macro GCC_FMT_ATTR (format checking)
slirp: Silence warning on Haiku
tap: Add stub for Haiku
nbd: Haiku has _IO() in its BSD compatibility layer
Haiku doesn't have libm
configure: Don't rely on special pthreads library
configure: Add basic support for Haiku
trace: avoid unnecessary recompilation if nothing changed
Makefile: fix config-devices.mak generation
...
Conflicts:
hw/virtio-net.c
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -43,9 +43,11 @@ config-all-devices.mak: $(SUBDIR_DEVICES_MAK) %/config-devices.mak: default-configs/%.mak $(call quiet-command,cat $< > $@.tmp, " GEN $@") @if test -f $@; then \ - if cmp -s $@.old $@ || cmp -s $@ $@.tmp; then \ - mv $@.tmp $@; \ - cp -p $@ $@.old; \ + if cmp -s $@.old $@; then \ + if ! cmp -s $@ $@.tmp; then \ + mv $@.tmp $@; \ + cp -p $@ $@.old; \ + fi; \ else \ if test -f $@.old; then \ echo "WARNING: $@ (user modified) out of date.";\ @@ -104,11 +106,15 @@ ui/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS) bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS) -trace.h: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN $@") +trace.h: trace.h-timestamp +trace.h-timestamp: $(SRC_PATH)/trace-events config-host.mak + $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -h < $< > $@," GEN trace.h") + @cmp -s $@ trace.h || cp $@ trace.h -trace.c: $(SRC_PATH)/trace-events config-host.mak - $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN $@") +trace.c: trace.c-timestamp +trace.c-timestamp: $(SRC_PATH)/trace-events config-host.mak + $(call quiet-command,sh $(SRC_PATH)/tracetool --$(TRACE_BACKEND) -c < $< > $@," GEN trace.c") + @cmp -s $@ trace.c || cp $@ trace.c trace.o: trace.c $(GENERATED_HEADERS) |