[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 136/150] rules.mak: remove version.o
From: |
Paolo Bonzini |
Subject: |
[PULL 136/150] rules.mak: remove version.o |
Date: |
Tue, 18 Aug 2020 10:10:11 -0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 5 -----
Makefile.objs | 4 ----
rules.mak | 4 +---
3 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 8331c0fd39..d91352d8ef 100644
--- a/Makefile
+++ b/Makefile
@@ -232,11 +232,6 @@ recurse-clean: $(addsuffix /clean, $(TARGET_DIRS)
$(ROM_DIRS))
recurse-install: $(addsuffix /install, $(TARGET_DIRS))
$(addsuffix /install, $(TARGET_DIRS)): all
-$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
- $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@
$<,"RC","version.o")
-
-Makefile: $(version-obj-y)
-
######################################################################
clean: recurse-clean ninja-clean clean-ctlist
diff --git a/Makefile.objs b/Makefile.objs
index 5295c3a623..c351b59641 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -32,7 +32,3 @@ crypto-obj-y = crypto/libcrypto.fa
io-obj-y = io/libio.fa
endif # CONFIG_SOFTMMU or CONFIG_TOOLS
-
-######################################################################
-# Resource file for Windows executables
-version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
diff --git a/rules.mak b/rules.mak
index b983c7f83f..6d89001f0a 100644
--- a/rules.mak
+++ b/rules.mak
@@ -77,8 +77,6 @@ expand-objs = $(strip $(sort $(filter %.o,$1)) \
$(call quiet-command,$(CC) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
$(QEMU_CFLAGS) $(QEMU_DGFLAGS) $(CFLAGS) $($@-cflags) \
-c -o $@ $<,"CC","$(TARGET_DIR)$@")
-%.o: %.rc
- $(call quiet-command,$(WINDRES) -I. -o $@ $<,"RC","$(TARGET_DIR)$@")
# If we have a CXX we might have some C++ objects, in which case we
# must link with the C++ compiler, not the plain C compiler.
@@ -86,7 +84,7 @@ LINKPROG = $(or $(CXX),$(CC))
LINK = $(call quiet-command, $(LINKPROG) $(CFLAGS) $(QEMU_LDFLAGS) -o $@ \
$(call process-archive-undefs, $1) \
- $(version-obj-y) $(call extract-libs,$1)
$(LIBS),"LINK","$(TARGET_DIR)$@")
+ $(call extract-libs,$1) $(LIBS),"LINK","$(TARGET_DIR)$@")
%.o: %.S
$(call quiet-command,$(CCAS) $(QEMU_LOCAL_INCLUDES) $(QEMU_INCLUDES) \
--
2.26.2
- [PULL 126/150] meson: convert hw/9pfs, cleanup, (continued)
- [PULL 126/150] meson: convert hw/9pfs, cleanup, Paolo Bonzini, 2020/08/18
- [PULL 131/150] meson: bsd-user, Paolo Bonzini, 2020/08/18
- [PULL 125/150] meson: convert hw/acpi, Paolo Bonzini, 2020/08/18
- [PULL 127/150] meson: convert hw/arch*, Paolo Bonzini, 2020/08/18
- [PULL 133/150] meson: plugins, Paolo Bonzini, 2020/08/18
- [PULL 141/150] meson: convert check-block, Paolo Bonzini, 2020/08/18
- [PULL 135/150] meson: convert systemtap files, Paolo Bonzini, 2020/08/18
- [PULL 147/150] meson: convert po/, Paolo Bonzini, 2020/08/18
- [PULL 144/150] meson: convert sample plugins, Paolo Bonzini, 2020/08/18
- [PULL 119/150] meson: convert hw/display, Paolo Bonzini, 2020/08/18
- [PULL 136/150] rules.mak: remove version.o,
Paolo Bonzini <=
- [PULL 148/150] meson: avoid unstable module warning with Meson 0.56.0 or newer, Paolo Bonzini, 2020/08/18
- [PULL 145/150] meson: move SDL and SDL-image detection to meson, Paolo Bonzini, 2020/08/18
- [PULL 146/150] meson: convert VNC and dependent libraries to meson, Paolo Bonzini, 2020/08/18
- [PULL 139/150] docs: automatically track manual dependencies, Paolo Bonzini, 2020/08/18
- [PULL 132/150] meson: cpu-emu, Paolo Bonzini, 2020/08/18
- [PULL 130/150] meson: linux-user, Paolo Bonzini, 2020/08/18
- [PULL 134/150] meson: link emulators without Makefile.target, Paolo Bonzini, 2020/08/18
- [PULL 137/150] remove Makefile.target, Paolo Bonzini, 2020/08/18
- [PULL 143/150] meson: replace create-config with meson configure_file, Paolo Bonzini, 2020/08/18
- [PULL 149/150] meson: update build-system documentation, Paolo Bonzini, 2020/08/18