summaryrefslogtreecommitdiff
path: root/make.tmpl.in
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2014-03-06 16:03:08 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2014-03-06 17:30:06 +0100
commit7a595d7388d2dfdb4253ef9425c812491c8e7af5 (patch)
treed357d447a5705f0d875e9c7dc6be645dcea0b1b6 /make.tmpl.in
parent216c57eed72fee52e99bb5d014c9de535e631f58 (diff)
downloadlvm2-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.
Diffstat (limited to 'make.tmpl.in')
-rw-r--r--make.tmpl.in6
1 files changed, 4 insertions, 2 deletions
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