compile/link: EXTRA_EXEC_CFLAGS must be applied for *.o

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 34df48ba0cabf4fae5ad22fe73b369917a0b07eb..f18d3ea4d6ef441b926433bf05e90db2a1aef4d6 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -121,8 +121,10 @@ LIBS += $(UDEV_LIBS) $(BLKID_LIBS)
 
 device-mapper: $(TARGETS_DM)
 
+CFLAGS_dmsetup.o += $(EXTRA_EXEC_CFLAGS)
+
 dmsetup: dmsetup.o $(top_builddir)/libdm/libdevmapper.$(LIB_SUFFIX)
-       $(CC) $(CFLAGS) $(EXTRA_EXEC_CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
+       $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) -L$(top_builddir)/libdm \
              -o $@ dmsetup.o -ldevmapper $(LIBS)
 
 dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
@@ -131,8 +133,10 @@ dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
 
 all: device-mapper
 
+CFLAGS_lvm.o += $(EXTRA_EXEC_CFLAGS)
+
 lvm: $(OBJECTS) lvm.o $(top_builddir)/lib/liblvm-internal.a
-       $(CC) $(CFLAGS) $(EXTRA_EXEC_CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
+       $(CC) $(CFLAGS) $(LDFLAGS) $(EXTRA_EXEC_LDFLAGS) $(ELDFLAGS) -o $@ $(OBJECTS) lvm.o \
                $(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
 
 ifeq ("@BUILD_LVMETAD@", "yes")