From: Nathan Scott <nathans@debian.org>
Date: Thu, 26 Aug 2010 13:12:15 +0000 (+1000)
Subject: Update makefiles to correctly handle libdisk sources during libblkid builds.
X-Git-Tag: v3.1.3~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a90dd9711cf779425ec3c7f3a2ea501064863cb8;p=thirdparty%2Fxfsprogs-dev.git

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 9d98bb00a..c40fb2c99 100644
--- 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 f56f3b491..b058a9fb1 100644
--- 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)