makefiles: use BLKID/UDEV_CFLAGS properly

blkid.h needs BLKID_CFLAGS
Do not add UDEV_CFLAGS everywhere and use it only when needed.

WHATS_NEW

@@ -1,5 +1,6 @@
 Version 2.02.106 - 
 ====================================
+  Use BLKID_CFLAGS when compiling with blkid support.
   Use correct rl_completion_func_t typedef for new readline.
   Make lvm 'dumpconfig --type default' complete for it to be consumed by lvm.
   Run pvscan --cache via systemd-run in udev if the PV label is detected lost.

lib/Makefile.in

@@ -217,6 +217,8 @@ CFLOW_LIST_TARGET = $(LIB_NAME).cflow
 
 include $(top_builddir)/make.tmpl
 
+CFLAGS += $(BLKID_CFLAGS) $(UDEV_CFLAGS)
+
 $(SUBDIRS): $(LIB_STATIC)
 
 DISTCLEAN_TARGETS += misc/configure.h misc/lvm-version.h

lib/device/dev-type.c

@@ -22,7 +22,7 @@
 #include <ctype.h>
 
 #ifdef BLKID_WIPING_SUPPORT
-#include <blkid/blkid.h>
+#include <blkid.h>
 #endif
 
 #include "device-types.h"

make.tmpl.in

@@ -46,7 +46,7 @@ LIBS = @LIBS@
 STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
 DEFS += @DEFS@
 # FIXME set this only where it's needed, not globally?
-CFLAGS += @CFLAGS@ @UDEV_CFLAGS@
+CFLAGS += @CFLAGS@
 CLDFLAGS += @CLDFLAGS@
 ELDFLAGS += @ELDFLAGS@
 LDDEPS += @LDDEPS@
@@ -57,8 +57,10 @@ DL_LIBS = @DL_LIBS@
 PTHREAD_LIBS = @PTHREAD_LIBS@
 READLINE_LIBS = @READLINE_LIBS@
 SELINUX_LIBS = @SELINUX_LIBS@
+UDEV_CFLAGS = @UDEV_CFLAGS@
 UDEV_LIBS = @UDEV_LIBS@
-BLKID_LIBS=@BLKID_LIBS@
+BLKID_CFLAGS = @BLKID_CFLAGS@
+BLKID_LIBS = @BLKID_LIBS@
 TESTING = @TESTING@
 
 # Setup directory variables