diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-06 16:03:08 +0100 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2014-03-06 17:30:06 +0100 |
| commit | 7a595d7388d2dfdb4253ef9425c812491c8e7af5 (patch) | |
| tree | d357d447a5705f0d875e9c7dc6be645dcea0b1b6 | |
| parent | 216c57eed72fee52e99bb5d014c9de535e631f58 (diff) | |
| download | lvm2-7a595d7388d2dfdb4253ef9425c812491c8e7af5.tar.gz | |
makefiles: use BLKID/UDEV_CFLAGS properly
blkid.h needs BLKID_CFLAGS
Do not add UDEV_CFLAGS everywhere and use it only when needed.
| -rw-r--r-- | WHATS_NEW | 1 | ||||
| -rw-r--r-- | lib/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/device/dev-type.c | 2 | ||||
| -rw-r--r-- | make.tmpl.in | 6 |
4 files changed, 8 insertions, 3 deletions
@@ -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. diff --git a/lib/Makefile.in b/lib/Makefile.in index 968ad006b..c3d459887 100644 --- a/lib/Makefile.in +++ b/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 diff --git a/lib/device/dev-type.c b/lib/device/dev-type.c index 81100ad87..193e9bdcc 100644 --- a/lib/device/dev-type.c +++ b/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" diff --git a/make.tmpl.in b/make.tmpl.in index 7d7d70141..b1a6b8f68 100644 --- a/make.tmpl.in +++ b/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 |