Update makefiles to correctly handle libdisk sources during libblkid builds.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nathan Scott <nathans@debian.org>

diff --git a/Makefile b/Makefile
index 9d98bb00a1eba9a6e2e535d12c09786ca4aa15a2..c40fb2c99aae8139b088506fcd3b91aa1a194b0d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -39,14 +39,10 @@ LDIRDIRT = $(SRCDIR)
 LDIRT += $(SRCTAR)
 endif
 
-LIB_SUBDIRS = libxfs libxlog libxcmd libhandle $(LDISK)
+LIB_SUBDIRS = libxfs libxlog libxcmd libhandle libdisk
 TOOL_SUBDIRS = copy db estimate fsck fsr growfs io logprint mkfs quota \
                mdrestore repair rtcp m4 man doc po debian
 
-ifneq ($(ENABLE_BLKID), yes)
-LIB_SUBDIRS += libdisk
-endif
-
 SUBDIRS = include $(LIB_SUBDIRS) $(TOOL_SUBDIRS)
 
 default: include/builddefs include/platform_defs.h

diff --git a/libdisk/Makefile b/libdisk/Makefile
index f56f3b491dfd69bbe9e37ea8cd5dc06276cf7ad6..b058a9fb18f736eea3e2fbcdb43c66299d393835 100644 (file)
--- a/libdisk/Makefile
+++ b/libdisk/Makefile
@@ -20,7 +20,11 @@ else
 LSRCFILES = $(LINUX_DRIVERS)
 endif
 
+ifneq ($(ENABLE_BLKID), yes)
 default: ltdepend $(LTLIBRARY)
+else
+default:
+endif
 
 include $(BUILDRULES)