[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too |
Date: |
Fri, 9 May 2014 23:03:38 +0200 |
From: Michael Tokarev <address@hidden>
Commit 52ba784d3 replaced $(STRIP_OPT) with $(STRIP) in some
places (for example, Makefile.target), but not all of them.
There are a few places remain in main Makefile which still
uses $(STRIP_OPT). Replace these places with $(STRIP) too.
While at it, simplify variable pattern substitution of the
surrounding places, change $(patsubst pat,rep,$(var)) into
$(var:pat=rep) which is much easier to read (this is probably
a good idea to do everywhere).
Signed-off-by: Michael Tokarev <address@hidden>
Cc: Fam Zheng <address@hidden>
Cc: Paolo Bonzini <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
Makefile | 16 ++++++++++++----
Makefile.target | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 423e373..23ca444 100644
--- a/Makefile
+++ b/Makefile
@@ -372,17 +372,25 @@ install: all $(if $(BUILD_DOCS),install-doc)
install-sysconfig \
install-datadir install-localstatedir
$(INSTALL_DIR) "$(DESTDIR)$(bindir)"
ifneq ($(TOOLS),)
- $(INSTALL_PROG) $(STRIP_OPT) $(TOOLS) "$(DESTDIR)$(bindir)"
+ $(INSTALL_PROG) $(TOOLS) "$(DESTDIR)$(bindir)"
+ifneq ($(STRIP),)
+ $(STRIP) $(TOOLS:%="$(DESTDIR)$(bindir)/%")
+endif
endif
ifneq ($(CONFIG_MODULES),)
$(INSTALL_DIR) "$(DESTDIR)$(qemu_moddir)"
- for s in $(patsubst %.mo,%$(DSOSUF),$(modules-m)); do \
- $(INSTALL_PROG) $(STRIP_OPT) $$s
"$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
+ for s in $(modules-m:.mo=$(DSOSUF)); do \
+ t="$(DESTDIR)$(qemu_moddir)/$$(echo $$s | tr / -)"; \
+ $(INSTALL_PROG) $$s "$$t"; \
+ test -z "$(STRIP)" || $(STRIP) "$$t"; \
done
endif
ifneq ($(HELPERS-y),)
$(INSTALL_DIR) "$(DESTDIR)$(libexecdir)"
- $(INSTALL_PROG) $(STRIP_OPT) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
+ $(INSTALL_PROG) $(HELPERS-y) "$(DESTDIR)$(libexecdir)"
+ifneq ($(STRIP),)
+ $(STRIP) $(HELPERS-y:%="$(DESTDIR)$(libexecdir)/%")
+endif
endif
ifneq ($(BLOBS),)
set -e; for x in $(BLOBS); do \
diff --git a/Makefile.target b/Makefile.target
index 261de9e..8fc606f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -185,7 +185,7 @@ install: all
ifneq ($(PROGS),)
$(INSTALL) -m 755 $(PROGS) "$(DESTDIR)$(bindir)"
ifneq ($(STRIP),)
- $(STRIP) $(patsubst %,"$(DESTDIR)$(bindir)/%",$(PROGS))
+ $(STRIP) $(PROGS:%="$(DESTDIR)$(bindir)/%")
endif
endif
ifdef CONFIG_TRACE_SYSTEMTAP
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 02/10] build: simplify Makefile.target a bit, use just one rule for softmmu, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 01/10] build: Fix per-object variables for Makefile.target, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 04/10] Makefile: strip tools and modules too,
Paolo Bonzini <=
- [Qemu-devel] [PULL 05/10] Makefile.target: use $(INSTALL_PROG) for installing, not $(INSTALL), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 06/10] Makefile: use $(INSTALL_LIB) for modules not $(INSTALL_PROG), Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 07/10] build: add support for per-object -cflags and -libs to all rules, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 03/10] build: simplify Makefile.target around unnest-vars invocations, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 08/10] build: convert some obj-specific CFLAGS to use new foo.o-cflags syntax, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 10/10] libcacard: remove libcacard-specific CFLAGS and LIBS from global vars, Paolo Bonzini, 2014/05/09
- [Qemu-devel] [PULL 09/10] build: simplify and fix fix-obj-vars, Paolo Bonzini, 2014/05/09
- Re: [Qemu-devel] [PULL 00/10] Build system changes for 2014-05-09, Peter Maydell, 2014/05/13