Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=760430e5fe411eecac0873cb4254824419d7dfc6
commit 760430e5fe411eecac0873cb4254824419d7dfc6 Author: Michel Hermier <[email protected]> Date: Mon Oct 28 12:54:45 2013 +0100 libpacman: Move hash code to its own directory. diff --git a/lib/libpacman/CMakeLists.txt b/lib/libpacman/CMakeLists.txt index 1fb4897..520fae9 100644 --- a/lib/libpacman/CMakeLists.txt +++ b/lib/libpacman/CMakeLists.txt @@ -1,4 +1,7 @@ -set(LIBPACMAN_SOURCES +set(LIBPACMAN_SOURCES + hash/md5.c + hash/md5driver.c + hash/sha1.c add.c backup.c be_files.c @@ -11,14 +14,12 @@ set(LIBPACMAN_SOURCES handle.c list.c log.c - md5.c - md5driver.c package.c + packages_transaction.c pacman.c provide.c remove.c server.c - sha1.c sync.c trans.c trans_sysupgrade.c diff --git a/lib/libpacman/Makefile.am b/lib/libpacman/Makefile.am index dbaf7ba..dca794a 100644 --- a/lib/libpacman/Makefile.am +++ b/lib/libpacman/Makefile.am @@ -7,9 +7,13 @@ SUBDIRS = po localedir = $(datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -TARGETS = md5driver.c \ - md5.c \ - sha1.c \ +HASH_TARGETS = \ + hash/md5driver.c \ + hash/md5.c \ + hash/sha1.c + +TARGETS = \ + $(HASH_TARGETS) \ util.c \ list.c \ log.c \ diff --git a/lib/libpacman/add.c b/lib/libpacman/add.c index 0927f18..2907e20 100644 --- a/lib/libpacman/add.c +++ b/lib/libpacman/add.c @@ -38,7 +38,11 @@ #include <string.h> #include <limits.h> #include <libintl.h> + /* pacman-g2 */ +#include "hash/md5.h" +#include "hash/sha1.h" + #include "list.h" #include "trans.h" #include "util.h" @@ -46,8 +50,6 @@ #include "cache.h" #include "deps.h" #include "versioncmp.h" -#include "md5.h" -#include "sha1.h" #include "log.h" #include "backup.h" #include "package.h" diff --git a/lib/libpacman/md5.c b/lib/libpacman/hash/md5.c similarity index 100% rename from lib/libpacman/md5.c rename to lib/libpacman/hash/md5.c diff --git a/lib/libpacman/md5.h b/lib/libpacman/hash/md5.h similarity index 100% rename from lib/libpacman/md5.h rename to lib/libpacman/hash/md5.h diff --git a/lib/libpacman/md5driver.c b/lib/libpacman/hash/md5driver.c similarity index 98% rename from lib/libpacman/md5driver.c rename to lib/libpacman/hash/md5driver.c index 32cce79..1281c20 100644 --- a/lib/libpacman/md5driver.c +++ b/lib/libpacman/hash/md5driver.c @@ -25,7 +25,7 @@ documentation and/or software. #include <string.h> #include <libintl.h> #include "config.h" -#include "util.h" +#include "../util.h" #include "md5.h" /* Length of test block, number of test blocks. diff --git a/lib/libpacman/sha1.c b/lib/libpacman/hash/sha1.c similarity index 99% rename from lib/libpacman/sha1.c rename to lib/libpacman/hash/sha1.c index d5ae9c8..a3d50d9 100644 --- a/lib/libpacman/sha1.c +++ b/lib/libpacman/hash/sha1.c @@ -27,7 +27,7 @@ #endif #include <libintl.h> -#include "util.h" +#include "../util.h" #include "sha1.h" #include <sys/types.h> diff --git a/lib/libpacman/sha1.h b/lib/libpacman/hash/sha1.h similarity index 100% rename from lib/libpacman/sha1.h rename to lib/libpacman/hash/sha1.h diff --git a/lib/libpacman/pacman.c b/lib/libpacman/pacman.c index c852c09..4ac85d4 100644 --- a/lib/libpacman/pacman.c +++ b/lib/libpacman/pacman.c @@ -35,14 +35,16 @@ #include <limits.h> /* PATH_MAX */ #include <stdarg.h> #include <libintl.h> + /* pacman-g2 */ +#include "hash/md5.h" +#include "hash/sha1.h" + #include "config.h" #include "log.h" #include "error.h" #include "deps.h" #include "versioncmp.h" -#include "md5.h" -#include "sha1.h" #include "list.h" #include "package.h" #include "group.h" diff --git a/lib/libpacman/po/POTFILES.in b/lib/libpacman/po/POTFILES.in index 0c0c1f7..6d558de 100644 --- a/lib/libpacman/po/POTFILES.in +++ b/lib/libpacman/po/POTFILES.in @@ -1,3 +1,6 @@ +hash/md5.c +hash/md5driver.c +hash/sha1.c add.c pacman.c backup.c @@ -11,12 +14,9 @@ group.c handle.c list.c log.c -md5.c -md5driver.c package.c provide.c remove.c -sha1.c sync.c trans.c util.c diff --git a/lib/libpacman/remove.c b/lib/libpacman/remove.c index 3b25c4d..d9bc8d9 100644 --- a/lib/libpacman/remove.c +++ b/lib/libpacman/remove.c @@ -39,6 +39,7 @@ #include <limits.h> #include <zlib.h> #include <libintl.h> + /* pacman-g2 */ #include "list.h" #include "trans.h" @@ -46,8 +47,6 @@ #include "error.h" #include "deps.h" #include "versioncmp.h" -#include "md5.h" -#include "sha1.h" #include "log.h" #include "backup.h" #include "package.h" diff --git a/lib/libpacman/sync.c b/lib/libpacman/sync.c index 08f8527..d59f489 100644 --- a/lib/libpacman/sync.c +++ b/lib/libpacman/sync.c @@ -33,7 +33,11 @@ #endif #include <dirent.h> #include <libintl.h> + /* pacman-g2 */ +#include "hash/md5.h" +#include "hash/sha1.h" + #include "log.h" #include "error.h" #include "list.h" @@ -50,8 +54,6 @@ #include "handle.h" #include "util.h" #include "pacman.h" -#include "md5.h" -#include "sha1.h" #include "handle.h" #include "server.h" #include "packages_transaction.h" diff --git a/lib/libpacman/trans_sysupgrade.c b/lib/libpacman/trans_sysupgrade.c index 877384d..37f8332 100644 --- a/lib/libpacman/trans_sysupgrade.c +++ b/lib/libpacman/trans_sysupgrade.c @@ -51,8 +51,6 @@ #include "handle.h" #include "util.h" #include "pacman.h" -#include "md5.h" -#include "sha1.h" #include "handle.h" #include "server.h" _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
