improve setup, README

3 files changed, 22 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index 7c5cb1f..0dd42c2 100644
--- a/Makefile
+++ b/Makefile
@@ -16,7 +16,12 @@ UGLIFYJS ?= uglifyjs
 
 DUMP ?= www/dump
 
-all: video audio images js
+all: .modules video audio images js
+
+# === GIT SUBMODULES ===
+.modules: .gitmodules
+	git submodule update --init
+	touch .modules
 
 # === VIDEO ===
 
@@ -74,7 +79,9 @@ CTC_ANIM_TMP := $(DUMP)/ui/ctc_strip-0.png $(DUMP)/ui/ctc_strip-1.png $(DUMP)/ui
 CTC_ANIM_TMP_WEBP := $(patsubst %.png,%.webp,$(CTC_ANIM_TMP))
 CTC_ANIM := $(DUMP)/ui/ctc_anim.png $(DUMP)/ui/ctc_anim.webp
 
-images: $(WEBP) $(CTC_ANIM) www/favicon.ico
+CIMAGE := $(WEBP) $(CTC_ANIM) www/favicon.ico
+
+images: $(CIMAGE)
 
 $(DUMP)/ui/ctc_strip.webp: $(DUMP)/ui/ctc_strip.png
 
@@ -127,7 +134,7 @@ www/js/all.min.js: $(JS)
 # === MISC ===
 
 clean:
-	$(RM) $(CVIDEO) $(CAUDIO) $(WEBP) www/favicon.ico
+	$(RM) $(CVIDEO) $(CAUDIO) $(CIMAGE)
 
 jshint: $(JSCODE)
 	jshint $^
@@ -135,7 +142,8 @@ jshint: $(JSCODE)
 space:
 	find $(DUMP)/bgm $(DUMP)/sfx $(DUMP)/video \( -name '*.wav' -o -name '*.mkv' \) -delete
 	$(RM) -r $(DUMP)/font
-	$(RM) $(DUMP)/ui/ctc_strip-*.*
+	$(RM) $(CTC_ANIM_TMP) $(CTC_ANIM_TMP_WEBP)
+	$(RM) www/js/all.min.js www/js/all.min.js.map
 
 watch:
 	while inotifywait -r -e modify,delete,move --exclude="^\./\.git" --exclude="\.swp$$" .; do \
diff --git a/README b/README
index 409f9f4..14db758 100644
--- a/README
+++ b/README
@@ -4,9 +4,8 @@ This is a WIP HTML5 implementation of the game Katawa Shoujo. [0]
 - Katawa Shoujo (obviously)
 - Firefox/Chrome/a sensible browser (i.e. not IE)
 - a shell (Bash, dash, zsh, etc)
-- ffmpeg with fdk-aac, libopus, libtheora, libvpx, libx264
-- defluff
-- pngquant
+- GNU make
+- ffmpeg with fdk-aac, libopus, libtheora, libvpx, libx264 (preferably git HEAD)
 - cwebp and webpmux from libwebp
 - convert from ImageMagick
 - apngasm
@@ -16,9 +15,12 @@ This is a WIP HTML5 implementation of the game Katawa Shoujo. [0]
 - jpegmini
 - jpegtran
 - jpegrescan
+- pngquant
+- DeflOpt
 - defluff
 - nginx
 - zopfli
+- inotify-tools (for `make watch`)
 
 == How to use ==
 1. Navigate to http://html5ks.happinessforme.com/
@@ -48,6 +50,8 @@ Check Bugzilla for things that need to be done. [3]
 
 See docs/ for the obvious.
 
+Run `make watch` to automatically re-make when changes are made.
+
 [0] http://www.katawa-shoujo.com/
 [1] https://github.com/cujojs/when/
 [2] If you're on Windoze, sucks for you. Use a better OS.
diff --git a/setup.sh b/setup.sh
index 97001b2..198322b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,13 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 
 set -e
 
 cd $(dirname $0)
 
-git submodule update --init
-
-pushd unrpyc
+cd unrpyc
 make $MAKEOPTS install
-popd
+cd ..
 
 make $MAKEOPTS