libfrog: move all the userspace support stuff into a new library

This library is meant to contain all the Funny Random Other Gunk that
the xfsprogs utilities rely on.  Move all that stuff into this library
to reduce the pollution in the other libraries.

Ribbit!  Ribbit!

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Reviewed-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: Eric Sandeen <sandeen@sandeen.net>

diff --git a/Makefile b/Makefile
index 72d0044126947090647bf6441c7cab96de714333..4146473e2526c2ede4aa3cd0b72957847c613bc6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -44,7 +44,7 @@ endif
 # header install rules to populate include/xfs correctly
 HDR_SUBDIRS = include libxfs
 
-DLIB_SUBDIRS = libxlog libxcmd libhandle
+DLIB_SUBDIRS = libfrog libxlog libxcmd libhandle
 LIB_SUBDIRS = libxfs $(DLIB_SUBDIRS)
 TOOL_SUBDIRS = copy db estimate fsck growfs io logprint mkfs quota \
                mdrestore repair rtcp m4 man doc debian spaceman

diff --git a/debian/rules b/debian/rules
index f186d79f6ab7cce6cdfce14d318e2e6468865dc0..baefdba15e55ef304f7f6ce8789fa7c4fa3ec852 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -48,7 +48,7 @@ dibuild:
                for dir in include libxfs; do \
                        $(MAKE) -C $$dir NODEP=1 install-headers; \
                done; \
-               for dir in include libxfs libxcmd mkfs; do \
+               for dir in include libxfs libxcmd libfrog mkfs; do \
                        $(MAKE) -C $$dir; \
                done; \
                mv mkfs/mkfs.xfs mkfs/mkfs.xfs-$(bootpkg); \

diff --git a/include/builddefs.in b/include/builddefs.in
index fd274ddc66d80bd70180632753087117128d73fd..f4448c62df414ef31795613d7e8a45664d7ea1fe 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -36,6 +36,7 @@ LIBEDITLINE = @libeditline@
 LIBREADLINE = @libreadline@
 LIBBLKID = @libblkid@
 LIBXFS = $(TOPDIR)/libxfs/libxfs.la
+LIBFROG = $(TOPDIR)/libfrog/libfrog.la
 LIBXCMD = $(TOPDIR)/libxcmd/libxcmd.la
 LIBXLOG = $(TOPDIR)/libxlog/libxlog.la
 LIBHANDLE = $(TOPDIR)/libhandle/libhandle.la

diff --git a/libfrog/Makefile b/libfrog/Makefile
new file mode 100644 (file)
index 0000000..231a734
--- /dev/null
+++ b/libfrog/Makefile
@@ -0,0 +1,21 @@
+#
+# Copyright (c) 2017 Oracle.  All Rights Reserved.
+#
+
+TOPDIR = ..
+include $(TOPDIR)/include/builddefs
+
+LTLIBRARY = libfrog.la
+LT_CURRENT = 0
+LT_REVISION = 0
+LT_AGE = 0
+
+CFILES =
+
+default: ltdepend $(LTLIBRARY)
+
+include $(BUILDRULES)
+
+install install-dev: default
+
+-include .ltdep