diff options
| author | Igor Pashev <pashev.igor@gmail.com> | 2012-06-19 20:39:15 +0000 |
|---|---|---|
| committer | Igor Pashev <pashev.igor@gmail.com> | 2012-06-19 20:39:15 +0000 |
| commit | 5c6314613bab7d9ef9688ef8e5270520f10949ff (patch) | |
| tree | 6075502b210906fa9896254e269a4114981881fc | |
| parent | c5592df6100fa71a0e942bddaca502bb0dd1bd83 (diff) | |
| download | util-linux-old-5c6314613bab7d9ef9688ef8e5270520f10949ff.tar.gz | |
Build fdisk/cfdisk/sfdisk
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | fdisk/Makefile.am | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 00b803e1..a0e1d0fc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,11 +28,12 @@ SUBDIRS = \ po \ schedutils \ sys-utils \ + fdisk \ disk-utils \ text-utils if LINUX -SUBDIRS += fdisk tests +SUBDIRS += tests endif RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \ diff --git a/fdisk/Makefile.am b/fdisk/Makefile.am index 51d0eb39..90c5307a 100644 --- a/fdisk/Makefile.am +++ b/fdisk/Makefile.am @@ -39,6 +39,7 @@ endif fdisk_CFLAGS = $(cflags_blkid) fdisk_LDADD = $(ldadd_blkid) +fdisk_LDADD += $(top_builddir)/gnulib/libgnu.a if !ARCH_SPARC @@ -46,6 +47,7 @@ sbin_PROGRAMS += sfdisk dist_man_MANS += sfdisk.8 sfdisk_SOURCES = sfdisk.c partname.c $(fdisk_common) \ $(top_srcdir)/lib/canonicalize.c +sfdisk_LDADD = $(top_builddir)/gnulib/libgnu.a if HAVE_STATIC_SFDISK sbin_PROGRAMS += sfdisk.static @@ -59,6 +61,7 @@ dist_man_MANS += cfdisk.8 cfdisk_SOURCES = cfdisk.c $(fdisk_common) cfdisk_CFLAGS = $(cflags_blkid) cfdisk_LDADD = -lslang $(ldadd_blkid) +cfdisk_LDADD += $(top_builddir)/gnulib/libgnu.a else if HAVE_NCURSES sbin_PROGRAMS += cfdisk @@ -66,6 +69,7 @@ dist_man_MANS += cfdisk.8 cfdisk_SOURCES = cfdisk.c $(fdisk_common) cfdisk_CFLAGS = $(cflags_blkid) cfdisk_LDADD = @NCURSES_LIBS@ $(ldadd_blkid) +cfdisk_LDADD += $(top_builddir)/gnulib/libgnu.a endif endif |