Enable logging to journald

[people/ms/westferry.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a8fb217124b40bb2b33b5f844de7aa5e92e2b5c5..6db0a9acd5c40053501c1dfaa7ff3b7c536ce371 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -86,6 +86,7 @@ westferry_PYTHON = \
        src/westferry/constants.py \
        src/westferry/application.py \
        src/westferry/i18n.py \
+       src/westferry/logging.py \
        src/westferry/services.py
 
 westferrydir = $(pythondir)/westferry
@@ -106,16 +107,6 @@ westferry_backend_PYTHON = \
 
 westferry_backenddir = $(pythondir)/westferry/backend
 
-westferry_backend_forms_PYTHON = \
-       src/westferry/backend/forms/__init__.py \
-       src/westferry/backend/forms/base.py \
-       src/westferry/backend/forms/choice.py \
-       src/westferry/backend/forms/main.py \
-       src/westferry/backend/forms/text.py \
-       src/westferry/backend/forms/yesno.py
-
-westferry_backend_formsdir = $(westferry_backenddir)/forms
-
 westferry_handlers_PYTHON = \
        src/westferry/handlers/__init__.py \
        src/westferry/handlers/analytics.py \
@@ -128,9 +119,11 @@ westferry_handlersdir = $(pythondir)/westferry/handlers
 westferry_ui_PYTHON = \
        src/westferry/ui/__init__.py \
        src/westferry/ui/base.py \
+       src/westferry/ui/boxes.py \
        src/westferry/ui/forms.py \
        src/westferry/ui/graphs.py \
        src/westferry/ui/menu.py \
+       src/westferry/ui/tabs.py \
        src/westferry/ui/utils.py
 
 westferry_uidir = $(pythondir)/westferry/ui
@@ -141,11 +134,19 @@ templatesdir = $(datadir)/westferry/templates
 
 dist_templates_DATA = \
        src/templates/base.html \
-       src/templates/demo.html
+       src/templates/default.html \
+       src/templates/graphs.html
+
+templates_demodir = $(templatesdir)/demo
+
+dist_templates_demo_DATA = \
+       src/templates/demo/index.html
 
 templates_modulesdir = $(templatesdir)/modules
 
-dist_templates_modules_DATA =
+dist_templates_modules_DATA = \
+       src/templates/modules/box.html \
+       src/templates/modules/tabs.html
 
 templates_modules_formsdir = $(templates_modulesdir)/forms
 
@@ -165,10 +166,7 @@ dist_templates_modules_forms_inputs_DATA = \
 templates_modules_graphsdir = $(templates_modulesdir)/graphs
 
 dist_templates_modules_graphs_DATA = \
-       src/templates/modules/graphs/box.html \
-       src/templates/modules/graphs/preview.html \
-       src/templates/modules/graphs/thumbnail.html \
-       src/templates/modules/graphs/thumbnail-bar.html
+       src/templates/modules/graphs/box.html
 
 templates_modules_menudir = $(templates_modulesdir)/menu
 
@@ -184,17 +182,51 @@ dist_webroot_css_DATA = \
        src/styles/westferry.css
 
 EXTRA_DIST += \
+       src/styles/_fonts.scss \
        src/styles/westferry.scss
 
 CLEANFILES += \
        src/styles/westferry.css
 
-# - third party ----------------------------------------------------------------
+dist_webroot_fonts_DATA = \
+       src/third-party/fonts/ofl/prompt/OFL.txt \
+       src/third-party/fonts/ofl/prompt/Prompt-Black.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-BlackItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-Bold.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-BoldItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-ExtraBold.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-ExtraBoldItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-ExtraLight.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-ExtraLightItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-Italic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-Light.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-LightItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-Medium.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-MediumItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-Regular.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-SemiBold.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-SemiBoldItalic.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-Thin.ttf \
+       src/third-party/fonts/ofl/prompt/Prompt-ThinItalic.ttf
+
+webroot_scripts_DATA = \
+       src/third-party/jquery.min.js \
+       src/scripts/foundation.min.js \
+       src/scripts/westferry.min.js
 
-# Also shipping jQuery
+EXTRA_DIST += \
+       src/scripts/westferry.js
 
-dist_webroot_scripts_DATA = \
-       src/third-party/jquery.min.js
+CLEANFILES += \
+       src/third-party/jquery.min.js \
+       src/scripts/foundation.min.js \
+       src/scripts/westferry.min.js
+
+# - third party ----------------------------------------------------------------
+
+EXTRA_DIST += \
+       src/third-party/foundation-sites \
+       src/third-party/jquery.js
 
 # ------------------------------------------------------------------------------
 
@@ -278,15 +310,25 @@ SED_PROCESS = \
        $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
                < $< > $@
 
-%.py: %.py.in Makefile
+UGLIFYJS_PROCESS = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+               $(UGLIFYJS) --compress --mangle -- $< > $@
+
+%.py: %.py.in
        $(SED_PROCESS)
 
-%.css: %.scss Makefile
+%.css: %.scss
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
                $(SASSC) --style compressed $< > $@
 
-src/scripts/westferry: src/scripts/westferry.in Makefile
+%.min.js: %.js
+       $(UGLIFYJS_PROCESS)
+
+src/scripts/foundation.min.js: src/third-party/foundation-sites/dist/js/foundation.js
+       $(UGLIFYJS_PROCESS)
+
+src/scripts/westferry: src/scripts/westferry.in
        $(SED_PROCESS)
 
-src/systemd/%: src/systemd/%.in Makefile
+src/systemd/%: src/systemd/%.in
        $(SED_PROCESS)