Merge branch 'python3'

[pakfire.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 88878fa1e65f1d5e7ba4389542e4f5fe930223aa..18521f06c5ead8ee01597571570a00b363e7dc05 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,6 +39,7 @@ pythondir  = $(pyexecdir)
 
 configsdir = $(sysconfdir)/pakfire
 configsdistrosdir = $(configsdir)/distros
+dockerdir = $(datadir)/docker
 macrosdir = $(prefix)/lib/pakfire/macros
 scriptsdir = $(prefix)/lib/$(PACKAGE_NAME)
 
@@ -136,26 +137,6 @@ pakfiredir = $(pythondir)/pakfire
 
 # ------------------------------------------------------------------------------
 
-pakfire_packages_PYTHON = \
-       src/pakfire/packages/__init__.py \
-       src/pakfire/packages/packager.py \
-       src/pakfire/packages/tar.py
-
-pakfire_packagesdir = $(pythondir)/pakfire/packages
-
-# ------------------------------------------------------------------------------
-
-pakfire_ui_PYTHON = \
-       src/pakfire/ui/__init__.py \
-       src/pakfire/ui/base.py \
-       src/pakfire/ui/cli.py \
-       src/pakfire/ui/helpers.py \
-       src/pakfire/ui/progressbar.py
-
-pakfire_uidir = $(pythondir)/pakfire/ui
-
-# ------------------------------------------------------------------------------
-
 pkgpyexec_LTLIBRARIES += \
        _pakfire.la
 
@@ -266,6 +247,7 @@ libpakfire_la_SOURCES = \
        src/libpakfire/snapshot.c \
        src/libpakfire/solution.c \
        src/libpakfire/transaction.c \
+       src/libpakfire/ui.c \
        src/libpakfire/util.c
 
 pkginclude_HEADERS += \
@@ -302,6 +284,7 @@ pkginclude_HEADERS += \
        src/libpakfire/include/pakfire/solution.h \
        src/libpakfire/include/pakfire/transaction.h \
        src/libpakfire/include/pakfire/types.h \
+       src/libpakfire/include/pakfire/ui.h \
        src/libpakfire/include/pakfire/util.h
 
 libpakfire_la_CFLAGS = \
@@ -555,6 +538,14 @@ libpakfire_preload_la_LIBADD = \
 
 dist_scripts_SCRIPTS = \
        src/scripts/check-buildroot \
+       src/scripts/check-fhs \
+       src/scripts/check-hardening \
+       src/scripts/check-include \
+       src/scripts/check-interpreters \
+       src/scripts/check-libraries \
+       src/scripts/check-rpaths \
+       src/scripts/check-symlinks \
+       src/scripts/check-unsafe-files \
        src/scripts/cleanup \
        src/scripts/compress-man-pages \
        src/scripts/find-common \
@@ -604,6 +595,18 @@ endif
 
 # ------------------------------------------------------------------------------
 
+EXTRA_DIST += \
+       Dockerfile.in
+
+docker_DATA = \
+       Dockerfile
+
+.PHONY: docker
+docker: Dockerfile
+       docker build -t "ipfire/pakfire:$(PACKAGE_VERSION)" .
+
+# ------------------------------------------------------------------------------
+
 dist_configs_DATA = \
        contrib/config/client.conf \
        contrib/config/daemon.conf \
@@ -625,10 +628,7 @@ SED_PROCESS = \
        $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
                < $< > $@
 
-src/scripts/%: src/scripts/%.in Makefile
-       $(SED_PROCESS)
-
-src/systemd/%: src/systemd/%.in Makefile
+%: %.in Makefile
        $(SED_PROCESS)
 
 # - testsuite ------------------------------------------------------------------