summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile16
1 files changed, 5 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index c8db1a6..bb2e7d3 100644
--- a/Makefile
+++ b/Makefile
@@ -28,11 +28,11 @@ VIDEO_WEBP := $(subst webm,webp, $(VIDEO_WEBM))
VIDEO_PNG := $(subst webm,png, $(VIDEO_WEBM))
CLIMBING_DIR := /srv/media/climbing
-CLIMBING_WEBM := $(wildcard $(CLIMBING_DIR)/*.webm)
+CLIMBING_WEBM := $(wildcard $(CLIMBING_DIR)/*/*.webm)
CLIMBING_MP4 := $(subst webm,mp4, $(CLIMBING_WEBM))
CLIMBING_WEBP := $(subst webm,webp, $(CLIMBING_WEBM))
-HTML := index.html music.html pictures.html videos.html climbing.html about.html code.html contact.html #social/create.html social/announce.html
+HTML := index.html music.html pictures.html videos.html climbing.html about.html code.html contact.html
OTHER := pdp8.png 540px-PDP-8_.jpg style.css sitemap.txt rss.xml
TEST_HTML := $(addprefix $(TEST_DIR)/, $(HTML))
@@ -61,12 +61,6 @@ $(TEST_DIR)/pictures.html: $(IMG_ALBUMS) $(WEBP_IMG) $(THUMB_IMG)
$(TEST_DIR)/videos.html: $(VIDEO_MP4) $(VIDEO_WEBP)
./videos.rb
-# $(TEST_DIR)/social/create.html:
-# ./social.rb create
-
-# $(TEST_DIR)/social/announce.html:
-# ./social.rb announce
-
$(TEST_DIR)/climbing.html: $(CLIMBING_MP4) $(CLIMBING_WEBP)
./climbing.rb
@@ -88,14 +82,14 @@ $(TEST_DIR)/%.txt: ./html/%.txt
%.mp3: %.flac
ffmpeg -i $< -y -vsync 0 -ab 256k -map_metadata 0 -id3v2_version 3 $@
-%.webp: %.webm
- ffmpeg -i $< -loglevel error -vf thumbnail -frames:v 1 -c:v png -f image2pipe - | magick - $@
-
$(WEBP_DIR)/%.webp: $(JPEG_DIR)/%.jpeg
magick $< -resize 1536x1024 -quality 85 $@
$(THUMB_DIR)/%.webp: $(JPEG_DIR)/%.jpeg
magick $< -resize 150x100 -quality 85 $@
+%.webp: %.webm
+ ffmpeg -i $< -loglevel error -vf thumbnail -frames:v 1 -c:v png -f image2pipe - | magick - $@
+
%.mp4: %.webm
ffmpeg -i $< -vf scale=1280:-2 -c:v h264 -c:a aac -b:a 128k -strict -2 -movflags faststart $@