From a90dd9711cf779425ec3c7f3a2ea501064863cb8 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 26 Aug 2010 23:12:15 +1000 Subject: [PATCH] Update makefiles to correctly handle libdisk sources during libblkid builds. Reviewed-by: Christoph Hellwig Signed-off-by: Nathan Scott --- Makefile | 6 +----- libdisk/Makefile | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) 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) -- 2.47.2