Stuff fts into a convenience library in misc/

- This is not really native rpm code but a copy of (glibc?) FTS
  implementation, with slight modification to avoid symbol name
  collisions. Stick it where the sun don't shine, we'd eventually
  like to get rid of such bundled external code.

diff --git a/build/Makefile.am b/build/Makefile.am
index ae25047..4d86f16 100644 (file)
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -12,7 +12,7 @@ librpmbuild_la_SOURCES = \
        build.c expression.c files.c misc.c names.c pack.c \
        parseBuildInstallClean.c parseChangelog.c parseDescription.c \
        parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \
-       parseSpec.c reqprov.c rpmfc.c spec.c fts.h fts.c \
+       parseSpec.c reqprov.c rpmfc.c spec.c \
        parsePolicies.c policies.c \
        rpmbuild_internal.h rpmbuild_misc.h
 
@@ -20,5 +20,6 @@ librpmbuild_la_LDFLAGS = -version-info 1:0:0
 librpmbuild_la_LIBADD = \
        $(top_builddir)/lib/librpm.la \
        $(top_builddir)/rpmio/librpmio.la \
+       $(top_builddir)/misc/libmisc.la \
        @WITH_POPT_LIB@ \
        @WITH_MAGIC_LIB@

diff --git a/build/files.c b/build/files.c
index bb99c00..0938430 100644 (file)
--- a/build/files.c
+++ b/build/files.c
@@ -22,7 +22,7 @@
 
 #include "rpmio/rpmio_internal.h"      /* XXX rpmioSlurp */
 #include "rpmio/base64.h"
-#include "build/fts.h"
+#include "misc/fts.h"
 #include "lib/cpio.h"
 #include "lib/rpmfi_internal.h"        /* XXX fi->apath */
 #include "build/rpmbuild_internal.h"

diff --git a/misc/Makefile.am b/misc/Makefile.am
index f2e96e4..fcfea8c 100644 (file)
--- a/misc/Makefile.am
+++ b/misc/Makefile.am
@@ -10,5 +10,5 @@ EXTRA_DIST = \
 
 noinst_LTLIBRARIES = libmisc.la
 
-libmisc_la_SOURCES =
+libmisc_la_SOURCES = fts.c fts.h
 libmisc_la_LIBADD = @LTLIBOBJS@

diff --git a/build/fts.c b/misc/fts.c
similarity index 99%
rename from build/fts.c
rename to misc/fts.c
index aee424f..9fbefe3 100644 (file)
--- a/build/fts.c
+++ b/misc/fts.c
@@ -37,7 +37,7 @@ static char sccsid[] = "@(#)fts.c     8.6 (Berkeley) 8/14/94";
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-#include "build/fts.h"
+#include "misc/fts.h"
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
@@ -65,7 +65,7 @@ static char sccsid[] = "@(#)fts.c     8.6 (Berkeley) 8/14/94";
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include "build/fts.h"
+#include "misc/fts.h"
 #   define __set_errno(val) (*__errno_location ()) = (val)
 #   define __open      open
 #   define __close     close

diff --git a/build/fts.h b/misc/fts.h
similarity index 100%
rename from build/fts.h
rename to misc/fts.h