diff options
| -rw-r--r-- | build/files.c | 2 | ||||
| -rw-r--r-- | build/pack.c | 2 | ||||
| -rw-r--r-- | build/poptBT.c | 1 | ||||
| -rw-r--r-- | lib/Makefile.am | 4 | ||||
| -rw-r--r-- | lib/formats.c | 2 | ||||
| -rw-r--r-- | lib/legacy.c (renamed from rpmdb/legacy.c) | 2 | ||||
| -rw-r--r-- | lib/legacy.h (renamed from rpmdb/legacy.h) | 0 | ||||
| -rw-r--r-- | lib/package.c | 2 | ||||
| -rw-r--r-- | lib/psm.c | 2 | ||||
| -rw-r--r-- | python/header-py.c | 2 | ||||
| -rw-r--r-- | rpmdb/Makefile.am | 1 | ||||
| -rw-r--r-- | rpmdb/rpmdb.c | 1 |
12 files changed, 10 insertions, 11 deletions
diff --git a/build/files.c b/build/files.c index d62cb9401..bbf2d90fe 100644 --- a/build/files.c +++ b/build/files.c @@ -30,7 +30,7 @@ #include "build/buildio.h" #include <rpmfileutil.h> /* rpmDoDigest() */ -#include "rpmdb/legacy.h" /* XXX expandFileList, compressFileList */ +#include "lib/legacy.h" /* XXX expandFileList, compressFileList */ #include <rpmlog.h> #include "debug.h" diff --git a/build/pack.c b/build/pack.c index 4296961d3..2ea8bf356 100644 --- a/build/pack.c +++ b/build/pack.c @@ -20,7 +20,7 @@ #include "build/buildio.h" -#include "rpmdb/legacy.h" /* XXX providePackageNVR */ +#include "lib/legacy.h" /* XXX providePackageNVR */ #include "lib/signature.h" #include "lib/rpmlead.h" #include <rpmfileutil.h> diff --git a/build/poptBT.c b/build/poptBT.c index 30e78176e..71d37d1a7 100644 --- a/build/poptBT.c +++ b/build/poptBT.c @@ -7,7 +7,6 @@ #include <rpmbuild.h> -#include "rpmdb/legacy.h" /* XXX _noDirTokens */ #include <rpmlog.h> #include "debug.h" diff --git a/lib/Makefile.am b/lib/Makefile.am index d3f9e0b9d..3ee2adb9c 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -24,7 +24,9 @@ librpm_la_SOURCES = \ rpminstall.c rpmtsscore.h rpmts_internal.h \ rpmlead.c rpmlead.h rpmlibprov.c rpmps.c rpmrc.c rpmte.c rpmts.c \ rpmvercmp.c signature.c signature.h transaction.c \ - verify.c rpmlock.c rpmlock.h misc.h + verify.c rpmlock.c rpmlock.h misc.h \ + legacy.c legacy.h + librpm_la_LDFLAGS = -release 4.4 librpm_la_LIBADD = \ diff --git a/lib/formats.c b/lib/formats.c index 996c5bf4f..fdb6a5f4f 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -9,7 +9,7 @@ #include <rpmfi.h> -#include "rpmdb/legacy.h" /* XXX rpmfiBuildFNames() */ +#include "lib/legacy.h" /* XXX rpmfiBuildFNames() */ #include "lib/manifest.h" #include "debug.h" diff --git a/rpmdb/legacy.c b/lib/legacy.c index ed6669d09..6a8e2534d 100644 --- a/rpmdb/legacy.c +++ b/lib/legacy.c @@ -7,7 +7,7 @@ #include <rpmlib.h> #include <rpmmacro.h> #include <rpmstring.h> -#include "rpmdb/legacy.h" +#include "lib/legacy.h" #include "debug.h" #define alloca_strdup(_s) strcpy(alloca(strlen(_s)+1), (_s)) diff --git a/rpmdb/legacy.h b/lib/legacy.h index fcec32b8e..fcec32b8e 100644 --- a/rpmdb/legacy.h +++ b/lib/legacy.h diff --git a/lib/package.c b/lib/package.c index e30951e25..774149047 100644 --- a/lib/package.c +++ b/lib/package.c @@ -12,7 +12,7 @@ #include <rpmts.h> -#include "rpmdb/legacy.h" /* XXX legacyRetrofit() */ +#include "lib/legacy.h" /* XXX legacyRetrofit() */ #include "lib/rpmlead.h" #include <rpmlog.h> @@ -27,7 +27,7 @@ #include "lib/rpmlead.h" /* writeLead proto */ #include "lib/signature.h" /* signature constants */ -#include "rpmdb/legacy.h" /* XXX rpmfiBuildFNames() */ +#include "lib/legacy.h" /* XXX rpmfiBuildFNames() */ #include <rpmfileutil.h> /* rpmMkTempFile() */ #include "lib/misc.h" /* XXX rpmMkdirPath, doputenv */ #include <rpmdb.h> /* XXX for db_chrootDone */ diff --git a/python/header-py.c b/python/header-py.c index 7705f7340..165743eea 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -7,7 +7,7 @@ #include <rpmlib.h> #include <rpmstring.h> -#include "legacy.h" +#include "lib/legacy.h" #include <rpmts.h> /* XXX rpmtsCreate/rpmtsFree */ diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index dcfa7b15b..e8a16c4de 100644 --- a/rpmdb/Makefile.am +++ b/rpmdb/Makefile.am @@ -18,7 +18,6 @@ librpmdb_la_SOURCES = \ dbconfig.c fprint.c fprint.h \ hdrNVR.c header.c header_internal.c header_internal.h \ header_common.c header_method.h \ - legacy.c legacy.h \ merge.c \ poptDB.c rpmhash.c rpmhash.h rpmdb.c rpmdb_internal.h \ tagname.c tagtbl.c diff --git a/rpmdb/rpmdb.c b/rpmdb/rpmdb.c index 165b00973..6ff64d6f2 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -26,7 +26,6 @@ #include "rpmdb/rpmdb_internal.h" #include <rpmdb.h> #include "rpmdb/fprint.h" -#include "rpmdb/legacy.h" #include "rpmdb/header_internal.h" /* XXX for HEADERFLAG_ALLOCATED */ #include "debug.h" |