diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile index 718f799..fadd139 100644 --- a/Makefile +++ b/Makefile @@ -8,8 +8,8 @@ MP3 := $(subst flac,mp3,$(FLAC)) IMG_DIR := $(MEDIA_DIR)/pictures WWW_DIR := $(IMG_DIR)/www -IMG := $(wildcard $(SRC_DIR)/*.jpeg) -IMG_WWW := $(subst $(SRC_DIR), $(WWW_DIR), $(subst jpeg,webp, $(IMG))) +IMG := $(wildcard $(IMG_DIR)/*.jpeg) +IMG_WWW := $(subst $(IMG_DIR), $(WWW_DIR), $(subst jpeg,webp, $(IMG))) VIDEO_DIR := /srv/media/videos VIDEO_WEBM := $(wildcard $(VIDEO_DIR)/*/*.webm) @@ -34,6 +34,8 @@ all: test test: $(TEST_HTML) $(TEST_OTHER) +www-pictures: $(IMG_WWW) + $(TEST_DIR)/rss.xml: $(TEST_HTML) ./rss.rb @@ -71,10 +73,10 @@ $(TEST_DIR)/%.txt: ./html/%.txt ffmpeg -i $< -y -vsync 0 -ab 256k -map_metadata 0 -id3v2_version 3 $@ %.webp: %.webm - ffmpeg -i $< -HIDE_BANNER -loglevel error -vf thumbnail -frames:v 1 -c:v png -f image2pipe - | convert - $@ + ffmpeg -i $< -loglevel error -vf thumbnail -frames:v 1 -c:v png -f image2pipe - | magick - $@ $(WWW_DIR)/%.webp: $(IMG_DIR)/%.jpeg - convert $< -resize 1536x1024 -quality 85 $@ + magick $< -resize 1536x1024 -quality 85 $@ %.mp4: %.webm ffmpeg -i $< -vf scale=1280:-2 -c:v h264 -c:a aac -b:a 128k -strict -2 -movflags faststart $@ |