X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.am;h=1a34b70cb4fc8e45a7dfdca17ad263e5b6ecf4c8;hb=8f94e19f3afcf248b4fd6f56ba85d93397b5cb53;hp=ca83aff79777507b9de75bfc6edcc6aa6c5bc317;hpb=e28b082e66d75c09d4c2aa5b113e5c5df6a25083;p=ipfire.org.git

diff --git a/Makefile.am b/Makefile.am
index ca83aff7..1a34b70c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ AUTOMAKE_OPTIONS = color-tests
 # keep itermediate files
 .SECONDARY:
 
-pythondir  = $(pyexecdir)
+pythondir  = $(prefix)/lib/python3/dist-packages
 
 configsdir = $(sysconfdir)/ipfire.org
 crondir    = $(sysconfdir)/cron.d
@@ -56,16 +56,19 @@ backend_PYTHON = \
 	src/backend/decorators.py \
 	src/backend/fireinfo.py \
 	src/backend/geoip.py \
+	src/backend/hwdata.py \
 	src/backend/iuse.py \
 	src/backend/memcached.py \
+	src/backend/messages.py \
 	src/backend/mirrors.py \
 	src/backend/misc.py \
 	src/backend/netboot.py \
 	src/backend/nopaste.py \
+	src/backend/ratelimit.py \
 	src/backend/releases.py \
 	src/backend/settings.py \
 	src/backend/talk.py \
-	src/backend/tracker.py \
+	src/backend/tweets.py \
 	src/backend/util.py \
 	src/backend/wiki.py \
 	src/backend/zeiterfassung.py
@@ -108,12 +111,18 @@ templatesdir = $(datadir)/templates
 
 templates_auth_DATA = \
 	src/templates/auth/activate.html \
+	src/templates/auth/activated.html \
 	src/templates/auth/login.html \
 	src/templates/auth/register.html \
 	src/templates/auth/register-success.html
 
 templates_authdir = $(templatesdir)/auth
 
+templates_auth_messages_DATA = \
+	src/templates/auth/messages/register.txt
+
+templates_auth_messagesdir = $(templates_authdir)/messages
+
 templates_blog_DATA = \
 	src/templates/blog/author.html \
 	src/templates/blog/base.html \
@@ -260,11 +269,13 @@ templates_staticdir = $(templatesdir)/static
 templates_wiki_DATA = \
 	src/templates/wiki/404.html \
 	src/templates/wiki/base.html \
+	src/templates/wiki/diff.html \
 	src/templates/wiki/edit.html \
 	src/templates/wiki/page.html \
 	src/templates/wiki/recent-changes.html \
 	src/templates/wiki/revisions.html \
-	src/templates/wiki/search-results.html
+	src/templates/wiki/search-results.html \
+	src/templates/wiki/watchlist.html
 
 templates_wikidir = $(templatesdir)/wiki
 
@@ -274,7 +285,13 @@ templates_wiki_files_DATA = \
 
 templates_wiki_filesdir = $(templates_wikidir)/files
 
+templates_wiki_messages_DATA = \
+	src/templates/wiki/messages/page-changed.txt
+
+templates_wiki_messagesdir = $(templates_wikidir)/messages
+
 templates_wiki_modules_DATA = \
+	src/templates/wiki/modules/diff.html \
 	src/templates/wiki/modules/list.html \
 	src/templates/wiki/modules/navbar.html
 
@@ -284,6 +301,7 @@ templates_wiki_modulesdir = $(templates_wikidir)/modules
 
 SCSS_FILES = \
 	src/scss/style.scss \
+	src/scss/_code-highlighting.scss \
 	src/scss/_fonts.scss \
 	src/scss/_icons.scss \
 	src/scss/_variables.scss
@@ -874,6 +892,14 @@ static_fonts_DATA = \
 static_fontsdir = $(staticdir)/fonts
 
 static_images_DATA = \
+	src/static/img/apple-touch-icon-192x192-precomposed.png \
+	src/static/img/apple-touch-icon-180x180-precomposed.png \
+	src/static/img/apple-touch-icon-152x152-precomposed.png \
+	src/static/img/apple-touch-icon-144x144-precomposed.png \
+	src/static/img/apple-touch-icon-120x120-precomposed.png \
+	src/static/img/apple-touch-icon-76x76-precomposed.png \
+	src/static/img/apple-touch-icon-72x72-precomposed.png \
+	src/static/img/apple-touch-icon-60x60-precomposed.png \
 	src/static/img/default-avatar.jpg \
 	src/static/img/ipfire-tux.png \
 	src/static/img/iuse-not-found.png \
@@ -900,6 +926,7 @@ static_js_DATA = \
 	\
 	src/static/js/jquery-3.3.1.min.js \
 	src/static/js/popper.min.js \
+	src/static/js/popper.min.js.map \
 	src/static/js/prettify.js \
 	\
 	src/static/js/zxcvbn/dist/zxcvbn.js \
@@ -973,3 +1000,20 @@ SED_PROCESS = \
 src/scss/main.css: $(SCSS_FILES) Makefile
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
 		$(SASSC) --style compressed $< > $@
+
+src/static/favicon.ico: src/static/img/ipfire-tux.png Makefile
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(CONVERT) $< -background none -flatten -density 1200 \
+		-resize 50% -define icon:auto-resize=64,48,32,16 $@
+
+src/static/img/apple-touch-icon-%-precomposed.png: src/static/img/ipfire-tux.png Makefile
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(CONVERT) -background none -flatten -density 1200 -bordercolor none -border 5%x5% \
+		-resize $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) -gravity center \
+		-extent $(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@)x$(patsubst src/static/img/apple-touch-icon-%-precomposed.png,%,$@) \
+		$< $@
+
+# Docker
+.PHONY: docker
+docker: Dockerfile
+	docker build -t "ipfire/webapp:$(PACKAGE_VERSION)" .