From 01ff822933d7d9d06ac18de1d6422591e005d7fd Mon Sep 17 00:00:00 2001
From: Igor Pashev <pashev.igor@gmail.com>
Date: Sun, 22 Jan 2012 02:59:16 +0300
Subject: Restored building isosize

---
 Makefile.am            |  3 ++-
 disk-utils/Makefile.am | 18 ++++++++++--------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 1358de34..00b803e1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,10 +28,11 @@ SUBDIRS = \
 	po \
 	schedutils \
 	sys-utils \
+	disk-utils \
 	text-utils
 
 if LINUX
-SUBDIRS += disk-utils fdisk tests
+SUBDIRS += fdisk tests
 endif
 
 RCS_FIND_IGNORE := \( -name SCCS -o -name BitKeeper -o -name .svn -o \
diff --git a/disk-utils/Makefile.am b/disk-utils/Makefile.am
index 664c9980..5fe8c73d 100644
--- a/disk-utils/Makefile.am
+++ b/disk-utils/Makefile.am
@@ -15,9 +15,14 @@ uuid_ldadd = $(UUID_LIBS)
 endif
 endif
 
-dist_man_MANS = isosize.8 mkfs.8 mkswap.8 \
-           fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
+dist_man_MANS = isosize.8
+
+usrbin_exec_PROGRAMS = isosize
+usrsbin_exec_PROGRAMS =
 
+isosize_LDADD = -L$(top_builddir)/gnulib -lgnu
+
+if LINUX
 sbin_PROGRAMS = mkfs mkswap fsck.minix mkfs.minix mkfs.bfs
 
 fsck_minix_SOURCES = fsck.minix.c minix.h
@@ -31,16 +36,12 @@ swaplabel_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
 mkswap_SOURCES = mkswap.c $(utils_common) $(top_srcdir)/lib/wholedisk.c
 mkswap_LDADD = $(uuid_ldadd)
 mkswap_CFLAGS = $(AM_CFLAGS) $(uuid_cflags)
-
-usrbin_exec_PROGRAMS = isosize
-usrsbin_exec_PROGRAMS =
-
-if LINUX
 dist_man_MANS += fdformat.8 blockdev.8
 sbin_PROGRAMS += blockdev
 usrsbin_exec_PROGRAMS += fdformat
 blockdev_SOURCES = blockdev.c $(utils_common)
-endif
+dist_man_MANS += mkfs.8 mkswap.8 \
+           fsck.minix.8 mkfs.minix.8 mkfs.bfs.8
 
 if BUILD_LIBBLKID
 sbin_PROGRAMS += swaplabel
@@ -81,3 +82,4 @@ if HAVE_SELINUX
 mkswap_LDADD += -lselinux
 endif
 
+endif
-- 
cgit v1.2.3