From: Darrick J. Wong <darrick.wong@oracle.com>
Date: Wed, 6 Dec 2017 15:17:08 +0000 (-0600)
Subject: libfrog: move paths.c out of libxcmd
X-Git-Tag: v4.15.0-rc1~128
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bd987fe368a6856cdbeace2e7ba15049e85c31af;p=thirdparty%2Fxfsprogs-dev.git

libfrog: move paths.c out of libxcmd

Move the fs_table code into libfrog since it's not really a command.

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/libfrog/Makefile b/libfrog/Makefile
index 467362c3a..4c15605b7 100644
--- a/libfrog/Makefile
+++ b/libfrog/Makefile
@@ -14,11 +14,21 @@ CFILES = \
 avl64.c \
 convert.c \
 list_sort.c \
+paths.c \
+projects.c \
 radix-tree.c \
 topology.c \
 util.c \
 workqueue.c
 
+ifeq ($(HAVE_GETMNTENT),yes)
+LCFLAGS += -DHAVE_GETMNTENT
+endif
+
+ifeq ($(HAVE_GETMNTINFO),yes)
+LCFLAGS += -DHAVE_GETMNTINFO
+endif
+
 default: ltdepend $(LTLIBRARY)
 
 include $(BUILDRULES)
diff --git a/libxcmd/paths.c b/libfrog/paths.c
similarity index 100%
rename from libxcmd/paths.c
rename to libfrog/paths.c
diff --git a/libxcmd/projects.c b/libfrog/projects.c
similarity index 100%
rename from libxcmd/projects.c
rename to libfrog/projects.c
diff --git a/libxcmd/Makefile b/libxcmd/Makefile
index 7701ed9f2..de0e49cad 100644
--- a/libxcmd/Makefile
+++ b/libxcmd/Makefile
@@ -10,15 +10,7 @@ LT_CURRENT = 0
 LT_REVISION = 0
 LT_AGE = 0
 
-CFILES = command.c input.c paths.c projects.c help.c quit.c
-
-ifeq ($(HAVE_GETMNTENT),yes)
-LCFLAGS += -DHAVE_GETMNTENT
-endif
-
-ifeq ($(HAVE_GETMNTINFO),yes)
-LCFLAGS += -DHAVE_GETMNTINFO
-endif
+CFILES = command.c input.c help.c quit.c
 
 ifeq ($(ENABLE_READLINE),yes)
 LCFLAGS += -DENABLE_READLINE