From fbf0cb4441816b70a6a8e5ecef37d54b152b9db0 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 27 Nov 2007 11:34:23 +0200 Subject: [PATCH] =?utf8?q?Move=20legacy%#=C2=A4%#=C2=A4=20to=20librpm=20no?= =?utf8?q?w=20that=20it=20can=20move..?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- build/files.c | 2 +- build/pack.c | 2 +- build/poptBT.c | 1 - lib/Makefile.am | 4 +++- lib/formats.c | 2 +- {rpmdb => lib}/legacy.c | 2 +- {rpmdb => lib}/legacy.h | 0 lib/package.c | 2 +- lib/psm.c | 2 +- python/header-py.c | 2 +- rpmdb/Makefile.am | 1 - rpmdb/rpmdb.c | 1 - 12 files changed, 10 insertions(+), 11 deletions(-) rename {rpmdb => lib}/legacy.c (99%) rename {rpmdb => lib}/legacy.h (100%) diff --git a/build/files.c b/build/files.c index d62cb94..bbf2d90 100644 --- a/build/files.c +++ b/build/files.c @@ -30,7 +30,7 @@ #include "build/buildio.h" #include /* rpmDoDigest() */ -#include "rpmdb/legacy.h" /* XXX expandFileList, compressFileList */ +#include "lib/legacy.h" /* XXX expandFileList, compressFileList */ #include #include "debug.h" diff --git a/build/pack.c b/build/pack.c index 4296961..2ea8bf3 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 diff --git a/build/poptBT.c b/build/poptBT.c index 30e7817..71d37d1 100644 --- a/build/poptBT.c +++ b/build/poptBT.c @@ -7,7 +7,6 @@ #include -#include "rpmdb/legacy.h" /* XXX _noDirTokens */ #include #include "debug.h" diff --git a/lib/Makefile.am b/lib/Makefile.am index d3f9e0b..3ee2adb 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 996c5bf..fdb6a5f 100644 --- a/lib/formats.c +++ b/lib/formats.c @@ -9,7 +9,7 @@ #include -#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 similarity index 99% rename from rpmdb/legacy.c rename to lib/legacy.c index ed6669d..6a8e253 100644 --- a/rpmdb/legacy.c +++ b/lib/legacy.c @@ -7,7 +7,7 @@ #include #include #include -#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 similarity index 100% rename from rpmdb/legacy.h rename to lib/legacy.h diff --git a/lib/package.c b/lib/package.c index e30951e..7741490 100644 --- a/lib/package.c +++ b/lib/package.c @@ -12,7 +12,7 @@ #include -#include "rpmdb/legacy.h" /* XXX legacyRetrofit() */ +#include "lib/legacy.h" /* XXX legacyRetrofit() */ #include "lib/rpmlead.h" #include diff --git a/lib/psm.c b/lib/psm.c index 00489f1..22989e9 100644 --- a/lib/psm.c +++ b/lib/psm.c @@ -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 /* rpmMkTempFile() */ #include "lib/misc.h" /* XXX rpmMkdirPath, doputenv */ #include /* XXX for db_chrootDone */ diff --git a/python/header-py.c b/python/header-py.c index 7705f73..165743e 100644 --- a/python/header-py.c +++ b/python/header-py.c @@ -7,7 +7,7 @@ #include #include -#include "legacy.h" +#include "lib/legacy.h" #include /* XXX rpmtsCreate/rpmtsFree */ diff --git a/rpmdb/Makefile.am b/rpmdb/Makefile.am index dcfa7b1..e8a16c4 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 165b009..6ff64d6 100644 --- a/rpmdb/rpmdb.c +++ b/rpmdb/rpmdb.c @@ -26,7 +26,6 @@ #include "rpmdb/rpmdb_internal.h" #include #include "rpmdb/fprint.h" -#include "rpmdb/legacy.h" #include "rpmdb/header_internal.h" /* XXX for HEADERFLAG_ALLOCATED */ #include "debug.h" -- 2.7.4