From patchwork Fri Jul 1 17:17:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 9210267 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 93404607D6 for ; Fri, 1 Jul 2016 17:21:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 81060285BA for ; Fri, 1 Jul 2016 17:21:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 75A05286C6; Fri, 1 Jul 2016 17:21:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 15ECC285BA for ; Fri, 1 Jul 2016 17:21:45 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u61HIFmQ064258; Fri, 1 Jul 2016 13:18:15 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u61HHiCS011369 for ; Fri, 1 Jul 2016 13:17:44 -0400 Received: from mx1.redhat.com (ext-mx08.extmail.prod.ext.phx2.redhat.com [10.5.110.32]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u61HHhxH004741 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 1 Jul 2016 13:17:43 -0400 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50A59C05B1FC for ; Fri, 1 Jul 2016 17:17:42 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id 187so6702554wmz.1 for ; Fri, 01 Jul 2016 10:17:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RKvo+nG8KwGAmCRXXyDub+LmiIyXvimPKgKZT8T412k=; b=KVK0VTVAkmx545yPjhFk/XyRmzPfe8gFXJQvcID/pd57udJGmv0rCb5oO1l8UiaMwi 7KGRwknROn6zfA7qWe4/08Fi+ExJTZPx+AKGkWarQZn3Xa4cE5wt8G5GPitWhbPkscfN CzZboJIha5Tzr6yrxeUldB3gmPWxLslJ21OLAnnchKFQH0+M5eimHzdfMTmBbvjWXaco A4SKUtHfLBCF1FcWW4mL+MQZW1tdnq6ZGaJ8RJShSc0DO+hTuxQr/zHs5k3tLpGNwlGo luvu6ZZPYLg1uEOljsilUSEGMX6P2zHnmP5ZWQxReahoVV94RR0vGBQ4AmdTFVgNgOt3 zAxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RKvo+nG8KwGAmCRXXyDub+LmiIyXvimPKgKZT8T412k=; b=cSRKdA1V6nRF74Yqrnq9J953onpUzFMCv6oStC6UUXTAvTEvBhky4qZiv/IiQrC6fE WOuUYEvlwh1cN6kdh0DznrAG+HOgYEW6va6V1amWQWcoSKAIrErEl+si6WcWdDS1Aiol CTbP2R/xMpmLgy/5qq5aA8FAzlJ5OWKryy/n70PGRt2c5+BUsL/zEGyIWaPZEePuFSqO JnCG/vqGHIKdPKRZNhjGtWwG7hM+1jedKBPCASPOsgXx6U0zw+76tp2pwN9vo0UnDgra EZniq/1ZtIRoo4ahsuhdM9tRmDsftQ7XQhyPS9mtwUDbYsPbFssdb5c0GvLuDf4YVbbP Gd2Q== X-Gm-Message-State: ALyK8tKAgY9DkMfYthSlO3W7vPwNQS8HxVjUsNMy5N/ZdGTw3e/yVquCXg/AxJu65x9Ayg== X-Received: by 10.194.76.33 with SMTP id h1mr4588307wjw.43.1467393460991; Fri, 01 Jul 2016 10:17:40 -0700 (PDT) Received: from localhost ([37.29.214.6]) by smtp.gmail.com with ESMTPSA id q71sm4398347wme.17.2016.07.01.10.17.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 01 Jul 2016 10:17:40 -0700 (PDT) From: Xose Vazquez Perez To: Date: Fri, 1 Jul 2016 19:17:28 +0200 Message-Id: <1467393452-1032-2-git-send-email-xose.vazquez@gmail.com> In-Reply-To: <1467393452-1032-1-git-send-email-xose.vazquez@gmail.com> References: <1467393452-1032-1-git-send-email-xose.vazquez@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 01 Jul 2016 17:17:42 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Fri, 01 Jul 2016 17:17:42 +0000 (UTC) for IP:'74.125.82.65' DOMAIN:'mail-wm0-f65.google.com' HELO:'mail-wm0-f65.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.12 (BAYES_50, DCC_REPUT_13_19, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 74.125.82.65 mail-wm0-f65.google.com 74.125.82.65 mail-wm0-f65.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.32 X-loop: dm-devel@redhat.com Cc: device-mapper development , Xose Vazquez Perez Subject: [dm-devel] [PATCH 1/5] multipath-tools: replace rm with a variable in makefiles X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Virus-Scanned: ClamAV using ClamSMTP Cc: Christophe Varoqui Cc: device-mapper development Signed-off-by: Xose Vazquez Perez --- Makefile.inc | 1 + kpartx/Makefile | 12 ++++++------ libmpathcmd/Makefile | 8 ++++---- libmpathpersist/Makefile | 18 +++++++++--------- libmultipath/Makefile | 4 ++-- libmultipath/checkers/Makefile | 4 ++-- libmultipath/prioritizers/Makefile | 4 ++-- mpathpersist/Makefile | 8 ++++---- multipath/Makefile | 12 ++++++------ multipathd/Makefile | 10 +++++----- 10 files changed, 41 insertions(+), 40 deletions(-) diff --git a/Makefile.inc b/Makefile.inc index 7adeb46..e5d8704 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -56,6 +56,7 @@ mpathpersistdir = $(TOPDIR)/libmpathpersist mpathcmddir = $(TOPDIR)/libmpathcmd GZIP = gzip -9 -c +RM = rm -f INSTALL_PROGRAM = install OPTFLAGS = -Wunused -Wstrict-prototypes -O2 -g -pipe -Wformat-security -Wall \ diff --git a/kpartx/Makefile b/kpartx/Makefile index 501b277..5476545 100644 --- a/kpartx/Makefile +++ b/kpartx/Makefile @@ -34,11 +34,11 @@ install: $(EXEC) $(EXEC).8 $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz - rm -f $(DESTDIR)$(libudevdir)/kpartx_id - rm -f $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules - rm -f $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules + $(RM) $(DESTDIR)$(bindir)/$(EXEC) + $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(libudevdir)/kpartx_id + $(RM) $(DESTDIR)$(libudevdir)/rules.d/66-kpartx.rules + $(RM) $(DESTDIR)$(libudevdir)/rules.d/67-kpartx-compat.rules clean: - rm -f core *.o $(EXEC) *.gz + $(RM) core *.o $(EXEC) *.gz diff --git a/libmpathcmd/Makefile b/libmpathcmd/Makefile index 6fca165..92cdd82 100644 --- a/libmpathcmd/Makefile +++ b/libmpathcmd/Makefile @@ -22,9 +22,9 @@ install: $(LIBS) $(INSTALL_PROGRAM) -m 644 mpath_cmd.h $(DESTDIR)$(incdir) uninstall: - rm -f $(DESTDIR)$(syslibdir)/$(LIBS) - rm -f $(DESTDIR)$(syslibdir)/$(DEVLIB) - rm -f $(DESTDIR)$(incdir)/mpath_cmd.h + $(RM) $(DESTDIR)$(syslibdir)/$(LIBS) + $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB) + $(RM) $(DESTDIR)$(incdir)/mpath_cmd.h clean: - rm -f core *.a *.o *.gz *.so *.so.* + $(RM) core *.a *.o *.gz *.so *.so.* diff --git a/libmpathpersist/Makefile b/libmpathpersist/Makefile index e6a7eb8..09d196e 100644 --- a/libmpathpersist/Makefile +++ b/libmpathpersist/Makefile @@ -38,14 +38,14 @@ install: $(LIBS) install -m 644 mpath_persist.h $(DESTDIR)$(incdir) uninstall: - rm -f $(DESTDIR)$(syslibdir)/$(LIBS) - rm $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz - rm $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz - rm -f $(DESTDIR)$(incdir)/mpath_persist.h - rm -f $(DESTDIR)$(syslibdir)/$(DEVLIB) + $(RM) $(DESTDIR)$(syslibdir)/$(LIBS) + $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_in.3.gz + $(RM) $(DESTDIR)$(man3dir)/mpath_persistent_reserve_out.3.gz + $(RM) $(DESTDIR)$(incdir)/mpath_persist.h + $(RM) $(DESTDIR)$(syslibdir)/$(DEVLIB) clean: - rm -f core *.a *.o - rm -f libmpathpersist.so.0 - rm -f libmpathpersist.so - rm -f mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz + $(RM) core *.a *.o + $(RM) libmpathpersist.so.0 + $(RM) libmpathpersist.so + $(RM) mpath_persistent_reserve_in.3.gz mpath_persistent_reserve_out.3.gz diff --git a/libmultipath/Makefile b/libmultipath/Makefile index 1ee968e..ba1cfa7 100644 --- a/libmultipath/Makefile +++ b/libmultipath/Makefile @@ -65,7 +65,7 @@ install: $(INSTALL_PROGRAM) -m 755 -d $(DESTDIR)$(libdir) uninstall: - rm -f $(DESTDIR)$(syslibdir)/$(LIBS) + $(RM) $(DESTDIR)$(syslibdir)/$(LIBS) clean: - rm -f core *.a *.o *.gz *.so *.so.* + $(RM) core *.a *.o *.gz *.so *.so.* diff --git a/libmultipath/checkers/Makefile b/libmultipath/checkers/Makefile index 4b1a108..fb8fff0 100644 --- a/libmultipath/checkers/Makefile +++ b/libmultipath/checkers/Makefile @@ -27,7 +27,7 @@ install: $(INSTALL_PROGRAM) -m 755 $(LIBS) $(DESTDIR)$(libdir) uninstall: - for file in $(LIBS); do rm -f $(DESTDIR)$(libdir)/$$file; done + for file in $(LIBS); do $(RM) $(DESTDIR)$(libdir)/$$file; done clean: - rm -f core *.a *.o *.gz *.so + $(RM) core *.a *.o *.gz *.so diff --git a/libmultipath/prioritizers/Makefile b/libmultipath/prioritizers/Makefile index ca7b85c..903a139 100644 --- a/libmultipath/prioritizers/Makefile +++ b/libmultipath/prioritizers/Makefile @@ -31,7 +31,7 @@ install: $(LIBS) $(INSTALL_PROGRAM) -m 755 libprio*.so $(DESTDIR)$(libdir) uninstall: - for file in $(LIBS); do rm -f $(DESTDIR)$(libdir)/$$file; done + for file in $(LIBS); do $(RM) $(DESTDIR)$(libdir)/$$file; done clean: - rm -f core *.a *.o *.gz *.so + $(RM) core *.a *.o *.gz *.so diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile index 42a0830..2cc625b 100644 --- a/mpathpersist/Makefile +++ b/mpathpersist/Makefile @@ -22,9 +22,9 @@ install: install -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) clean: - rm -f *.o $(EXEC) - rm -f mpathpersist.8.gz + $(RM) *.o $(EXEC) + $(RM) mpathpersist.8.gz uninstall: - rm $(DESTDIR)$(bindir)/$(EXEC) - rm $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(bindir)/$(EXEC) + $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz diff --git a/multipath/Makefile b/multipath/Makefile index 3707235..9c57d3b 100644 --- a/multipath/Makefile +++ b/multipath/Makefile @@ -31,11 +31,11 @@ install: $(INSTALL_PROGRAM) -m 644 $(EXEC).conf.5.gz $(DESTDIR)$(man5dir) uninstall: - rm $(DESTDIR)$(bindir)/$(EXEC) - rm $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules - rm $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules - rm $(DESTDIR)$(mandir)/$(EXEC).8.gz - rm $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz + $(RM) $(DESTDIR)$(bindir)/$(EXEC) + $(RM) $(DESTDIR)$(udevrulesdir)/11-dm-mpath.rules + $(RM) $(DESTDIR)$(libudevdir)/rules.d/56-multipath.rules + $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(man5dir)/$(EXEC).conf.5.gz clean: - rm -f core *.o $(EXEC) *.gz + $(RM) core *.o $(EXEC) *.gz diff --git a/multipathd/Makefile b/multipathd/Makefile index 7fb1d3f..1caaca7 100644 --- a/multipathd/Makefile +++ b/multipathd/Makefile @@ -55,11 +55,11 @@ endif $(INSTALL_PROGRAM) -m 644 $(EXEC).8.gz $(DESTDIR)$(mandir) uninstall: - rm -f $(DESTDIR)$(bindir)/$(EXEC) - rm -f $(DESTDIR)$(mandir)/$(EXEC).8.gz - rm -f $(DESTDIR)$(unitdir)/$(EXEC).service - rm -f $(DESTDIR)$(unitdir)/$(EXEC).socket + $(RM) $(DESTDIR)$(bindir)/$(EXEC) + $(RM) $(DESTDIR)$(mandir)/$(EXEC).8.gz + $(RM) $(DESTDIR)$(unitdir)/$(EXEC).service + $(RM) $(DESTDIR)$(unitdir)/$(EXEC).socket clean: - rm -f core *.o $(EXEC) *.gz + $(RM) core *.o $(EXEC) *.gz