diff mbox

multipath-tools: replace LDFLAGS with LIBDEPS for groups of libraries in Makefiles

Message ID 1471024973-15047-1-git-send-email-xose.vazquez@gmail.com (mailing list archive)
State New, archived
Headers show

Commit Message

Xose Vazquez Perez Aug. 12, 2016, 6:02 p.m. UTC
Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
Cc: device-mapper development <dm-devel@redhat.com>
Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>
---
 kpartx/Makefile       | 4 ++--
 mpathpersist/Makefile | 4 ++--
 multipath/Makefile    | 4 ++--
 multipathd/Makefile   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

Comments

Bart Van Assche Aug. 12, 2016, 6:10 p.m. UTC | #1
On 08/12/2016 11:02 AM, Xose Vazquez Perez wrote:
> Cc: Christophe Varoqui <christophe.varoqui@opensvc.com>
> Cc: device-mapper development <dm-devel@redhat.com>
> Signed-off-by: Xose Vazquez Perez <xose.vazquez@gmail.com>

It seems like a patch description that motivates why this change is 
considered useful is missing completely? Anyway, have you considered to 
use a name that is consistent by what is expected by automake, namely 
LDADD (see also 
https://www.gnu.org/software/automake/manual/html_node/Linking.html#Linking)?

Bart.

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Xose Vazquez Perez Aug. 12, 2016, 6:33 p.m. UTC | #2
On 08/12/2016 08:10 PM, Bart Van Assche wrote:

> It seems like a patch description that motivates why this change is considered useful is missing completely? Anyway, have you considered to use a name that is consistent by what is expected by
> automake, namely LDADD (see also https://www.gnu.org/software/automake/manual/html_node/Linking.html#Linking)?

I followed just same rule as in the rest of multipath-tools'
Makefiles. Where it's called "LIBDEPS":

libmpathpersist/Makefile:LIBDEPS +=  -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \
libmultipath/Makefile:          LIBDEPS += -lsystemd
libmultipath/Makefile:          LIBDEPS += -lsystemd-daemon

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Bart Van Assche Aug. 16, 2016, 3:02 p.m. UTC | #3
On 08/12/2016 11:33 AM, Xose Vazquez Perez wrote:
> On 08/12/2016 08:10 PM, Bart Van Assche wrote:
>> It seems like a patch description that motivates why this change is
 >> considered useful is missing completely? Anyway, have you considered
 >> to use a name that is consistent by what is expected by automake,
 >> namely LDADD (see also 
https://www.gnu.org/software/automake/manual/html_node/Linking.html#Linking)?
>
> I followed just same rule as in the rest of multipath-tools'
> Makefiles. Where it's called "LIBDEPS":
>
> libmpathpersist/Makefile:LIBDEPS +=  -lpthread -ldevmapper -ldl -L$(multipathdir) -lmultipath \
> libmultipath/Makefile:          LIBDEPS += -lsystemd
> libmultipath/Makefile:          LIBDEPS += -lsystemd-daemon

Hello Xose,

Thanks for the clarification. Since LIBDEPS is already used elsewhere in 
multipath-tools makefiles I'm fine with using that name. I don't think 
it's worth to rename all uses of LIBDEPS in other Makefiles.

Bart.

--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
Christophe Varoqui Aug. 16, 2016, 3:18 p.m. UTC | #4
Applied then.
Thanks.

On Tue, Aug 16, 2016 at 5:02 PM, Bart Van Assche <bart.vanassche@sandisk.com
> wrote:

> On 08/12/2016 11:33 AM, Xose Vazquez Perez wrote:
>
>> On 08/12/2016 08:10 PM, Bart Van Assche wrote:
>>
>>> It seems like a patch description that motivates why this change is
>>>
>> >> considered useful is missing completely? Anyway, have you considered
> >> to use a name that is consistent by what is expected by automake,
> >> namely LDADD (see also https://www.gnu.org/software/a
> utomake/manual/html_node/Linking.html#Linking)?
>
>>
>> I followed just same rule as in the rest of multipath-tools'
>> Makefiles. Where it's called "LIBDEPS":
>>
>> libmpathpersist/Makefile:LIBDEPS +=  -lpthread -ldevmapper -ldl
>> -L$(multipathdir) -lmultipath \
>> libmultipath/Makefile:          LIBDEPS += -lsystemd
>> libmultipath/Makefile:          LIBDEPS += -lsystemd-daemon
>>
>
> Hello Xose,
>
> Thanks for the clarification. Since LIBDEPS is already used elsewhere in
> multipath-tools makefiles I'm fine with using that name. I don't think it's
> worth to rename all uses of LIBDEPS in other Makefiles.
>
> Bart.
>
>
> --
> dm-devel mailing list
> dm-devel@redhat.com
> https://www.redhat.com/mailman/listinfo/dm-devel
>
--
dm-devel mailing list
dm-devel@redhat.com
https://www.redhat.com/mailman/listinfo/dm-devel
diff mbox

Patch

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: