--- ./e2fsck/Makefile.in.orig  2017-12-04 14:11:09.070101268 +0100
+++ ./e2fsck/Makefile.in       2017-12-04 14:11:40.882300969 +0100
@@ -11,6 +11,9 @@
 
 @MCONFIG@
 
+ALL_LDFLAGS += $(DEFAULT_LDFLAGS_APPL)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_SRC)
+
 PROGS=		e2fsck
 MANPAGES=	e2fsck.8
 FMANPAGES=	e2fsck.conf.5

--- ./misc/Makefile.in.orig	2017-12-05 13:06:27.607139725 +0100
+++ ./misc/Makefile.in	2017-12-05 13:06:56.495484481 +0100
@@ -11,6 +11,9 @@
 
 @MCONFIG@
 
+ALL_LDFLAGS += $(DEFAULT_LDFLAGS_APPL)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_SRC)
+
 @DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_PROG= e4defrag
 @DEFRAG_CMT@@LINUX_CMT@E4DEFRAG_MAN= e4defrag.8

--- ./lib/support/Makefile.in.orig	2017-12-13 13:30:04.082271095 +0100
+++ ./lib/support/Makefile.in	2017-12-13 13:31:09.794639829 +0100
@@ -10,6 +10,9 @@
 
 @MCONFIG@
 
+ALL_LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 all::
 
 OBJS=		mkquota.o quotaio.o quotaio_v2.o quotaio_tree.o dict.o
--- ./lib/ext2fs/Makefile.in.orig	2017-12-13 13:45:38.235773701 +0100
+++ ./lib/ext2fs/Makefile.in	2017-12-13 13:46:37.144156800 +0100
@@ -8,6 +8,9 @@
 
 @MCONFIG@
 
+LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 @DEBUGFS_CMT@DEBUGFS_LIB_OBJS = bb_compat.o inode_io.o write_bb_file.o
 
 MK_CMDS=	_SS_DIR_OVERRIDE=../ss ../ss/mk_cmds
--- ./lib/e2p/Makefile.in.orig	2018-01-22 17:58:56.404825101 +0100
+++ ./lib/e2p/Makefile.in	2018-01-22 18:01:01.273601725 +0100
@@ -14,6 +14,9 @@
 
 @MCONFIG@
 
+LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 all::	e2p.pc
 
 OBJS=		feature.o fgetflags.o fsetflags.o fgetversion.o fsetversion.o \
--- ./lib/blkid/Makefile.in.orig	2018-01-22 18:05:16.595191647 +0100
+++ ./lib/blkid/Makefile.in	2018-01-22 18:05:41.687348005 +0100
@@ -14,6 +14,9 @@
 
 @MCONFIG@
 
+LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 all:: 
 
 SMANPAGES=	libblkid.3
--- ./lib/et/Makefile.in.orig	2018-01-22 18:07:10.255900033 +0100
+++ ./lib/et/Makefile.in	2018-01-22 18:07:35.860059649 +0100
@@ -13,6 +13,9 @@
 
 @MCONFIG@
 
+LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 all:: compile_et com_err.pc
 
 OBJS= error_message.o et_name.o init_et.o com_err.o com_right.o
--- ./lib/uuid/Makefile.in.orig	2018-01-22 18:08:30.424399847 +0100
+++ ./lib/uuid/Makefile.in	2018-01-22 18:08:53.536543962 +0100
@@ -10,6 +10,9 @@
 
 @MCONFIG@
 
+LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 all:: 
 
 SMANPAGES=	uuid.3 uuid_clear.3 uuid_compare.3 uuid_copy.3 \
--- ./lib/ss/Makefile.in.orig	2018-01-22 18:10:53.029289197 +0100
+++ ./lib/ss/Makefile.in	2018-01-22 18:11:19.917456917 +0100
@@ -12,6 +12,9 @@
 
 @MCONFIG@
 
+LDFLAGS += $(DEFAULT_LDFLAGS_LIB)
+ALL_CFLAGS += $(DEFAULT_CFLAGS_LIB)
+
 LIBRARY= libss
 LIBDIR= ss