From patchwork Fri Aug 12 18:02:53 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: 9277567 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 58F5B600CB for ; Fri, 12 Aug 2016 18:06:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E07528AC8 for ; Fri, 12 Aug 2016 18:06:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 429FB28ACB; Fri, 12 Aug 2016 18:06:50 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx4-phx2.redhat.com (mx4-phx2.redhat.com [209.132.183.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id A758628AC8 for ; Fri, 12 Aug 2016 18:06:49 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx4-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u7CI30JY001128; Fri, 12 Aug 2016 14:03:00 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u7CI2xOQ009845 for ; Fri, 12 Aug 2016 14:02:59 -0400 Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.30]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7CI2xMd011431 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Fri, 12 Aug 2016 14:02:59 -0400 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) (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 3761B3B70A for ; Fri, 12 Aug 2016 18:02:58 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id i5so4241782wmg.2 for ; Fri, 12 Aug 2016 11:02:58 -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; bh=sLKQs1/ou92VHKLiYFruOsQvrIsV1Vh52gXIckSwC+8=; b=sjXWij6rXsb0zIbzWym3PFc11GZV34FK2rCUR1nOiASegNlY/UZtMbJIH8LR68ekbq UCDWvbCU2HZUeKEQqMBF1ax0Vy+f+1NJqDCtYczQElBJ4dixhK5/lXhBypRaen5IqeX5 k6LbV4BPnXquLcMZINslpfvbfIJmXOlzKntIlHuAT4fYWVei3uaG3Ly3tqQ8VuVS8Ujx XcIanNsj6ywcnj95zAZeZIjRGZ0+4EfGtIfl6+TWKDVlWxocGafLPxbaFnpKpSxsaKy8 e7b/eF27/n9XSL3UYwoC48YYC8WlxWZVQEpbDPs7MOcjK7/CLHvO4sxiBOMTWWM4NArm SDxQ== 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; bh=sLKQs1/ou92VHKLiYFruOsQvrIsV1Vh52gXIckSwC+8=; b=e+IobdRVswdyOC9qwjTWLCGI0PVRcMsro/FWzIAPY/hBlt4kPSKGKn6UsvpjVXXbND K4IRpgk4aL7wb6znVK2GylJW+t9z83MWQ1mppvJax44hK72ZM5G1KXn3dhtC+46nwOgm HWQSDnx0SnfYvy0CiTKkWAOk0ME9antnGpaj03d2sQbNNmJa9pKyt/kh+IG2Xwg/Ez+g QADl+gsgzox3D1ZsphLgRXGyPi7nTUAxO0lpbOdZsDMSGYv+96Pf3Tt50xvgomuHdmZH htivhPBkd30d3n41x2ezn3z2EOVCy7UyAcYw38R5aMOj1VG0iUXKAMvjo8+FsU0zRAQA b+Sw== X-Gm-Message-State: AEkoousTqhfFj6gtuCS2uw55rNI8sI3jkFZlp6NpEVOTS1Af7YDaEwaqWuamj8oYfcIP8g== X-Received: by 10.194.80.104 with SMTP id q8mr18729050wjx.151.1471024976872; Fri, 12 Aug 2016 11:02:56 -0700 (PDT) Received: from localhost ([31.221.181.22]) by smtp.gmail.com with ESMTPSA id a2sm8519566wjg.46.2016.08.12.11.02.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Aug 2016 11:02:56 -0700 (PDT) From: Xose Vazquez Perez To: Date: Fri, 12 Aug 2016 20:02:53 +0200 Message-Id: <1471024973-15047-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.30]); Fri, 12 Aug 2016 18:02:58 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Fri, 12 Aug 2016 18:02:58 +0000 (UTC) for IP:'74.125.82.68' DOMAIN:'mail-wm0-f68.google.com' HELO:'mail-wm0-f68.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.02 (BAYES_50, 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.68 mail-wm0-f68.google.com 74.125.82.68 mail-wm0-f68.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.30 X-loop: dm-devel@redhat.com Cc: device-mapper development , Xose Vazquez Perez Subject: [dm-devel] [PATCH] multipath-tools: replace LDFLAGS with LIBDEPS for groups of libraries 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 --- kpartx/Makefile | 4 ++-- mpathpersist/Makefile | 4 ++-- multipath/Makefile | 4 ++-- multipathd/Makefile | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/kpartx/Makefile b/kpartx/Makefile index 8af0dc6..853288f 100644 --- a/kpartx/Makefile +++ b/kpartx/Makefile @@ -5,7 +5,7 @@ include ../Makefile.inc CFLAGS += -I. -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -LDFLAGS += -ldevmapper +LIBDEPS += -ldevmapper LIBDM_API_COOKIE = $(shell grep -Ecs '^[a-z]*[[:space:]]+dm_task_set_cookie' /usr/include/libdevmapper.h) @@ -21,7 +21,7 @@ EXEC = kpartx all: $(EXEC) $(EXEC): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) + $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) $(GZIP) $(EXEC).8 > $(EXEC).8.gz install: $(EXEC) $(EXEC).8 diff --git a/mpathpersist/Makefile b/mpathpersist/Makefile index b6ab730..7921619 100644 --- a/mpathpersist/Makefile +++ b/mpathpersist/Makefile @@ -2,7 +2,7 @@ include ../Makefile.inc CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) -LDFLAGS += -lpthread -ldevmapper -L$(mpathpersistdir) -lmpathpersist \ +LIBDEPS += -lpthread -ldevmapper -L$(mpathpersistdir) -lmpathpersist \ -L$(multipathdir) -L$(mpathcmddir) -lmpathcmd -lmultipath -ludev EXEC = mpathpersist @@ -12,7 +12,7 @@ OBJS = main.o all: $(EXEC) $(EXEC): $(OBJS) - $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) + $(CC) $(OBJS) -o $(EXEC) $(LDFLAGS) $(CFLAGS) $(LIBDEPS) $(GZIP) $(EXEC).8 > $(EXEC).8.gz install: diff --git a/multipath/Makefile b/multipath/Makefile index b125ae3..f296add 100644 --- a/multipath/Makefile +++ b/multipath/Makefile @@ -5,7 +5,7 @@ include ../Makefile.inc CFLAGS += -I$(multipathdir) -I$(mpathcmddir) -LDFLAGS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev \ +LIBDEPS += -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath -ludev \ -L$(mpathcmddir) -lmpathcmd EXEC = multipath @@ -15,7 +15,7 @@ OBJS = main.o all: $(EXEC) $(EXEC): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) + $(CC) $(CFLAGS) $(OBJS) -o $(EXEC) $(LDFLAGS) $(LIBDEPS) $(GZIP) $(EXEC).8 > $(EXEC).8.gz $(GZIP) $(EXEC).conf.5 > $(EXEC).conf.5.gz diff --git a/multipathd/Makefile b/multipathd/Makefile index 03d7815..8524efa 100644 --- a/multipathd/Makefile +++ b/multipathd/Makefile @@ -8,16 +8,16 @@ include ../Makefile.inc #CFLAGS += -DLOGDBG CFLAGS += -I$(multipathdir) -I$(mpathpersistdir) -I$(mpathcmddir) -LDFLAGS += -ludev -ldl -L$(multipathdir) -lmultipath -L$(mpathpersistdir) \ +LIBDEPS += -ludev -ldl -L$(multipathdir) -lmultipath -L$(mpathpersistdir) \ -lmpathpersist -L$(mpathcmddir) -lmpathcmd -lurcu -lpthread \ -ldevmapper -lreadline ifdef SYSTEMD CFLAGS += -DUSE_SYSTEMD=$(SYSTEMD) ifeq ($(shell test $(SYSTEMD) -gt 209 && echo 1), 1) - LDFLAGS += -lsystemd + LIBDEPS += -lsystemd else - LDFLAGS += -lsystemd-daemon + LIBDEPS += -lsystemd-daemon endif endif @@ -28,7 +28,7 @@ EXEC = multipathd all : $(EXEC) $(EXEC): $(OBJS) - $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) + $(CC) $(CFLAGS) $(OBJS) $(LDFLAGS) -o $(EXEC) $(LIBDEPS) $(GZIP) $(EXEC).8 > $(EXEC).8.gz install: