diff options
| author | Karel Zak | 2011-10-27 14:28:59 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-11-03 12:32:49 +0100 |
| commit | fd404bd4f0c35924055f073f5effaa69c17a719c (patch) | |
| tree | 4916b2afc5e11e4555a1ab19c7329506510e30ff /misc-utils | |
| parent | docs: add note about BUILD_* macros (diff) | |
| download | kernel-qcow2-util-linux-fd404bd4f0c35924055f073f5effaa69c17a719c.tar.gz kernel-qcow2-util-linux-fd404bd4f0c35924055f073f5effaa69c17a719c.tar.xz kernel-qcow2-util-linux-fd404bd4f0c35924055f073f5effaa69c17a719c.zip | |
build-sys: cleanup misc-utils/Makefile.am
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'misc-utils')
| -rw-r--r-- | misc-utils/Makefile.am | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 194e9cbc9..c26f5d8d4 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -25,6 +25,24 @@ usrbin_exec_PROGRAMS += ddate dist_man_MANS += ddate.1 endif +if BUILD_LSBLK +bin_PROGRAMS += lsblk +dist_man_MANS += lsblk.8 +lsblk_SOURCES = lsblk.c \ + $(top_srcdir)/lib/canonicalize.c \ + $(top_srcdir)/lib/ismounted.c \ + $(top_srcdir)/lib/tt.c \ + $(top_srcdir)/lib/mbsalign.c \ + $(top_srcdir)/lib/strutils.c \ + $(top_srcdir)/lib/sysfs.c \ + $(top_srcdir)/lib/at.c +lsblk_LDADD = $(ul_libblkid_la) +lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) +if HAVE_UDEV +lsblk_LDADD += -ludev +endif +endif + if BUILD_LIBUUID usrbin_exec_PROGRAMS += uuidgen dist_man_MANS += uuidgen.1 @@ -54,24 +72,6 @@ wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c wipefs_LDADD = $(ul_libblkid_la) wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -if BUILD_LSBLK -bin_PROGRAMS += lsblk -dist_man_MANS += lsblk.8 -lsblk_SOURCES = lsblk.c \ - $(top_srcdir)/lib/canonicalize.c \ - $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/tt.c \ - $(top_srcdir)/lib/mbsalign.c \ - $(top_srcdir)/lib/strutils.c \ - $(top_srcdir)/lib/sysfs.c \ - $(top_srcdir)/lib/at.c -lsblk_LDADD = $(ul_libblkid_la) -lsblk_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -if HAVE_UDEV -lsblk_LDADD += -ludev -endif -endif - if HAVE_STATIC_BLKID sbin_PROGRAMS += blkid.static blkid_static_SOURCES = $(blkid_SOURCES) @@ -79,7 +79,7 @@ blkid_static_LDFLAGS = -all-static blkid_static_LDADD = $(ul_libblkid_la) blkid_static_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) endif -endif +endif # BUILD_LIBBLKID if BUILD_LIBMOUNT bin_PROGRAMS += findmnt @@ -94,7 +94,7 @@ findmnt_SOURCES = findmnt.c \ if !HAVE_LANGINFO findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c endif -endif +endif # BUILD_LIBMOUNT cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c $(top_srcdir)/lib/strutils.c if !HAVE_LANGINFO |