mkfs: link against libuuid after liblkid

The order in which libraries are searched matters if you are using
static libraries.  Since libblkid uses some functions from libuuid, it
needs to come before libuuid in the link line.

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/mkfs/Makefile b/mkfs/Makefile
index 8b61c2fe8d1330b47c5450abd4feed56f12b4f18..75da6335b82e77077b724dd9046cbdc558516c1e 100644 (file)
--- a/mkfs/Makefile
+++ b/mkfs/Makefile
@@ -11,10 +11,6 @@ FSTYP = fstyp
 HFILES = xfs_mkfs.h
 CFILES = maxtrres.c proto.c xfs_mkfs.c
 
-LLDLIBS = $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
-LTDEPENDENCIES = $(LIBXFS)
-LLDFLAGS = -static
-
 ifeq ($(ENABLE_BLKID),yes)
 LLDLIBS += $(LIBBLKID)
 CFLAGS += -DENABLE_BLKID
@@ -23,6 +19,9 @@ LLDLIBS += $(LIBDISK)
 LTDEPENDENCIES += $(LIBDISK)
 endif
 
+LLDLIBS += $(LIBXFS) $(LIBUUID) $(LIBRT) $(LIBPTHREAD)
+LTDEPENDENCIES += $(LIBXFS)
+LLDFLAGS = -static
 
 LSRCFILES = $(FSTYP).c
 LDIRT = $(FSTYP)