shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

makefiles: use BLKID/UDEV_CFLAGS properly

Browse Source 
blkid.h needs BLKID_CFLAGS
Do not add UDEV_CFLAGS everywhere and use it only when needed.
This commit is contained in:
Zdenek Kabelac 2014-03-06 16:03:08 +01:00
parent 216c57eed7
commit 7a595d7388
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

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

2
lib/Makefile.in
View File

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

2
lib/device/dev-type.c
View File

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

6
make.tmpl.in
View File

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