--- gfs2-utils-3.1.10/gfs2/libgfs2/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
+++ gfs2-utils-3.1.10/gfs2/libgfs2/Makefile.am	2018-05-16 22:11:05.220787174 +0200
@@ -52,8 +52,7 @@
 	$(uuid_CFLAGS)
 
 gfs2l_SOURCES = gfs2l.c
-gfs2l_LDADD = libgfs2.la
-gfs2l_LDFLAGS = $(uuid_LIBS)
+gfs2l_LDADD = libgfs2.la $(uuid_LIBS)
 gfs2l_CPPFLAGS = \
 	-I$(top_srcdir)/gfs2/include \
 	-D_FILE_OFFSET_BITS=64
--- gfs2-utils-3.1.10/gfs2/convert/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
+++ gfs2-utils-3.1.10/gfs2/convert/Makefile.am	2018-05-16 22:14:39.020784730 +0200
@@ -7,5 +7,4 @@
 	-I$(top_srcdir)/gfs2/include \
 	-I$(top_srcdir)/gfs2/libgfs2
 
-gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-gfs2_convert_LDFLAGS = $(uuid_LIBS)
+gfs2_convert_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS)
--- gfs2-utils-3.1.10/gfs2/fsck/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
+++ gfs2-utils-3.1.10/gfs2/fsck/Makefile.am	2018-05-17 05:29:56.060486556 +0200
@@ -36,6 +36,4 @@
 	-I$(top_srcdir)/gfs2/libgfs2
 
 fsck_gfs2_LDADD = \
-	$(top_builddir)/gfs2/libgfs2/libgfs2.la
-fsck_gfs2_LDFLAGS = \
-	$(uuid_LIBS)
+	$(top_builddir)/gfs2/libgfs2/libgfs2.la	$(uuid_LIBS)
--- gfs2-utils-3.1.10/gfs2/mkfs/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
+++ gfs2-utils-3.1.10/gfs2/mkfs/Makefile.am	2018-05-17 05:35:10.050482945 +0200
@@ -25,10 +25,7 @@
 mkfs_gfs2_CFLAGS = \
 	$(blkid_CFLAGS) \
 	$(uuid_CFLAGS)
-mkfs_gfs2_LDFLAGS = \
-	$(blkid_LIBS) \
-	$(uuid_LIBS)
-mkfs_gfs2_LDADD	= $(top_builddir)/gfs2/libgfs2/libgfs2.la
+mkfs_gfs2_LDADD	= $(top_builddir)/gfs2/libgfs2/libgfs2.la $(blkid_LIBS) $(uuid_LIBS)
 
 gfs2_grow_SOURCES = \
 	main_grow.c \
@@ -36,16 +33,12 @@
 
 gfs2_grow_CPPFLAGS = $(COMMON_CPPFLAGS)
 gfs2_grow_CFLAGS = $(blkid_CFLAGS)
-gfs2_grow_LDFLAGS = \
-	$(blkid_LIBS) \
-	$(uuid_LIBS)
-gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
+gfs2_grow_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(blkid_LIBS) $(uuid_LIBS)
 
 gfs2_jadd_SOURCES = \
 	main_jadd.c \
 	metafs.c
 
 gfs2_jadd_CPPFLAGS = $(COMMON_CPPFLAGS)
-gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la
-gfs2_jadd_LDFLAGS = $(uuid_LIBS)
+gfs2_jadd_LDADD = $(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS)
 
--- gfs2-utils-3.1.10/gfs2/glocktop/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
+++ gfs2-utils-3.1.10/gfs2/glocktop/Makefile.am	2018-05-17 05:37:16.380481493 +0200
@@ -9,10 +9,6 @@
 glocktop_CFLAGS = \
 	$(ncurses_CFLAGS)
 
-glocktop_LDFLAGS = \
-	$(ncurses_LIBS) \
-	$(uuid_LIBS)
-
 glocktop_CPPFLAGS = \
 	-D_FILE_OFFSET_BITS=64 \
 	-D_LARGEFILE64_SOURCE \
@@ -21,4 +17,4 @@
 	-I$(top_srcdir)/gfs2/libgfs2
 
 glocktop_LDADD = \
-	$(top_builddir)/gfs2/libgfs2/libgfs2.la
+	$(top_builddir)/gfs2/libgfs2/libgfs2.la	$(ncurses_LIBS) $(uuid_LIBS)
--- gfs2-utils-3.1.10/tests/Makefile.am.orig	2017-03-28 16:08:39.000000000 +0200
+++ gfs2-utils-3.1.10/tests/Makefile.am	2018-05-17 05:39:56.260479669 +0200
@@ -22,9 +22,7 @@
 	-I$(top_srcdir)/gfs2/libgfs2 \
 	-I$(top_srcdir)/gfs2/include
 nukerg_LDADD = \
-	$(top_builddir)/gfs2/libgfs2/libgfs2.la
-nukerg_LDFLAGS = \
-	$(uuid_LIBS)
+	$(top_builddir)/gfs2/libgfs2/libgfs2.la $(uuid_LIBS)
 
 if HAVE_CHECK
 UNIT_TESTS = \
@@ -50,16 +48,14 @@
 	$(UNIT_SOURCES) \
 	check_meta.c
 check_meta_CFLAGS = $(UNIT_CFLAGS)
-check_meta_LDADD = $(UNIT_LDADD)
-check_meta_LDFLAGS = $(uuid_LIBS)
+check_meta_LDADD = $(UNIT_LDADD) $(uuid_LIBS)
 check_meta_CPPFLAGS = $(UNIT_CPPFLAGS)
 
 check_rgrp_SOURCES = \
 	$(UNIT_SOURCES) \
 	check_rgrp.c
 check_rgrp_CFLAGS = $(UNIT_CFLAGS)
-check_rgrp_LDADD = $(UNIT_LDADD)
-check_rgrp_LDFLAGS = $(uuid_LIBS)
+check_rgrp_LDADD = $(UNIT_LDADD) $(uuid_LIBS)
 check_rgrp_CPPFLAGS = $(UNIT_CPPFLAGS)
 endif