makefiles: allow using configure cppflags

Configure defines 'CPPFLAGS' and we should use defined value
for compilation.

Reported-by: debian

diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
index 92dc715d22d446041c2f6d1603b7f97440b1eb08..fb8973b6b900c840131d2e0dd9e44de5f928bb38 100644 (file)
--- a/libdm/make.tmpl.in
+++ b/libdm/make.tmpl.in
@@ -59,6 +59,7 @@ DEFS += @DEFS@
 # FIXME set this only where it's needed, not globally?
 CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
 LDFLAGS ?= @LDFLAGS@
+CPPFLAGS ?= @CPPFLAGS@
 CLDFLAGS += @CLDFLAGS@
 ELDFLAGS += @ELDFLAGS@
 LDDEPS += @LDDEPS@
@@ -412,7 +413,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 %.o: %.c $(DEPS)
        @echo "    [CC] $(<F)"
        @mkdir -p $(@D)
-       $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
+       $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
 
 %.o: %.cpp $(DEPS)
        @echo "    [CXX] $(<F)"
@@ -422,7 +423,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 %.pot: %.c $(DEPS)
        @echo "    [CC] $@"
        @mkdir -p $(@D)
-       $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
+       $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS) $< >$@
 
 %.so: %.o
        @echo "    [CC] $(<F)"

diff --git a/make.tmpl.in b/make.tmpl.in
index 222ed671af7b8f3ed2c86a65f31223491d4ef79b..9f4ecc33fb7c1296e87be24beb8640c439e180d5 100644 (file)
--- a/make.tmpl.in
+++ b/make.tmpl.in
@@ -63,6 +63,7 @@ STATIC_LIBS = $(PTHREAD_LIBS)
 DEFS += @DEFS@
 # FIXME set this only where it's needed, not globally?
 CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+CPPFLAGS ?= @CPPFLAGS@
 LDFLAGS ?= @LDFLAGS@
 CLDFLAGS += @CLDFLAGS@
 ELDFLAGS += @ELDFLAGS@
@@ -477,7 +478,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 %.o: %.c $(DEPS)
        @echo "    [CC] $(<F)"
        @mkdir -p $(@D)
-       $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $< -o $@
+       $(Q) $(CC) $(DEPFLAGS) -c $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) $(DEFS) $(DEFS_$@) $(WFLAGS) $(WCFLAGS) $(CFLAGS) $(CFLAGS_$@) $(CPPFLAGS) $< -o $@
 
 %.o: %.cpp $(DEPS)
        @echo "    [CXX] $(<F)"
@@ -487,7 +488,7 @@ DEFS+=-D_FILE_OFFSET_BITS=64
 %.pot: %.c $(DEPS)
        @echo "    [CC] $(<F)"
        @mkdir -p $(@D)
-       $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $< >$@
+       $(Q) $(CC) -E $(INCLUDES) $(VALGRIND_CFLAGS) $(PROGS_CFLAGS) -include $(top_builddir)/po/pogen.h $(DEFS) $(WFLAGS) $(CFLAGS) $(CPPFLAGS)  $< >$@
 
 %.so: %.o
        @echo "    [CC] $(<F)"

diff --git a/tools/Makefile.in b/tools/Makefile.in
index 2a663a5b68665dea981ae330502d16fb0014c1d9..545b94f23e0815c28a889cf01831f7e44712d0b2 100644 (file)
--- a/tools/Makefile.in
+++ b/tools/Makefile.in
@@ -133,7 +133,7 @@ man-generator.c: $(srcdir)/command.c
 
 man-generator: man-generator.o
        @echo "    [CC] $@"
-       $(Q) $(CC) $(CFLAGS) -o $@ $(<F)
+       $(Q) $(CC) $(CFLAGS) $(CPPFLAGS) -o $@ $(<F)
 
 lvm.static: $(OBJECTS) lvm-static.o $(LVMINTERNAL_LIBS)
        @echo "    [CC] $@"