Merge branch 'master' of git://git.ipfire.org/pbs

[people/jschlag/pbs.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b19f33526d5fde12260ae06d1f2515f919c4dcff..10bf97eafb51bb008212864a5929adac99d00ae9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,6 +34,7 @@ pythondir  = $(pyexecdir)/pakfire
 
 configsdir = $(sysconfdir)/pakfire
 
+BUILT_SOURCES =
 CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
@@ -66,7 +67,6 @@ dist_doc_DATA = \
 dist_bin_SCRIPTS = \
        src/scripts/pakfire-build-service \
        src/scripts/pakfire-hub \
-       src/scripts/pakfire-manager \
        src/scripts/pakfire-web
 
 dist_configs_DATA = \
@@ -87,6 +87,8 @@ buildservice_PYTHON = \
        src/buildservice/distribution.py \
        src/buildservice/geoip.py \
        src/buildservice/git.py \
+       src/buildservice/jobqueue.py \
+       src/buildservice/jobs.py \
        src/buildservice/keys.py \
        src/buildservice/logs.py \
        src/buildservice/messages.py \
@@ -94,7 +96,6 @@ buildservice_PYTHON = \
        src/buildservice/misc.py \
        src/buildservice/packages.py \
        src/buildservice/repository.py \
-       src/buildservice/scheduler.py \
        src/buildservice/sessions.py \
        src/buildservice/settings.py \
        src/buildservice/sources.py \
@@ -104,6 +105,9 @@ buildservice_PYTHON = \
 
 buildservicedir = $(pythondir)/buildservice
 
+BUILT_SOURCES += \
+       src/buildservice/constants.py
+
 EXTRA_DIST += \
        src/buildservice/constants.py.in
 
@@ -116,16 +120,6 @@ hub_PYTHON = \
 
 hubdir = $(buildservicedir)/hub
 
-manager_PYTHON = \
-       src/manager/__init__.py \
-       src/manager/base.py \
-       src/manager/bugs.py \
-       src/manager/builds.py \
-       src/manager/repositories.py \
-       src/manager/sources.py
-
-managerdir = $(buildservicedir)/manager
-
 web_PYTHON = \
        src/web/__init__.py \
        src/web/handlers.py \
@@ -137,11 +131,11 @@ web_PYTHON = \
        src/web/handlers_distro.py \
        src/web/handlers_jobs.py \
        src/web/handlers_keys.py \
-       src/web/handlers_mirrors.py \
        src/web/handlers_packages.py \
        src/web/handlers_search.py \
        src/web/handlers_updates.py \
        src/web/handlers_users.py \
+       src/web/mirrors.py \
        src/web/ui_modules.py
 
 webdir = $(buildservicedir)/web
@@ -193,11 +187,6 @@ dist_templates_DATA = \
        src/templates/keys-list.html \
        src/templates/log.html \
        src/templates/login.html \
-       src/templates/mirrors-delete.html \
-       src/templates/mirrors-detail.html \
-       src/templates/mirrors-edit.html \
-       src/templates/mirrors-list.html \
-       src/templates/mirrors-new.html \
        src/templates/package-detail.html \
        src/templates/package-detail-list.html \
        src/templates/package-properties.html \
@@ -252,6 +241,15 @@ dist_templates_errors_DATA = \
 
 templates_errorsdir = $(templatesdir)/errors
 
+dist_templates_mirrors_DATA = \
+       src/templates/mirrors/delete.html \
+       src/templates/mirrors/detail.html \
+       src/templates/mirrors/edit.html \
+       src/templates/mirrors/list.html \
+       src/templates/mirrors/new.html
+
+templates_mirrorsdir = $(templatesdir)/mirrors
+
 dist_templates_modules_DATA = \
        src/templates/modules/bugs-table.html \
        src/templates/modules/build-headline.html \
@@ -288,11 +286,6 @@ dist_templates_modules_DATA = \
 
 templates_modulesdir = $(templatesdir)/modules
 
-dist_templates_modules_builders_DATA = \
-       src/templates/modules/builders/load.html
-
-templates_modules_buildersdir = $(templates_modulesdir)/builders
-
 dist_templates_modules_changelog_DATA = \
        src/templates/modules/changelog/entry.html \
        src/templates/modules/changelog/index.html
@@ -370,7 +363,7 @@ dist_static_font_DATA = \
        src/static/font/fontawesome-webfont.ttf \
        src/static/font/fontawesome-webfont.woff
 
-static_fontdir = $(staticdir)/font     
+static_fontdir = $(staticdir)/font
 
 dist_static_images_DATA = \
        src/static/images/icons/build-dependency_error.png \
@@ -408,6 +401,9 @@ EXTRA_DIST += \
 docker_DATA = \
        Dockerfile
 
+CLEANFILES += \
+       Dockerfile
+
 dockerdir = $(datadir)/docker
 
 .PHONY: docker
@@ -457,7 +453,9 @@ substitutions = \
        '|configsdir=$(configsdir)|' \
        '|bindir=$(bindir)|' \
        '|datadir=$(datadir)|' \
-       '|localedir=$(localedir)|'
+       '|localedir=$(localedir)|' \
+       '|templatesdir=$(templatesdir)|' \
+       '|staticdir=$(staticdir)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \