On 08/11/2016 08:05, Marc-André Lureau wrote:
> Libtool support was removed in commit e999ee44349, there is a few
> left-over.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
>
> v2:
> - remove .pc and .libs from gitignore
> - some libtool removal in make clean rule
>
> Makefile | 9 +++------
> Makefile.objs | 1 -
> .gitignore | 4 ----
> configure | 2 --
> 4 files changed, 3 insertions(+), 13 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index a84582c..56f3a94 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -236,12 +236,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
> @@ -363,10 +361,9 @@ clean:
> rm -f config.mak op-i386.h opc-i386.h gen-op-i386.h op-arm.h opc-arm.h
> gen-op-arm.h
> rm -f qemu-options.def
> rm -f *.msi
> - find . \( -name '*.l[oa]' -o -name '*.so' -o -name '*.dll' -o -name
> '*.mo' -o -name '*.[oda]' \) -type f -exec rm {} +
> + find . \( -name '*.so' -o -name '*.dll' -o -name '*.mo' -o -name
> '*.[oda]' \) -type f -exec rm {} +
> rm -f $(filter-out %.tlb,$(TOOLS)) $(HELPERS-y) qemu-ga TAGS cscope.*
> *.pod *~ */*~
> rm -f fsdev/*.pod
> - rm -rf .libs */.libs
> rm -f qemu-img-cmds.h
> rm -f ui/shader/*-vert.h ui/shader/*-frag.h
> @# May not be present in GENERATED_HEADERS
> 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..e43c304 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -82,10 +82,6 @@
> *.d
> !/scripts/qemu-guest-agent/fsfreeze-hook.d
> *.o
> -*.lo
> -*.la
> -*.pc
> -.libs
> .sdk
> *.gcda
> *.gcno
> 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"
>
>
Looks good, but 2.9 only.
Paolo
