diff options
| -rw-r--r-- | build/Makefile.am | 3 | ||||
| -rw-r--r-- | build/files.c | 2 | ||||
| -rw-r--r-- | misc/Makefile.am | 2 | ||||
| -rw-r--r-- | misc/fts.c (renamed from build/fts.c) | 4 | ||||
| -rw-r--r-- | misc/fts.h (renamed from build/fts.h) | 0 |
5 files changed, 6 insertions, 5 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index ae250479d..4d86f16ac 100644 --- 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 bb99c00fe..093843014 100644 --- 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 f2e96e474..fcfea8cbb 100644 --- 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 index aee424fce..9fbefe3d2 100644 --- 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 index 47c650e7c..47c650e7c 100644 --- a/build/fts.h +++ b/misc/fts.h |