From: Theodore Ts'o <tytso@mit.edu>
Date: Sun, 8 Jun 2008 01:53:35 +0000 (-0400)
Subject: Fix dependency for $(LIBSS) when an explicit dlopen() library is needed
X-Git-Tag: v1.41-WIP-0617~12
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=9d99416ea38f159e61aef10f76a1e417e8cb3090;p=tools%2Fe2fsprogs.git

Fix dependency for $(LIBSS) when an explicit dlopen() library is needed

Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---

diff --git a/MCONFIG.in b/MCONFIG.in
index 80ddbd8..fba5fe3 100644
--- a/MCONFIG.in
+++ b/MCONFIG.in
@@ -79,6 +79,7 @@ LIBEXT2FS = $(LIB)/libext2fs@LIB_EXT@
 LIBUUID = $(LIB)/libuuid@LIB_EXT@ @SOCKET_LIB@
 LIBBLKID = $(LIB)/libblkid@LIB_EXT@ @STATIC_BLKID_DEVMAPPER_LIBS@
 LIBINTL = @LIBINTL@
+DEPLIBSS = $(LIB)/libss@LIB_EXT@
 DEPLIBUUID = $(LIB)/libuuid@LIB_EXT@
 DEPLIBBLKID = $(LIB)/libblkid@LIB_EXT@
 
@@ -88,6 +89,7 @@ STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
 STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
 STATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@ @SOCKET_LIB@ 
 STATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@ $(STATIC_DEVMAPPER_LIBS)
+DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
 DEPSTATIC_LIBUUID = $(LIB)/libuuid@STATIC_LIB_EXT@
 DEPSTATIC_LIBBLKID = $(LIB)/libblkid@STATIC_LIB_EXT@
 
diff --git a/debugfs/Makefile.in b/debugfs/Makefile.in
index cb3efcb..f197a7d 100644
--- a/debugfs/Makefile.in
+++ b/debugfs/Makefile.in
@@ -26,7 +26,7 @@ SRCS= debug_cmds.c $(srcdir)/debugfs.c $(srcdir)/util.c $(srcdir)/ls.c \
 
 LIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(LIBBLKID) \
 	$(LIBUUID)
-DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(LIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
+DEPLIBS= $(LIBEXT2FS) $(LIBE2P) $(DEPLIBSS) $(LIBCOM_ERR) $(DEPLIBBLKID) $(DEPLIBUUID)
 
 .c.o:
 	@echo "	CC $<"
diff --git a/lib/ext2fs/Makefile.in b/lib/ext2fs/Makefile.in
index c202467..34c9e0a 100644
--- a/lib/ext2fs/Makefile.in
+++ b/lib/ext2fs/Makefile.in
@@ -303,7 +303,7 @@ unused.o: $(top_srcdir)/debugfs/unused.c
 	@echo "	CC $<"
 	@$(CC) $(ALL_CFLAGS) -c $< -o $@
 
-tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID)
+tst_extents: $(srcdir)/extent.c extent_dbg.c $(DEBUG_OBJS) $(DEPLIBSS) $(LIBE2P) $(DEPLIBUUID) $(DEPLIBBLKID)
 	@echo "	LD $@"
 	@$(CC) -o tst_extents $(srcdir)/extent.c extent_dbg.c \
 		$(ALL_CFLAGS) -DDEBUG $(DEBUG_OBJS) $(LIBSS) $(LIBE2P) \