diff options
| author | Matthias König <mk@phasorlab.de> | 2010-01-12 13:58:38 +0100 |
|---|---|---|
| committer | Karel Zak <kzak@redhat.com> | 2010-01-22 11:37:33 +0100 |
| commit | f609e92e497a513ed759dc4166a372fb22d3f995 (patch) | |
| tree | 1a20960a9ab82bbdf300f925a5f3fb27650b0f02 /fdisk/Makefile.am | |
| parent | 701094844451477c68d9503a5d4926f6493d9ddd (diff) | |
| download | util-linux-old-f609e92e497a513ed759dc4166a372fb22d3f995.tar.gz | |
cfdisk: use libblkid
Let cfdisk use the internal libblkid if available to get the filesystem
type and label.
[kzak@redhat.com: - remove old FS probing code from cfdisk
- remove "Linux" prefix for filesystem names
- enlarge fstype field in partition_info
- restrict probing area by partition size]
Signed-off-by: Matthias König <mk@phasorlab.de>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'fdisk/Makefile.am')
| -rw-r--r-- | fdisk/Makefile.am | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 5496e240..50f1dbe8 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -18,26 +18,25 @@ fdisk_SOURCES = fdisk.c fdiskbsdlabel.c fdisksgilabel.c \ fdisk.h fdisksunlabel.h fdisksgilabel.h fdiskaixlabel.h \ fdiskbsdlabel.h fdiskmaclabel.h $(fdisk_common) -cflags_fdisk = $(AM_CFLAGS) -ldadd_fdisk = +cflags_blkid = $(AM_CFLAGS) +ldadd_blkid = if BUILD_LIBBLKID # only in-tree libblkid has topology support -ldadd_fdisk += $(ul_libblkid_la) -cflags_fdisk += -I$(ul_libblkid_incdir) +ldadd_blkid += $(ul_libblkid_la) +cflags_blkid += -I$(ul_libblkid_incdir) endif if HAVE_STATIC_FDISK sbin_PROGRAMS += fdisk.static fdisk_static_SOURCES = $(fdisk_SOURCES) fdisk_static_LDFLAGS = -all-static -fdisk_static_CFLAGS = $(cflags_fdisk) -fdisk_static_LDADD = $(ldadd_fdisk) +fdisk_static_CFLAGS = $(cflags_blkid) +fdisk_static_LDADD = $(ldadd_blkid) endif -fdisk_CFLAGS = $(cflags_fdisk) -fdisk_LDADD = $(ldadd_fdisk) - +fdisk_CFLAGS = $(cflags_blkid) +fdisk_LDADD = $(ldadd_blkid) if !ARCH_SPARC @@ -55,13 +54,15 @@ if USE_SLANG sbin_PROGRAMS += cfdisk dist_man_MANS += cfdisk.8 cfdisk_SOURCES = cfdisk.c $(fdisk_common) -cfdisk_LDADD = -lslang +cfdisk_CFLAGS = $(cflags_blkid) +cfdisk_LDADD = -lslang $(ldadd_blkid) else if HAVE_NCURSES sbin_PROGRAMS += cfdisk dist_man_MANS += cfdisk.8 cfdisk_SOURCES = cfdisk.c $(fdisk_common) -cfdisk_LDADD = @NCURSES_LIBS@ +cfdisk_CFLAGS = $(cflags_blkid) +cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid) endif endif |