pygos/pkg-utils
1
0
Fork 0
mirror of https://github.com/pygos/pkg-utils.git synced 2024-11-23 21:30:41 +01:00
Code Issues Releases Wiki Activity

cleanup: move package dependency management to libpkg.a

Browse source 
Signed-off-by: David Oberhollenzer <goliath@infraroot.at>
This commit is contained in:
David Oberhollenzer 2019-07-17 12:45:23 +02:00
parent a632656a60
commit 4a7b1d3b3c
8 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
main/depgraph.h → include/pkg/pkglist.h
View file

@ -1,6 +1,6 @@
/* SPDX-License-Identifier: ISC */ /* SPDX-License-Identifier: ISC */
#ifndef DEPGRAPH_H #ifndef PKGLIST_H
#define DEPGRAPH_H #define PKGLIST_H
struct pkg_dep_node { struct pkg_dep_node {
char *name; char *name;
@ -30,4 +30,4 @@ int collect_dependencies(int repofd, struct pkg_dep_list *list);
int sort_by_dependencies(struct pkg_dep_list *list); int sort_by_dependencies(struct pkg_dep_list *list);
#endif /* DEPGRAPH_H */ #endif /* PKGLIST_H */

2
lib/Makemodule.am
View file

@ -30,7 +30,9 @@ endif
libpkg_a_SOURCES = include/pkg/pkgformat.h include/pkg/pkgreader.h libpkg_a_SOURCES = include/pkg/pkgformat.h include/pkg/pkgreader.h
libpkg_a_SOURCES += include/pkg/pkgio.h include/pkg/pkgwriter.h libpkg_a_SOURCES += include/pkg/pkgio.h include/pkg/pkgwriter.h
libpkg_a_SOURCES += include/pkg/pkglist.h
libpkg_a_SOURCES += lib/pkg/pkgreader.c lib/pkg/pkgwriter.c libpkg_a_SOURCES += lib/pkg/pkgreader.c lib/pkg/pkgwriter.c
libpkg_a_SOURCES += lib/pkg/pkg_unpack.c lib/pkg/pkgio_rd_image_entry.c libpkg_a_SOURCES += lib/pkg/pkg_unpack.c lib/pkg/pkgio_rd_image_entry.c
libpkg_a_SOURCES += lib/pkg/collect.c lib/pkg/pkglist.c lib/pkg/tsort.c
noinst_LIBRARIES += libutil.a libfilelist.a libcomp.a libpkg.a noinst_LIBRARIES += libutil.a libfilelist.a libcomp.a libpkg.a

2
main/depgraph/collect.c → lib/pkg/collect.c
View file

@ -4,7 +4,7 @@
#include <stdio.h> #include <stdio.h>
#include "pkg/pkgreader.h" #include "pkg/pkgreader.h"
#include "depgraph.h" #include "pkg/pkglist.h"
int collect_dependencies(int repofd, struct pkg_dep_list *list) int collect_dependencies(int repofd, struct pkg_dep_list *list)
{ {

2
main/depgraph/pkglist.c → lib/pkg/pkglist.c
View file

@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "depgraph.h" #include "pkg/pkglist.h"
struct pkg_dep_node *append_pkg(struct pkg_dep_list *list, const char *name) struct pkg_dep_node *append_pkg(struct pkg_dep_list *list, const char *name)
{ {

2
main/depgraph/tsort.c → lib/pkg/tsort.c
View file

@ -2,7 +2,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "depgraph.h" #include "pkg/pkglist.h"
static void remove_dependency(struct pkg_dep_list *list, static void remove_dependency(struct pkg_dep_list *list,
struct pkg_dep_node *pkg) struct pkg_dep_node *pkg)

5
main/Makemodule.am
View file

@ -1,7 +1,4 @@
pkg_SOURCES = main/command.h main/depgraph.h pkg_SOURCES = main/command.h main/pkg.c main/command.c
pkg_SOURCES += main/pkg.c main/command.c
pkg_SOURCES += main/depgraph/collect.c main/depgraph/pkglist.c
pkg_SOURCES += main/depgraph/tsort.c
pkg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/main pkg_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/main
pkg_CFLAGS = $(AM_CFLAGS) pkg_CFLAGS = $(AM_CFLAGS)

2
main/cmd/depgraph.c
View file

@ -7,7 +7,7 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include "depgraph.h" #include "pkg/pkglist.h"
#include "command.h" #include "command.h"
#include "config.h" #include "config.h"

2
main/cmd/install.c
View file

@ -7,9 +7,9 @@
#include <stdio.h> #include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include "pkg/pkglist.h"
#include "pkg/pkgio.h" #include "pkg/pkgio.h"
#include "util/util.h" #include "util/util.h"
#include "depgraph.h"
#include "command.h" #include "command.h"
#include "config.h" #include "config.h"