]> git.ipfire.org Git - pakfire.git/blobdiff - Makefile.am
python: Pakfire.execute(): Fix parsing some arguments
[pakfire.git] / Makefile.am
index ffc7599fdbef2583bef9d045fb835830dc267d82..2fbead80e7d75fca4f802133acb5fcb9b3f833cd 100644 (file)
@@ -51,7 +51,6 @@ EXTRA_DIST =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
-       -I $(top_srcdir)/include \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS) \
@@ -69,6 +68,7 @@ AM_YFLAGS = \
 PAKFIRE_CPPFLAGS = -I$(top_srcdir)/src/libpakfire/include
 PAKFIRE_LIBS     = libpakfire.la
 
+bin_PROGRAMS =
 check_PROGRAMS =
 lib_LTLIBRARIES =
 libexec_PROGRAMS =
@@ -103,21 +103,12 @@ dist_doc_DATA = \
 # ------------------------------------------------------------------------------
 
 bin_SCRIPTS = \
-       src/scripts/pakfire \
-       src/scripts/pakfire-builder \
-       src/scripts/pakfire-client \
        src/scripts/pakfire-daemon
 
 EXTRA_DIST += \
-       src/scripts/pakfire.in \
-       src/scripts/pakfire-builder.in \
-       src/scripts/pakfire-client.in \
        src/scripts/pakfire-daemon.in
 
 CLEANFILES += \
-       src/scripts/pakfire \
-       src/scripts/pakfire-builder \
-       src/scripts/pakfire-client \
        src/scripts/pakfire-daemon
 
 # ------------------------------------------------------------------------------
@@ -125,11 +116,11 @@ CLEANFILES += \
 pakfire_PYTHON = \
        src/pakfire/__init__.py \
        src/pakfire/__version__.py \
+       src/pakfire/buildservice.py \
        src/pakfire/config.py \
        src/pakfire/constants.py \
        src/pakfire/daemon.py \
        src/pakfire/errors.py \
-       src/pakfire/hub.py \
        src/pakfire/i18n.py \
        src/pakfire/logger.py \
        src/pakfire/util.py
@@ -145,6 +136,12 @@ _pakfire_la_SOURCES = \
        src/_pakfire/_pakfiremodule.c \
        src/_pakfire/archive.c \
        src/_pakfire/archive.h \
+       src/_pakfire/archive_file.c \
+       src/_pakfire/archive_file.h \
+       src/_pakfire/buildservice.c \
+       src/_pakfire/buildservice.h \
+       src/_pakfire/ctx.c \
+       src/_pakfire/ctx.h \
        src/_pakfire/errors.h \
        src/_pakfire/file.c \
        src/_pakfire/file.h \
@@ -156,8 +153,6 @@ _pakfire_la_SOURCES = \
        src/_pakfire/pakfire.h \
        src/_pakfire/problem.c \
        src/_pakfire/problem.h \
-       src/_pakfire/progressbar.c \
-       src/_pakfire/progressbar.h \
        src/_pakfire/repo.c \
        src/_pakfire/repo.h \
        src/_pakfire/solution.c \
@@ -172,6 +167,7 @@ _pakfire_la_CPPFLAGS = \
 _pakfire_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(PYTHON_DEVEL_CFLAGS) \
+       $(JSON_C_CFLAGS) \
        -Wno-cast-function-type
 
 _pakfire_la_LDFLAGS = \
@@ -201,7 +197,8 @@ libpakfire_parser_la_SOURCES = \
 
 libpakfire_parser_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(JSON_C_CFLAGS)
+       $(JSON_C_CFLAGS) \
+       -fno-analyzer
 
 libpakfire_parser_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
@@ -219,94 +216,109 @@ libpakfire_la_SOURCES = \
        src/libpakfire/arch.c \
        src/libpakfire/archive.c \
        src/libpakfire/build.c \
+       src/libpakfire/buildservice.c \
        src/libpakfire/cgroup.c \
        src/libpakfire/compress.c \
        src/libpakfire/config.c \
+       src/libpakfire/ctx.c \
+       src/libpakfire/daemon.c \
        src/libpakfire/db.c \
        src/libpakfire/dependencies.c \
        src/libpakfire/digest.c \
        src/libpakfire/dist.c \
-       src/libpakfire/downloader.c \
        src/libpakfire/fhs.c \
        src/libpakfire/file.c \
        src/libpakfire/filelist.c \
+       src/libpakfire/httpclient.c \
        src/libpakfire/jail.c \
        src/libpakfire/key.c \
-       src/libpakfire/keystore.c \
        src/libpakfire/linter.c \
        src/libpakfire/logging.c \
+       src/libpakfire/mirror.c \
+       src/libpakfire/mirrorlist.c \
        src/libpakfire/mount.c \
+       src/libpakfire/os.c \
        src/libpakfire/package.c \
        src/libpakfire/packager.c \
        src/libpakfire/packagelist.c \
        src/libpakfire/pakfire.c \
+       src/libpakfire/parse.c \
        src/libpakfire/parser.c \
+       src/libpakfire/path.c \
        src/libpakfire/problem.c \
-       src/libpakfire/progressbar.c \
+       src/libpakfire/progress.c \
        src/libpakfire/pwd.c \
        src/libpakfire/repo.c \
        src/libpakfire/repolist.c \
-       src/libpakfire/request.c \
        src/libpakfire/scriptlet.c \
        src/libpakfire/snapshot.c \
        src/libpakfire/solution.c \
        src/libpakfire/string.c \
        src/libpakfire/transaction.c \
-       src/libpakfire/ui.c \
-       src/libpakfire/util.c
+       src/libpakfire/util.c \
+       src/libpakfire/xfer.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/buildservice.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/ctx.h \
+       src/libpakfire/include/pakfire/daemon.h \
        src/libpakfire/include/pakfire/db.h \
        src/libpakfire/include/pakfire/dependencies.h \
        src/libpakfire/include/pakfire/digest.h \
        src/libpakfire/include/pakfire/dist.h \
-       src/libpakfire/include/pakfire/downloader.h \
        src/libpakfire/include/pakfire/fhs.h \
        src/libpakfire/include/pakfire/file.h \
        src/libpakfire/include/pakfire/filelist.h \
+       src/libpakfire/include/pakfire/httpclient.h \
        src/libpakfire/include/pakfire/i18n.h \
        src/libpakfire/include/pakfire/jail.h \
        src/libpakfire/include/pakfire/key.h \
-       src/libpakfire/include/pakfire/keystore.h \
        src/libpakfire/include/pakfire/linter.h \
        src/libpakfire/include/pakfire/logging.h \
+       src/libpakfire/include/pakfire/mirror.h \
+       src/libpakfire/include/pakfire/mirrorlist.h \
        src/libpakfire/include/pakfire/mount.h \
+       src/libpakfire/include/pakfire/os.h \
        src/libpakfire/include/pakfire/package.h \
        src/libpakfire/include/pakfire/packager.h \
        src/libpakfire/include/pakfire/packagelist.h \
        src/libpakfire/include/pakfire/pakfire.h \
+       src/libpakfire/include/pakfire/parse.h \
        src/libpakfire/include/pakfire/parser.h \
+       src/libpakfire/include/pakfire/path.h \
        src/libpakfire/include/pakfire/private.h \
        src/libpakfire/include/pakfire/problem.h \
-       src/libpakfire/include/pakfire/progressbar.h \
+       src/libpakfire/include/pakfire/progress.h \
        src/libpakfire/include/pakfire/pwd.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/snapshot.h \
        src/libpakfire/include/pakfire/solution.h \
        src/libpakfire/include/pakfire/string.h \
        src/libpakfire/include/pakfire/transaction.h \
-       src/libpakfire/include/pakfire/ui.h \
-       src/libpakfire/include/pakfire/util.h
+       src/libpakfire/include/pakfire/util.h \
+       src/libpakfire/include/pakfire/xfer.h
 
 libpakfire_la_CFLAGS = \
        $(AM_CFLAGS) \
        -fvisibility=hidden \
-       $(CAP_LIBS) \
+       $(BPF_CFLAGS) \
+       $(CAP_CFLAGS) \
        $(CURL_CFLAGS) \
        $(ELF_CFLAGS) \
        $(JSON_C_CFLAGS) \
+       $(KRB5_CFLAGS) \
        $(MAGIC_CFLAGS) \
-       $(MOUNT_CFLAGS) \
+       $(NL3_CFLAGS) \
+       $(NL3_ROUTE_CFLAGS) \
        $(OPENSSL_CFLAGS) \
        $(PCRE2_CFLAGS) \
        $(SECCOMP_CFLAGS) \
@@ -330,19 +342,22 @@ libpakfire_la_LDFLAGS = \
 libpakfire_la_LIBADD = \
        libpakfire-parser.la \
        $(ARCHIVE_LIBS) \
+       $(BPF_LIBS) \
        $(CAP_LIBS) \
        $(CURL_LIBS) \
        $(ELF_LIBS) \
-       $(GPGME_LIBS) \
        $(JSON_C_LIBS) \
+       $(KRB5_LIBS) \
        $(LZMA_LIBS) \
        $(MAGIC_LIBS) \
-       $(MOUNT_LIBS) \
+       $(NL3_LIBS) \
+       $(NL3_ROUTE_LIBS) \
        $(OPENSSL_LIBS) \
        $(PCRE2_LIBS) \
        $(SECCOMP_LIBS) \
        $(SOLV_LIBS) \
        $(SQLITE3_LIBS) \
+       $(SUBID_LIBS) \
        $(SYSTEMD_LIBS) \
        $(UUID_LIBS) \
        $(ZSTD_LIBS)
@@ -354,6 +369,8 @@ libpakfire_la_DEPENDENCIES = \
 EXTRA_DIST += \
        src/libpakfire/libpakfire.sym
 
+# ------------------------------------------------------------------------------
+
 noinst_LTLIBRARIES += \
        libpakfire-internal.la
 
@@ -376,6 +393,199 @@ libpakfire_internal_la_LIBADD = \
 libpakfire_internal_la_DEPENDENCIES = \
        $(libpakfire_la_DEPENDENCIES)
 
+# ------------------------------------------------------------------------------
+
+bin_PROGRAMS += \
+       pakfire
+
+pakfire_SOURCES = \
+       src/cli/pakfire.c
+
+pakfire_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/libpakfire/include
+
+pakfire_CFLAGS = \
+       $(AM_CFLAGS)
+
+pakfire_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+pakfire_LDADD = \
+       libpakfire.la \
+       libcli.la
+
+# ------------------------------------------------------------------------------
+
+bin_PROGRAMS += \
+       pakfire-builder
+
+pakfire_builder_SOURCES = \
+       src/cli/pakfire-builder.c
+
+pakfire_builder_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/libpakfire/include
+
+pakfire_builder_CFLAGS = \
+       $(AM_CFLAGS)
+
+pakfire_builder_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+pakfire_builder_LDADD = \
+       libpakfire.la \
+       libcli.la
+
+# ------------------------------------------------------------------------------
+
+bin_PROGRAMS += \
+       pakfire-client
+
+pakfire_client_SOURCES = \
+       src/cli/pakfire-client.c
+
+pakfire_client_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -I$(top_srcdir)/src/libpakfire/include
+
+pakfire_client_CFLAGS = \
+       $(AM_CFLAGS)
+
+pakfire_client_LDFLAGS = \
+       $(AM_LDFLAGS)
+
+pakfire_client_LDADD = \
+       libpakfire.la \
+       libcli.la
+
+# ------------------------------------------------------------------------------
+
+#
+# Disabled because we cannot fully implement the build service communication in C
+#
+#bin_PROGRAMS += \
+#      pakfire-daemon
+#
+#pakfire_daemon_SOURCES = \
+#      src/cli/pakfire-daemon.c
+#
+#pakfire_daemon_CPPFLAGS = \
+#      $(AM_CPPFLAGS) \
+#      -I$(top_srcdir)/src/libpakfire/include
+#
+#pakfire_daemon_CFLAGS = \
+#      $(AM_CFLAGS)
+#
+#pakfire_daemon_LDFLAGS = \
+#      $(AM_LDFLAGS)
+#
+#pakfire_daemon_LDADD = \
+#      libpakfire.la \
+#      libcli.la
+
+# ------------------------------------------------------------------------------
+
+noinst_LTLIBRARIES += \
+       libcli.la
+
+libcli_la_SOURCES = \
+       src/cli/lib/assert.c \
+       src/cli/lib/assert.h \
+       src/cli/lib/build.c \
+       src/cli/lib/build.h \
+       src/cli/lib/check.c \
+       src/cli/lib/check.h \
+       src/cli/lib/clean.c \
+       src/cli/lib/clean.h \
+       src/cli/lib/client-build.c \
+       src/cli/lib/client-build.h \
+       src/cli/lib/color.c \
+       src/cli/lib/color.h \
+       src/cli/lib/command.c \
+       src/cli/lib/command.h \
+       src/cli/lib/config.c \
+       src/cli/lib/config.h \
+       src/cli/lib/daemon.c \
+       src/cli/lib/daemon.h \
+       src/cli/lib/dist.c \
+       src/cli/lib/dist.h \
+       src/cli/lib/dump.c \
+       src/cli/lib/dump.h \
+       src/cli/lib/image.c \
+       src/cli/lib/image.h \
+       src/cli/lib/image_create.c \
+       src/cli/lib/image_create.h \
+       src/cli/lib/info.c \
+       src/cli/lib/info.h \
+       src/cli/lib/install.h \
+       src/cli/lib/install.c \
+       src/cli/lib/pakfire.c \
+       src/cli/lib/pakfire.h \
+       src/cli/lib/progressbar.c \
+       src/cli/lib/progressbar.h \
+       src/cli/lib/provides.h \
+       src/cli/lib/provides.c \
+       src/cli/lib/remove.c \
+       src/cli/lib/remove.h \
+       src/cli/lib/repo.c \
+       src/cli/lib/repo.h \
+       src/cli/lib/repo_compose.c \
+       src/cli/lib/repo_compose.h \
+       src/cli/lib/repo_create.c \
+       src/cli/lib/repo_create.h \
+       src/cli/lib/repo_delete.c \
+       src/cli/lib/repo_delete.h \
+       src/cli/lib/repo_list.c \
+       src/cli/lib/repo_list.h \
+       src/cli/lib/repo_show.c \
+       src/cli/lib/repo_show.h \
+       src/cli/lib/repolist.c \
+       src/cli/lib/repolist.h \
+       src/cli/lib/requires.c \
+       src/cli/lib/requires.h \
+       src/cli/lib/shell.c \
+       src/cli/lib/shell.h \
+       src/cli/lib/search.c \
+       src/cli/lib/search.h \
+       src/cli/lib/sync.c \
+       src/cli/lib/sync.h \
+       src/cli/lib/terminal.c \
+       src/cli/lib/terminal.h \
+       src/cli/lib/transaction.c \
+       src/cli/lib/transaction.h \
+       src/cli/lib/update.c \
+       src/cli/lib/update.h \
+       src/cli/lib/upload.c \
+       src/cli/lib/upload.h \
+       src/cli/lib/upload_create.c \
+       src/cli/lib/upload_create.h \
+       src/cli/lib/upload_delete.c \
+       src/cli/lib/upload_delete.h \
+       src/cli/lib/upload_list.c \
+       src/cli/lib/upload_list.h \
+       src/cli/lib/version.c \
+       src/cli/lib/version.h
+
+libcli_la_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DPAKFIRE_PRIVATE \
+       -I$(top_srcdir)/src/libpakfire/include
+
+libcli_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(JSON_C_CFLAGS)
+
+libcli_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       $(JSON_C_LIBS)
+
+libcli_la_LIBADD = \
+       libpakfire.la \
+       libpakfire-internal.la
+
+# ------------------------------------------------------------------------------
+
 check_PROGRAMS += \
        tests/libpakfire/main \
        tests/libpakfire/arch \
@@ -387,19 +597,21 @@ check_PROGRAMS += \
        tests/libpakfire/db \
        tests/libpakfire/dependencies \
        tests/libpakfire/digest \
-       tests/libpakfire/downloader \
        tests/libpakfire/file \
+       tests/libpakfire/httpclient \
        tests/libpakfire/jail \
        tests/libpakfire/key \
        tests/libpakfire/makefile \
+       tests/libpakfire/os \
        tests/libpakfire/package \
        tests/libpakfire/packager \
        tests/libpakfire/parser \
-       tests/libpakfire/progressbar \
+       tests/libpakfire/path \
        tests/libpakfire/repo \
        tests/libpakfire/snapshot \
        tests/libpakfire/string \
-       tests/libpakfire/util
+       tests/libpakfire/util \
+       tests/libpakfire/xfer
 
 dist_tests_libpakfire_main_SOURCES = \
        tests/libpakfire/main.c
@@ -521,28 +733,28 @@ tests_libpakfire_digest_CFLAGS = \
 tests_libpakfire_digest_LDADD = \
        $(TESTSUITE_LDADD)
 
-dist_tests_libpakfire_downloader_SOURCES = \
-       tests/libpakfire/downloader.c
+dist_tests_libpakfire_file_SOURCES = \
+       tests/libpakfire/file.c
 
-tests_libpakfire_downloader_CPPFLAGS = \
+tests_libpakfire_file_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
-tests_libpakfire_downloader_CFLAGS = \
+tests_libpakfire_file_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
-tests_libpakfire_downloader_LDADD = \
+tests_libpakfire_file_LDADD = \
        $(TESTSUITE_LDADD)
 
-dist_tests_libpakfire_file_SOURCES = \
-       tests/libpakfire/file.c
+dist_tests_libpakfire_httpclient_SOURCES = \
+       tests/libpakfire/httpclient.c
 
-tests_libpakfire_file_CPPFLAGS = \
+tests_libpakfire_httpclient_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
-tests_libpakfire_file_CFLAGS = \
+tests_libpakfire_httpclient_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
-tests_libpakfire_file_LDADD = \
+tests_libpakfire_httpclient_LDADD = \
        $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_jail_SOURCES = \
@@ -558,8 +770,7 @@ tests_libpakfire_jail_LDADD = \
        $(TESTSUITE_LDADD)
 
 tests_libpakfire_key_SOURCES = \
-       tests/libpakfire/key.c \
-       tests/libpakfire/key.h
+       tests/libpakfire/key.c
 
 tests_libpakfire_key_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
@@ -582,6 +793,18 @@ tests_libpakfire_makefile_CFLAGS = \
 tests_libpakfire_makefile_LDADD = \
        $(TESTSUITE_LDADD)
 
+dist_tests_libpakfire_os_SOURCES = \
+       tests/libpakfire/os.c
+
+tests_libpakfire_os_CPPFLAGS = \
+       $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_os_CFLAGS = \
+       $(TESTSUITE_CFLAGS)
+
+tests_libpakfire_os_LDADD = \
+       $(TESTSUITE_LDADD)
+
 dist_tests_libpakfire_package_SOURECES = \
        tests/libpakfire/package.c
 
@@ -618,16 +841,16 @@ tests_libpakfire_parser_CFLAGS = \
 tests_libpakfire_parser_LDADD = \
        $(TESTSUITE_LDADD)
 
-dist_tests_libpakfire_progressbar_SOURCES = \
-       tests/libpakfire/progressbar.c
+dist_tests_libpakfire_path_SOURCES = \
+       tests/libpakfire/path.c
 
-tests_libpakfire_progressbar_CPPFLAGS = \
+tests_libpakfire_path_CPPFLAGS = \
        $(TESTSUITE_CPPFLAGS)
 
-tests_libpakfire_progressbar_CFLAGS = \
+tests_libpakfire_path_CFLAGS = \
        $(TESTSUITE_CFLAGS)
 
-tests_libpakfire_progressbar_LDADD = \
+tests_libpakfire_path_LDADD = \
        $(TESTSUITE_LDADD)
 
 dist_tests_libpakfire_repo_SOURCES = \
@@ -678,6 +901,18 @@ tests_libpakfire_util_CFLAGS = \
 tests_libpakfire_util_LDADD = \
        $(TESTSUITE_LDADD)
 
+dist_tests_libpakfire_xfer_SOURCES = \
+       tests/libpakfire/xfer.c
+
+tests_libpakfire_xfer_CPPFLAGS = \
+       $(TESTSUITE_CPPFLAGS)
+
+tests_libpakfire_xfer_CFLAGS = \
+       $(TESTSUITE_CFLAGS)
+
+tests_libpakfire_xfer_LDADD = \
+       $(TESTSUITE_LDADD)
+
 # ------------------------------------------------------------------------------
 
 noinst_PROGRAMS += \
@@ -686,6 +921,9 @@ noinst_PROGRAMS += \
 tests_stub_root_command_SOURCES = \
        tests/stub/command.c
 
+tests_stub_root_command_CFLAGS = \
+       -fno-analyzer
+
 tests_stub_root_command_LDFLAGS = \
        -all-static
 
@@ -720,15 +958,11 @@ tests_parser_test_LDADD = \
 # ------------------------------------------------------------------------------
 
 dist_scripts_SCRIPTS = \
-       src/scripts/check-buildroot \
-       src/scripts/check-hardening \
-       src/scripts/check-interpreters \
-       src/scripts/check-rpaths \
-       src/scripts/check-unsafe-files \
        src/scripts/compress-man-pages \
        src/scripts/find-prerequires \
        src/scripts/find-provides \
        src/scripts/find-requires \
+       src/scripts/mkimage \
        src/scripts/perl.prov \
        src/scripts/perl.req \
        src/scripts/strip
@@ -838,9 +1072,7 @@ endif
 # ------------------------------------------------------------------------------
 
 dist_configs_DATA = \
-       contrib/config/client.conf \
-       contrib/config/daemon.conf \
-       contrib/config/general.conf
+       contrib/config/pakfire.conf
 
 dist_configsdistros_DATA = \
        contrib/config/distros/ipfire3.conf
@@ -881,6 +1113,8 @@ TESTSUITE_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        $(PAKFIRE_CPPFLAGS) \
        -DABS_TOP_SRCDIR=\"$(abs_top_srcdir)\" \
+       -DTEST_CONFIG_FILE=\"$(abs_top_srcdir)/contrib/config/pakfire.conf\" \
+       -DTEST_DATA_DIR=\"$(abs_top_srcdir)/tests/data\" \
        -DTEST_ROOTFS=\"$(TEST_ROOTFS)\" \
        -DTEST_STUB_COMMAND=\"$(abs_top_builddir)/tests/stub/root/command\" \
        -DTEST_STUB_ROOT=\"$(TEST_STUB_ROOT)\" \
@@ -895,15 +1129,29 @@ TESTSUITE_LDADD = \
        libpakfire-internal.la
 
 TESTS_ENVIRONMENT = \
+       TEST_CONFIG_FILE="$(abs_top_srcdir)/tests/pakfire.conf" \
        TEST_DATA_DIR="$(abs_top_srcdir)/tests/data" \
        TEST_STUB_ROOT="$(TEST_STUB_ROOT)" \
        PAKFIRE_LOG=debug \
        topdir="$(shell pwd)"
 
+# Test the library we just built
+TESTS_ENVIRONMENT += \
+       LD_LIBRARY_PATH=$(top_srcdir)/.libs:$(LD_LIBRARY_PATH)
+
+# Test the Python modules we just built
+TESTS_ENVIRONMENT += \
+       PYTHONPATH=$(top_srcdir)/src:$(top_srcdir)/.libs:$(PYTHONPATH)
+
 dist_check_SCRIPTS = \
+       tests/python/archive.py \
+       tests/python/ctx.py \
+       tests/python/keys.py \
        tests/python/jail.py \
-       tests/python/progressbar.py \
-       tests/python/test.py
+       tests/python/package.py
+
+EXTRA_DIST += \
+       tests/python/tests.py
 
 TESTS = \
        $(check_PROGRAMS) \
@@ -913,7 +1161,6 @@ TESTS = \
 EXTRA_DIST += \
        tests/pakfire.conf \
        \
-       tests/data/726D8B0B0889B04E.key \
        tests/data/beep-1.3-2.ip3.x86_64.pfm \
        \
        tests/data/beep.nm \
@@ -924,6 +1171,9 @@ EXTRA_DIST += \
        \
        tests/data/digest/random \
        \
+       tests/data/keys/key1.pub \
+       tests/data/keys/key1.sec \
+       \
        tests/data/packages/dummy/dummy.nm \
        \
        tests/data/parser/test-comments.txt \