* [Qemu-devel] [PATCH] build-sys: remove libtool left-over
@ 2016-11-07 12:22 Marc-André Lureau
2016-11-07 12:45 ` Marc-André Lureau
0 siblings, 1 reply; 3+ messages in thread
From: Marc-André Lureau @ 2016-11-07 12:22 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, mjt, qemu-trivial, Marc-André Lureau
Libtool support was removed in commit e999ee44349, there is a few
left-over.
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 6 ++----
Makefile.objs | 1 -
.gitignore | 2 --
configure | 2 --
4 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/Makefile b/Makefile
index 474cc5e..97dcbdd 100644
--- a/Makefile
+++ b/Makefile
@@ -231,12 +231,10 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%, $(ROMS))
recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
-$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h | $(BUILD_DIR)/version.lo
+$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.o")
-$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc config-host.h
- $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"RC","version.lo")
-Makefile: $(version-obj-y) $(version-lobj-y)
+Makefile: $(version-obj-y)
######################################################################
# Build libraries
diff --git a/Makefile.objs b/Makefile.objs
index 06f74b8..0d7acd4 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -97,7 +97,6 @@ common-obj-y += disas/
######################################################################
# Resource file for Windows executables
version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
-version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo
######################################################################
# tracing
diff --git a/.gitignore b/.gitignore
index 3d7848c..b630cd7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -82,8 +82,6 @@
*.d
!/scripts/qemu-guest-agent/fsfreeze-hook.d
*.o
-*.lo
-*.la
*.pc
.libs
.sdk
diff --git a/configure b/configure
index fd6f898..3194a98 100755
--- a/configure
+++ b/configure
@@ -28,8 +28,6 @@ TMPB="qemu-conf"
TMPC="${TMPDIR1}/${TMPB}.c"
TMPO="${TMPDIR1}/${TMPB}.o"
TMPCXX="${TMPDIR1}/${TMPB}.cxx"
-TMPL="${TMPDIR1}/${TMPB}.lo"
-TMPA="${TMPDIR1}/lib${TMPB}.la"
TMPE="${TMPDIR1}/${TMPB}.exe"
TMPMO="${TMPDIR1}/${TMPB}.mo"
--
2.10.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH] build-sys: remove libtool left-over
2016-11-07 12:22 [Qemu-devel] [PATCH] build-sys: remove libtool left-over Marc-André Lureau
@ 2016-11-07 12:45 ` Marc-André Lureau
2016-11-07 15:37 ` Paolo Bonzini
0 siblings, 1 reply; 3+ messages in thread
From: Marc-André Lureau @ 2016-11-07 12:45 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-trivial, pbonzini, mjt
On Mon, Nov 7, 2016 at 4:23 PM Marc-André Lureau <
marcandre.lureau@redhat.com> wrote:
> Libtool support was removed in commit e999ee44349, there is a few
> left-over.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> Makefile | 6 ++----
> Makefile.objs | 1 -
> .gitignore | 2 --
> configure | 2 --
> 4 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 474cc5e..97dcbdd 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -231,12 +231,10 @@ ALL_SUBDIRS=$(TARGET_DIRS) $(patsubst %,pc-bios/%,
> $(ROMS))
>
> recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
>
> -$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h |
> $(BUILD_DIR)/version.lo
> +$(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc config-host.h
> $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@
> $<,"RC","version.o")
> -$(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc config-host.h
> - $(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@
> $<,"RC","version.lo")
>
> -Makefile: $(version-obj-y) $(version-lobj-y)
> +Makefile: $(version-obj-y)
>
> ######################################################################
> # Build libraries
> diff --git a/Makefile.objs b/Makefile.objs
> index 06f74b8..0d7acd4 100644
> --- a/Makefile.objs
> +++ b/Makefile.objs
> @@ -97,7 +97,6 @@ common-obj-y += disas/
> ######################################################################
> # Resource file for Windows executables
> version-obj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.o
> -version-lobj-$(CONFIG_WIN32) += $(BUILD_DIR)/version.lo
>
> ######################################################################
> # tracing
> diff --git a/.gitignore b/.gitignore
> index 3d7848c..b630cd7 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -82,8 +82,6 @@
> *.d
> !/scripts/qemu-guest-agent/fsfreeze-hook.d
> *.o
> -*.lo
> -*.la
> *.pc
> .libs
> .sdk
>
It looks like we could also remove *.pc & .libs
> diff --git a/configure b/configure
> index fd6f898..3194a98 100755
> --- a/configure
> +++ b/configure
> @@ -28,8 +28,6 @@ TMPB="qemu-conf"
> TMPC="${TMPDIR1}/${TMPB}.c"
> TMPO="${TMPDIR1}/${TMPB}.o"
> TMPCXX="${TMPDIR1}/${TMPB}.cxx"
> -TMPL="${TMPDIR1}/${TMPB}.lo"
> -TMPA="${TMPDIR1}/lib${TMPB}.la"
> TMPE="${TMPDIR1}/${TMPB}.exe"
> TMPMO="${TMPDIR1}/${TMPB}.mo"
>
> --
> 2.10.0
>
>
> --
Marc-André Lureau
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-11-07 15:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-07 12:22 [Qemu-devel] [PATCH] build-sys: remove libtool left-over Marc-André Lureau
2016-11-07 12:45 ` Marc-André Lureau
2016-11-07 15:37 ` Paolo Bonzini
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).