]> git.ipfire.org Git - people/stevee/pakfire.git/blobdiff - Makefile.am
projects / people / stevee / pakfire.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Drop quality-agent
[people/stevee/pakfire.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 8dddca705fc43e627c2497962f8ce3dfc99395dd..d6373c53101e29b0b96e9823b61fc216adbd9e05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,7 +40,6 @@ pythondir  = $(pyexecdir)
 configsdir = $(sysconfdir)/pakfire
 configsdistrosdir = $(configsdir)/distros
 macrosdir = $(prefix)/lib/pakfire/macros
-qualityagentdir = $(prefix)/lib/quality-agent
 scriptsdir = $(prefix)/lib/$(PACKAGE_NAME)
 
 TEST_ROOTFS = $(abs_top_builddir)/tests/.root
@@ -63,6 +62,10 @@ AM_LDFLAGS = $(OUR_LDFLAGS) \
        -Wl,--gc-sections \
        -Wl,--as-needed
 
+AM_YFLAGS = \
+       -d \
+       -Wno-yacc
+
 PAKFIRE_CPPFLAGS = -I$(top_srcdir)/src/libpakfire/include
 PAKFIRE_LIBS     = libpakfire.la
 
@@ -116,13 +119,11 @@ pakfire_PYTHON = \
        src/pakfire/__version__.py \
        src/pakfire/base.py \
        src/pakfire/builder.py \
-       src/pakfire/cgroups.py \
        src/pakfire/client.py \
        src/pakfire/cli.py \
        src/pakfire/config.py \
        src/pakfire/constants.py \
        src/pakfire/daemon.py \
-       src/pakfire/distro.py \
        src/pakfire/errors.py \
        src/pakfire/http.py \
        src/pakfire/hub.py \
@@ -144,13 +145,6 @@ pakfire_packagesdir = $(pythondir)/pakfire/packages
 
 # ------------------------------------------------------------------------------
 
-pakfire_repository_PYTHON = \
-       src/pakfire/repository/__init__.py
-
-pakfire_repositorydir = $(pythondir)/pakfire/repository
-
-# ------------------------------------------------------------------------------
-
 pakfire_ui_PYTHON = \
        src/pakfire/ui/__init__.py \
        src/pakfire/ui/base.py \
@@ -169,7 +163,6 @@ _pakfire_la_SOURCES = \
        src/_pakfire/_pakfiremodule.c \
        src/_pakfire/archive.c \
        src/_pakfire/archive.h \
-       src/_pakfire/constants.h \
        src/_pakfire/errors.h \
        src/_pakfire/key.c \
        src/_pakfire/key.h \
@@ -181,18 +174,14 @@ _pakfire_la_SOURCES = \
        src/_pakfire/parser.h \
        src/_pakfire/problem.c \
        src/_pakfire/problem.h \
-       src/_pakfire/relation.c \
-       src/_pakfire/relation.h \
+       src/_pakfire/progressbar.c \
+       src/_pakfire/progressbar.h \
        src/_pakfire/repo.c \
        src/_pakfire/repo.h \
        src/_pakfire/request.c \
        src/_pakfire/request.h \
-       src/_pakfire/selector.c \
-       src/_pakfire/selector.h \
        src/_pakfire/solution.c \
        src/_pakfire/solution.h \
-       src/_pakfire/step.c \
-       src/_pakfire/step.h \
        src/_pakfire/transaction.c \
        src/_pakfire/transaction.h \
        src/_pakfire/util.c \
@@ -241,13 +230,6 @@ libpakfire_parser_la_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -DPAKFIRE_PRIVATE
 
-src/libpakfire/parser/scanner.c: src/libpakfire/parser/grammar.h
-
-src/libpakfire/parser/grammar.h: src/libpakfire/parser/grammar.c
-
-src/libpakfire/parser/grammar.c: src/libpakfire/parser/grammar.y Makefile
-       $(AM_V_GEN) $(BISON) -Wall -t -d -o $@ $<
-
 BUILT_SOURCES += \
        src/libpakfire/parser/grammar.h
 
@@ -257,15 +239,16 @@ lib_LTLIBRARIES += \
 libpakfire_la_SOURCES = \
        src/libpakfire/arch.c \
        src/libpakfire/archive.c \
+       src/libpakfire/build.c \
+       src/libpakfire/cgroup.c \
        src/libpakfire/compress.c \
+       src/libpakfire/config.c \
        src/libpakfire/db.c \
        src/libpakfire/dist.c \
        src/libpakfire/downloader.c \
-       src/libpakfire/errno.c \
        src/libpakfire/execute.c \
        src/libpakfire/file.c \
        src/libpakfire/filelist.c \
-       src/libpakfire/filter.c \
        src/libpakfire/key.c \
        src/libpakfire/logging.c \
        src/libpakfire/package.c \
@@ -274,31 +257,31 @@ libpakfire_la_SOURCES = \
        src/libpakfire/pakfire.c \
        src/libpakfire/parser.c \
        src/libpakfire/problem.c \
+       src/libpakfire/progressbar.c \
        src/libpakfire/pwd.c \
-       src/libpakfire/relation.c \
-       src/libpakfire/relationlist.c \
        src/libpakfire/repo.c \
+       src/libpakfire/repolist.c \
        src/libpakfire/request.c \
        src/libpakfire/scriptlet.c \
-       src/libpakfire/selector.c \
+       src/libpakfire/snapshot.c \
        src/libpakfire/solution.c \
-       src/libpakfire/step.c \
        src/libpakfire/transaction.c \
        src/libpakfire/util.c
 
 pkginclude_HEADERS += \
        src/libpakfire/include/pakfire/arch.h \
        src/libpakfire/include/pakfire/archive.h \
+       src/libpakfire/include/pakfire/build.h \
+       src/libpakfire/include/pakfire/cgroup.h \
        src/libpakfire/include/pakfire/compress.h \
+       src/libpakfire/include/pakfire/config.h \
        src/libpakfire/include/pakfire/constants.h \
        src/libpakfire/include/pakfire/db.h \
        src/libpakfire/include/pakfire/dist.h \
        src/libpakfire/include/pakfire/downloader.h \
-       src/libpakfire/include/pakfire/errno.h \
        src/libpakfire/include/pakfire/execute.h \
        src/libpakfire/include/pakfire/file.h \
        src/libpakfire/include/pakfire/filelist.h \
-       src/libpakfire/include/pakfire/filter.h \
        src/libpakfire/include/pakfire/i18n.h \
        src/libpakfire/include/pakfire/key.h \
        src/libpakfire/include/pakfire/logging.h \
@@ -309,15 +292,14 @@ pkginclude_HEADERS += \
        src/libpakfire/include/pakfire/parser.h \
        src/libpakfire/include/pakfire/private.h \
        src/libpakfire/include/pakfire/problem.h \
+       src/libpakfire/include/pakfire/progressbar.h \
        src/libpakfire/include/pakfire/pwd.h \
-       src/libpakfire/include/pakfire/relation.h \
-       src/libpakfire/include/pakfire/relationlist.h \
        src/libpakfire/include/pakfire/repo.h \
+       src/libpakfire/include/pakfire/repolist.h \
        src/libpakfire/include/pakfire/request.h \
        src/libpakfire/include/pakfire/scriptlet.h \
-       src/libpakfire/include/pakfire/selector.h \
+       src/libpakfire/include/pakfire/snapshot.h \
        src/libpakfire/include/pakfire/solution.h \
-       src/libpakfire/include/pakfire/step.h \
        src/libpakfire/include/pakfire/transaction.h \
        src/libpakfire/include/pakfire/types.h \
        src/libpakfire/include/pakfire/util.h
@@ -366,11 +348,35 @@ libpakfire_la_DEPENDENCIES = \
 EXTRA_DIST += \
        src/libpakfire/libpakfire.sym
 
+noinst_LTLIBRARIES += \
+       libpakfire-internal.la
+
+libpakfire_internal_la_SOURCES = \
+       $(libpakfire_la_SOURCES)
+
+libpakfire_internal_la_CPPFLAGS = \
+       $(libpakfire_la_CPPFLAGS)
+
+libpakfire_internal_la_CFLAGS = \
+       $(libpakfire_la_CFLAGS)
+
+libpakfire_internal_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -Wl,--version-script=$(top_srcdir)/src/libpakfire/libpakfire.sym
+
+libpakfire_internal_la_LIBADD = \
+       $(libpakfire_la_LIBADD)
+
+libpakfire_internal_la_DEPENDENCIES = \
+       $(libpakfire_la_DEPENDENCIES)
+
 check_PROGRAMS += \
        tests/libpakfire/main \
        tests/libpakfire/arch \
        tests/libpakfire/archive \
+       tests/libpakfire/cgroup \
        tests/libpakfire/compress \
+       tests/libpakfire/config \
        tests/libpakfire/db \
        tests/libpakfire/downloader \
        tests/libpakfire/execute \
@@ -378,6 +384,7 @@ check_PROGRAMS += \
        tests/libpakfire/makefile \
        tests/libpakfire/packager \
        tests/libpakfire/parser \
+       tests/libpakfire/progressbar \
        tests/libpakfire/repo \
        tests/libpakfire/util
 
@@ -389,8 +396,7 @@ tests_libpakfire_main_CPPFLAGS = \
        -DTEST_ROOTFS=\"$(TEST_ROOTFS)\"
 
 tests_libpakfire_main_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 tests_libpakfire_arch_SOURCES = \
        tests/libpakfire/arch.c
@@ -399,8 +405,7 @@ tests_libpakfire_arch_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_arch_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 tests_libpakfire_archive_SOURCES = \
        tests/libpakfire/archive.c
@@ -409,21 +414,34 @@ tests_libpakfire_archive_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_archive_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
+
+dist_tests_libpakfire_cgroup_SOURCES = \
+       tests/libpakfire/cgroup.c
+
+tests_libpakfire_cgroup_CPPFLAGS = \
+       $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_cgroup_LDADD = \
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_compress_SOURCES = \
-       tests/libpakfire/compress.c \
-       src/libpakfire/compress.c
+       tests/libpakfire/compress.c
 
 tests_libpakfire_compress_CPPFLAGS = \
-       $(TESTSUITE_CPPFLAGS) \
-       -DPAKFIRE_PRIVATE
+       $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_compress_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS) \
-       $(LZMA_LIBS)
+       $(TESTSUITE_LDADD)
+
+dist_tests_libpakfire_config_SOURCES = \
+       tests/libpakfire/config.c
+
+tests_libpakfire_config_CPPFLAGS = \
+       $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_config_LDADD = \
+       $(TESTSUITE_LDADD)
 
 tests_libpakfire_db_SOURCES = \
        tests/libpakfire/db.c
@@ -432,25 +450,16 @@ tests_libpakfire_db_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_db_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_downloader_SOURCES = \
-       tests/libpakfire/downloader.c \
-       src/libpakfire/downloader.c \
-       src/libpakfire/util.c
+       tests/libpakfire/downloader.c
 
 tests_libpakfire_downloader_CPPFLAGS = \
-       $(TESTSUITE_CPPFLAGS) \
-       $(JSON_C_CFLAGS) \
-       -DPAKFIRE_PRIVATE
+       $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_downloader_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(CURL_LIBS) \
-       $(JSON_C_LIBS) \
-       $(PAKFIRE_LIBS) \
-       $(UUID_LIBS)
+       $(TESTSUITE_LDADD)
 
 tests_libpakfire_execute_SOURCES = \
        tests/libpakfire/execute.c
@@ -459,8 +468,7 @@ tests_libpakfire_execute_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_execute_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 tests_libpakfire_key_SOURCES = \
        tests/libpakfire/key.c \
@@ -470,19 +478,16 @@ tests_libpakfire_key_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_key_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_makefile_SOURCES = \
        tests/libpakfire/makefile.c
 
 tests_libpakfire_makefile_CPPFLAGS = \
-       $(TESTSUITE_CPPFLAGS) \
-       -DPAKFIRE_PRIVATE
+       $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_makefile_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_packager_SOURCES = \
        tests/libpakfire/packager.c
@@ -491,8 +496,7 @@ tests_libpakfire_packager_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_packager_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_parser_SOURCES = \
        tests/libpakfire/parser.c
@@ -501,8 +505,16 @@ tests_libpakfire_parser_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_parser_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
+
+dist_tests_libpakfire_progressbar_SOURCES = \
+       tests/libpakfire/progressbar.c
+
+tests_libpakfire_progressbar_CPPFLAGS = \
+       $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_progressbar_LDADD = \
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_repo_SOURCES = \
        tests/libpakfire/repo.c
@@ -511,8 +523,7 @@ tests_libpakfire_repo_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_repo_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_util_SOURCES = \
        tests/libpakfire/util.c
@@ -521,8 +532,7 @@ tests_libpakfire_util_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
 tests_libpakfire_util_LDADD = \
-       $(TESTSUITE_LDADD) \
-       $(PAKFIRE_LIBS)
+       $(TESTSUITE_LDADD)
 
 # ------------------------------------------------------------------------------
 
@@ -543,20 +553,7 @@ libpakfire_preload_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 
-scripts_SCRIPTS = \
-       src/scripts/extract-debuginfo \
-       src/scripts/quality-agent
-
-EXTRA_DIST += \
-       src/scripts/extract-debuginfo.in \
-       src/scripts/quality-agent.in
-
-CLEANFILES += \
-       src/scripts/extract-debuginfo \
-       src/scripts/quality-agent
-
 dist_scripts_SCRIPTS = \
-       src/scripts/chroot-shell \
        src/scripts/cleanup \
        src/scripts/compress-man-pages \
        src/scripts/find-common \
@@ -567,7 +564,8 @@ dist_scripts_SCRIPTS = \
        src/scripts/perl.prov \
        src/scripts/perl.req \
        src/scripts/py-compile \
-       src/scripts/remove-static-libs
+       src/scripts/remove-static-libs \
+       src/scripts/strip
 
 dist_scripts_DATA = \
        src/scripts/functions-common \
@@ -579,28 +577,6 @@ dist_scripts_DATA = \
 
 # ------------------------------------------------------------------------------
 
-dist_qualityagent_SCRIPTS = \
-       src/quality-agent/001-include-files \
-       src/quality-agent/001-remove-info-files \
-       src/quality-agent/001-unsafe-files \
-       src/quality-agent/002-bad-symlinks \
-       src/quality-agent/003-libs-location \
-       src/quality-agent/050-canary \
-       src/quality-agent/050-execstacks \
-       src/quality-agent/050-invalid-interpreters \
-       src/quality-agent/050-libs-needed \
-       src/quality-agent/050-libs-soname \
-       src/quality-agent/050-libs-x86_64 \
-       src/quality-agent/050-nx \
-       src/quality-agent/050-relro \
-       src/quality-agent/050-rpaths \
-       src/quality-agent/095-directory-layout
-
-dist_qualityagent_DATA = \
-       src/quality-agent/qa-include
-
-# ------------------------------------------------------------------------------
-
 dist_macros_DATA = \
        macros/arch.macro \
        macros/build.macro \
@@ -609,7 +585,6 @@ dist_macros_DATA = \
        macros/package-default.macro \
        macros/perl.macro \
        macros/python.macro \
-       macros/quality-agent.macro \
        macros/systemd.macro \
        macros/templates.macro
 
@@ -629,7 +604,6 @@ endif
 # ------------------------------------------------------------------------------
 
 dist_configs_DATA = \
-       contrib/config/builder.conf \
        contrib/config/client.conf \
        contrib/config/daemon.conf \
        contrib/config/general.conf
@@ -643,8 +617,7 @@ substitutions = \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|bindir=$(bindir)|' \
-       '|libexecdir=$(libexecdir)|' \
-       '|qualityagentdir=$(qualityagentdir)|'
+       '|libexecdir=$(libexecdir)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -673,10 +646,13 @@ TESTSUITE_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(PAKFIRE_CPPFLAGS) \
        -DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
-       -DTEST_ROOTFS=\"$(TEST_ROOTFS)\"
+       -DTEST_ROOTFS=\"$(TEST_ROOTFS)\" \
+       -DPAKFIRE_PRIVATE
 
 TESTSUITE_LDADD = \
-       tests/libtestsuite.la
+       tests/libtestsuite.la \
+       libpakfire.la \
+       libpakfire-internal.la
 
 TESTS_ENVIRONMENT = \
        TEST_DATA_DIR="$(abs_top_srcdir)/tests/data" \
@@ -685,9 +661,9 @@ TESTS_ENVIRONMENT = \
        topdir="$(shell pwd)"
 
 dist_check_SCRIPTS = \
-       tests/python/cgroups.py \
        tests/python/execute.py \
        tests/python/parser.py \
+       tests/python/progressbar.py \
        tests/python/test.py
 
 TESTS = \
@@ -696,6 +672,8 @@ TESTS = \
 
 # Some test data to run tests
 EXTRA_DIST += \
+       tests/pakfire.conf \
+       \
        tests/data/726D8B0B0889B04E.key \
        tests/data/beep-1.3-2.ip3.x86_64.pfm \
        \
@@ -703,6 +681,7 @@ EXTRA_DIST += \
        tests/data/kernel.nm \
        \
        tests/data/compress/data.xz \
+       tests/data/compress/data.zst \
        \
        tests/data/parser/test-comments.txt \
        tests/data/parser/test-conditionals.txt \
Stefan's tree of pakfire.