diff --git a/.gitignore b/.gitignore
index fe4454f7..69d6f85e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,21 +3,8 @@ a.out.wasm
 a.out.js.mem
 a.out
 a.wasm
-src/.deps/
 src/WebIDLGrammar.pkl
 src/parser.out
-src/Makefile
-src/Makefile.in
-src/aclocal.m4
-src/autom4te.cache/
-src/compile
-src/config.log
-src/config.status
-src/configure
-src/configure~
-src/depcomp
-src/install-sh
-src/missing
 lib/expat/xmlwf/xmlwf
 dist
 .libs/
diff --git a/Makefile b/Makefile
index e0ff6a86..29c50a25 100644
--- a/Makefile
+++ b/Makefile
@@ -4,245 +4,136 @@
 BASE_DIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 DIST_DIR:=$(BASE_DIR)dist/libraries
 
-GLOBAL_CFLAGS:=-O3
-GLOBAL_LDFLAGS:=-O3 -s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
-export LDFLAGS = $(GLOBAL_LDFLAGS)
+export LDFLAGS = -O3 -s ENVIRONMENT=web,webview,worker -s NO_EXIT_RUNTIME=1
+export CFLAGS = -O3 -s USE_PTHREADS=0
+export CXXFLAGS = $(CFLAGS)
+export PKG_CONFIG_PATH = $(DIST_DIR)/lib/pkgconfig
+export EM_PKG_CONFIG_PATH = $(PKG_CONFIG_PATH)
 
 all: subtitleoctopus
-
 subtitleoctopus: dist
 
+.PHONY: all subtitleoctopus dist
+
 include functions.mk
 
-# Fribidi
+# FriBidi
 build/lib/fribidi/configure: lib/fribidi $(wildcard $(BASE_DIR)build/patches/fribidi/*.patch)
-	rm -rf build/lib/fribidi
-	mkdir -p build/lib
-	cp -r lib/fribidi build/lib/fribidi
-	$(foreach file, $(wildcard $(BASE_DIR)build/patches/fribidi/*.patch), patch -d "$(BASE_DIR)build/lib/fribidi" -Np1 -i $(file) && ) true
-	cd build/lib/fribidi && NOCONFIGURE=1 ./autogen.sh
+	$(call PREPARE_SRC_PATCHED,fribidi)
+	cd build/lib/fribidi && $(RECONF_AUTO)
 
 $(DIST_DIR)/lib/libfribidi.a: build/lib/fribidi/configure
 	cd build/lib/fribidi && \
-	emconfigure ./configure \
-		CFLAGS=" \
-		-s USE_PTHREADS=0 \
-		$(GLOBAL_CFLAGS) \
-		-DFRIBIDI_ENTRY=extern \
-		" \
-		--prefix="$(DIST_DIR)" \
-		--host=x86-none-linux \
-		--build=x86_64 \
-		--enable-static \
-		--disable-shared \
-		--disable-dependency-tracking \
-		--disable-debug \
-	&& \
-	emmake make -C lib/ install && \
-	emmake make install-pkgconfigDATA
+	$(call CONFIGURE_AUTO) --disable-debug && \
+	$(JSO_MAKE) -C lib/ fribidi-unicode-version.h && \
+	$(JSO_MAKE) -C lib/ install && \
+	$(JSO_MAKE) install-pkgconfigDATA
 
+# Expat
 build/lib/expat/configured: lib/expat
-	mkdir -p build/lib/expat
+	$(call PREPARE_SRC_VPATH,expat)
 	touch build/lib/expat/configured
 
 $(DIST_DIR)/lib/libexpat.a: build/lib/expat/configured
 	cd build/lib/expat && \
-	emcmake cmake \
-		-DCMAKE_C_FLAGS=" \
-		-s USE_PTHREADS=0 \
-		$(GLOBAL_CFLAGS) \
-		" \
-		-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
+	$(call CONFIGURE_CMAKE,$(BASE_DIR)lib/expat/expat) \
 		-DEXPAT_BUILD_DOCS=off \
 		-DEXPAT_SHARED_LIBS=off \
 		-DEXPAT_BUILD_EXAMPLES=off \
 		-DEXPAT_BUILD_FUZZERS=off \
 		-DEXPAT_BUILD_TESTS=off \
 		-DEXPAT_BUILD_TOOLS=off \
-		$(BASE_DIR)lib/expat/expat \
 	&& \
-	emmake make -j8 && \
-	emmake make install
+	$(JSO_MAKE) install
 
+# Brotli
 build/lib/brotli/js/decode.js: build/lib/brotli/configured
 build/lib/brotli/js/polyfill.js: build/lib/brotli/configured
 build/lib/brotli/configured: lib/brotli $(wildcard $(BASE_DIR)build/patches/brotli/*.patch)
-	rm -rf build/lib/brotli
-	cp -r lib/brotli build/lib/brotli
-	$(foreach file, $(wildcard $(BASE_DIR)build/patches/brotli/*.patch), patch -d "$(BASE_DIR)build/lib/brotli" -Np1 -i $(file) && ) true
+	$(call PREPARE_SRC_PATCHED,brotli)
 	touch build/lib/brotli/configured
 
-build/lib/brotli/libbrotlidec.pc: build/lib/brotli/configured
+$(DIST_DIR)/lib/libbrotlidec.a: $(DIST_DIR)/lib/libbrotlicommon.a
+$(DIST_DIR)/lib/libbrotlicommon.a: build/lib/brotli/configured
 	cd build/lib/brotli && \
-	emcmake cmake \
-		-DCMAKE_C_FLAGS=" \
-		$(GLOBAL_CFLAGS) \
-		" \
-		-DCMAKE_INSTALL_PREFIX=$(DIST_DIR) \
-		. \
-	&& \
-	emmake make -j8 && \
-	cp -r ./c/include $(DIST_DIR)
+	$(call CONFIGURE_CMAKE) && \
+	$(JSO_MAKE) install
+	# Normalise static lib names
+	cd $(DIST_DIR)/lib/ && \
+	for lib in *-static.a ; do mv "$$lib" "$${lib%-static.a}.a" ; done
 
-$(DIST_DIR)/lib/libbrotlicommon.a: build/lib/brotli/libbrotlidec.pc
-	cd build/lib/brotli && \
-	mkdir -p $(DIST_DIR)/lib/pkgconfig && \
-	cp libbrotlicommon.pc $(DIST_DIR)/lib/pkgconfig && \
-	cp libbrotlicommon-static.a $(DIST_DIR)/lib/libbrotlicommon.a
-
-$(DIST_DIR)/lib/libbrotlidec.a: build/lib/brotli/libbrotlidec.pc $(DIST_DIR)/lib/libbrotlicommon.a
-	cd build/lib/brotli && \
-	mkdir -p $(DIST_DIR)/lib/pkgconfig && \
-	cp libbrotlidec.pc $(DIST_DIR)/lib/pkgconfig && \
-	cp libbrotlidec-static.a $(DIST_DIR)/lib/libbrotlidec.a
 
 # Freetype without Harfbuzz
-build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotlidec.a $(wildcard $(BASE_DIR)build/patches/freetype/*.patch)
-	rm -rf build/lib/freetype
-	cp -r lib/freetype build/lib/freetype
-	$(foreach file, $(wildcard $(BASE_DIR)build/patches/freetype/*.patch), patch -d "$(BASE_DIR)build/lib/freetype" -Np1 -i $(file) && ) true
+build/lib/freetype/configure: lib/freetype $(wildcard $(BASE_DIR)build/patches/freetype/*.patch)
+	$(call PREPARE_SRC_PATCHED,freetype)
+	cd build/lib/freetype && $(RECONF_AUTO)
+
+build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotlidec.a build/lib/freetype/configure
 	cd build/lib/freetype && \
-		NOCONFIGURE=1 ./autogen.sh && \
 		mkdir -p build_hb && \
 		cd build_hb && \
-		EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
-		emconfigure ../configure \
-			CFLAGS=" \
-			-s USE_PTHREADS=0 \
-			$(GLOBAL_CFLAGS) \
-			" \
+		$(call CONFIGURE_AUTO,..) \
 			--prefix="$$(pwd)/dist_hb" \
-			--host=x86-none-linux \
-			--build=x86_64 \
-			--enable-static \
-			--disable-shared \
-			\
 			--with-brotli=yes \
-			--without-zlib \
-			--without-bzip2 \
-			--without-png \
 			--without-harfbuzz \
 		&& \
-		emmake make -j8 && \
-		emmake make install
+		$(JSO_MAKE) install
 
 # Harfbuzz
 build/lib/harfbuzz/configure: lib/harfbuzz $(wildcard $(BASE_DIR)build/patches/harfbuzz/*.patch)
-	rm -rf build/lib/harfbuzz
-	cp -r lib/harfbuzz build/lib/harfbuzz
-	$(foreach file, $(wildcard $(BASE_DIR)build/patches/harfbuzz/*.patch), patch -d "$(BASE_DIR)build/lib/harfbuzz" -Np1 -i $(file) && ) true
-	cd build/lib/harfbuzz && NOCONFIGURE=1 ./autogen.sh
+	$(call PREPARE_SRC_PATCHED,harfbuzz)
+	cd build/lib/harfbuzz && $(RECONF_AUTO)
 
 $(DIST_DIR)/lib/libharfbuzz.a: build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a build/lib/harfbuzz/configure
 	cd build/lib/harfbuzz && \
-	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
-	emconfigure ./configure \
-		CFLAGS=" \
-		-s USE_PTHREADS=0 \
-		$(GLOBAL_CFLAGS) \
-		-DHB_NO_MT \
-		" \
-		CXXFLAGS=" \
-		-s USE_PTHREADS=0 \
-		$(GLOBAL_CFLAGS) \
-		-DHB_NO_MT \
-		" \
-		--prefix="$(DIST_DIR)" \
-		--host=x86-none-linux \
-		--build=x86_64 \
-		--enable-static \
-		--disable-shared \
-		--disable-dependency-tracking \
-		\
-		--without-cairo \
-		--without-fontconfig \
-		--without-icu \
+	EM_PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
+	CFLAGS="-DHB_NO_MT $(CFLAGS)" \
+	CXXFLAGS="-DHB_NO_MT $(CFLAGS)" \
+	$(call CONFIGURE_AUTO) \
 		--with-freetype \
-		--without-glib \
 	&& \
 	cd src && \
-	emmake make -j8 install-libLTLIBRARIES install-pkgincludeHEADERS install-pkgconfigDATA
+	$(JSO_MAKE) install-libLTLIBRARIES install-pkgincludeHEADERS install-pkgconfigDATA
 
 # Freetype with Harfbuzz
 $(DIST_DIR)/lib/libfreetype.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libbrotlidec.a
 	cd build/lib/freetype && \
-	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig:$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
-	emconfigure ./configure \
-		CFLAGS=" \
-		-s USE_PTHREADS=0 \
-		$(GLOBAL_CFLAGS) \
-		" \
-		--prefix="$(DIST_DIR)" \
-		--host=x86-none-linux \
-		--build=x86_64 \
-		--enable-static \
-		--disable-shared \
-		\
+	EM_PKG_CONFIG_PATH=$(PKG_CONFIG_PATH):$(BASE_DIR)build/lib/freetype/build_hb/dist_hb/lib/pkgconfig \
+	$(call CONFIGURE_AUTO) \
 		--with-brotli=yes \
-		--without-zlib \
-		--without-bzip2 \
-		--without-png \
 		--with-harfbuzz \
 	&& \
-	emmake make -j8 && \
-	emmake make install
+	$(JSO_MAKE) install
 
 # Fontconfig
 build/lib/fontconfig/configure: lib/fontconfig $(wildcard $(BASE_DIR)build/patches/fontconfig/*.patch)
-	rm -rf build/lib/fontconfig
-	cp -r lib/fontconfig build/lib/fontconfig
-	$(foreach file, $(wildcard $(BASE_DIR)build/patches/fontconfig/*.patch), patch -d "$(BASE_DIR)build/lib/fontconfig" -Np1 -i $(file) && ) true
-	cd build/lib/fontconfig && NOCONFIGURE=1 ./autogen.sh
+	$(call PREPARE_SRC_PATCHED,fontconfig)
+	cd build/lib/fontconfig && $(RECONF_AUTO)
 
 $(DIST_DIR)/lib/libfontconfig.a: $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libexpat.a $(DIST_DIR)/lib/libfribidi.a $(DIST_DIR)/lib/libfreetype.a build/lib/fontconfig/configure
 	cd build/lib/fontconfig && \
-	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
-	emconfigure ./configure \
-		CFLAGS=" \
-		-s USE_PTHREADS=0 \
-		-DEMSCRIPTEN \
-		$(GLOBAL_CFLAGS) \
-		" \
-		--prefix="$(DIST_DIR)" \
-		--host=x86-none-linux \
-		--build=x86_64 \
-		--disable-shared \
-		--enable-static \
+	$(call CONFIGURE_AUTO) \
 		--disable-docs \
 		--with-default-fonts=/fonts \
 	&& \
-	emmake make -C src/ install && \
-	emmake make -C fontconfig/ install && \
-	emmake make install-pkgconfigDATA
+	$(JSO_MAKE) -C src/ install && \
+	$(JSO_MAKE) -C fontconfig/ install && \
+	$(JSO_MAKE) install-pkgconfigDATA
 
-# libass --
 
+# libass
 build/lib/libass/configured: lib/libass
-	rm -rf build/lib/libass
-	cd lib/libass && NOCONFIGURE=1 ./autogen.sh
-	mkdir -p build/lib/libass
+	cd lib/libass && $(RECONF_AUTO)
+	$(call PREPARE_SRC_VPATH,libass)
 	touch build/lib/libass/configured
 
 $(DIST_DIR)/lib/libass.a: $(DIST_DIR)/lib/libfontconfig.a $(DIST_DIR)/lib/libharfbuzz.a $(DIST_DIR)/lib/libexpat.a $(DIST_DIR)/lib/libfribidi.a $(DIST_DIR)/lib/libfreetype.a $(DIST_DIR)/lib/libbrotlidec.a build/lib/libass/configured
 	cd build/lib/libass && \
-	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
-	emconfigure ../../../lib/libass/configure \
-		CFLAGS=" \
-		-s USE_PTHREADS=0 \
-		$(GLOBAL_CFLAGS) \
-		" \
-		--prefix="$(DIST_DIR)" \
-		--host=x86-none-linux \
-		--build=x86_64 \
-		--disable-shared \
-		--enable-static \
+	$(call CONFIGURE_AUTO,../../../lib/libass) \
 		--disable-asm \
-		\
-		--enable-harfbuzz \
 		--enable-fontconfig \
 	&& \
-	emmake make -j8 && \
-	emmake make install
+	$(JSO_MAKE) install
 
 # SubtitleOctopus.js
 OCTP_DEPS = \
@@ -255,25 +146,14 @@ OCTP_DEPS = \
 	$(DIST_DIR)/lib/libfontconfig.a \
 	$(DIST_DIR)/lib/libass.a
 
-# Require a patch to fix some errors
-src/SubOctpInterface.cpp: src/SubtitleOctopus.idl
-	cd src && \
-	python3 ../build/webidl_binder.py SubtitleOctopus.idl SubOctpInterface
-
-src/Makefile: src/SubOctpInterface.cpp
-	cd src && \
-	autoreconf -fi && \
-	EM_PKG_CONFIG_PATH=$(DIST_DIR)/lib/pkgconfig \
-	emconfigure ./configure --host=x86-none-linux --build=x86_64 CFLAGS="$(GLOBAL_CFLAGS)"
-
-src/subtitles-octopus-worker.bc: $(OCTP_DEPS) src/Makefile src/SubtitleOctopus.cpp src/SubOctpInterface.cpp
-	cd src && \
-	emmake make -j8 && \
-	mv subtitlesoctopus.bc subtitles-octopus-worker.bc
+src/subtitles-octopus-worker.bc: $(OCTP_DEPS) all-src
+.PHONY: all-src
+all-src:
+	$(MAKE) -C src all
 
 # Dist Files
 EMCC_COMMON_ARGS = \
-	$(GLOBAL_LDFLAGS) \
+	$(LDFLAGS) \
 	-s EXPORTED_FUNCTIONS="['_main', '_malloc']" \
 	-s EXPORTED_RUNTIME_METHODS="['ccall', 'cwrap', 'getValue', 'FS_createPreloadedFile', 'FS_createPath']" \
 	--use-preload-plugins \
@@ -283,10 +163,6 @@ EMCC_COMMON_ARGS = \
 	-s NO_FILESYSTEM=0 \
 	--no-heap-copy \
 	-o $@
-	#--js-opts 0 -g4 \
-	#--closure 1 \
-	#--memory-init-file 0 \
-	#-s OUTLINING_LIMIT=20000 \
 
 dist: src/subtitles-octopus-worker.bc dist/js/subtitles-octopus-worker.js dist/js/subtitles-octopus-worker-legacy.js dist/js/subtitles-octopus.js dist/js/COPYRIGHT
 
@@ -377,3 +253,5 @@ $(foreach subm, $(SUBMODULES), $(eval $(call TR_GIT_SM_RESET,$(subm))))
 
 server: # Node http server npm i -g http-server
 	http-server
+
+.PHONY: clean clean-dist clean-libs clean-octopus git-checkout git-smreset server
diff --git a/build/patches/brotli/0002-upstream_Enable-install-with-emscripten.patch b/build/patches/brotli/0002-upstream_Enable-install-with-emscripten.patch
new file mode 100644
index 00000000..5bae29f4
--- /dev/null
+++ b/build/patches/brotli/0002-upstream_Enable-install-with-emscripten.patch
@@ -0,0 +1,71 @@
+Backported from: https://github.com/google/brotli/commit/ce222e317e36aa362e83fc50c7a6226d238e03fd
+From: Dirk Lemstra <dirk@lemstra.org>
+Date: Wed, 23 Jun 2021 10:12:21 +0200
+Subject: [PATCH] Enabled install when building with emscripten. (#906)
+
+* Enabled install when building with emscripten.
+
+* Also install the pkg-config files.
+---
+ CMakeLists.txt | 18 ++++++++----------
+ 1 file changed, 8 insertions(+), 10 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ff3401..6999292 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -219,19 +219,20 @@ add_executable(brotli ${BROTLI_CLI_C})
+ target_link_libraries(brotli ${BROTLI_LIBRARIES_STATIC})
+ 
+ # Installation
+-if(NOT BROTLI_EMSCRIPTEN)
+ if(NOT BROTLI_BUNDLED_MODE)
+   install(
+     TARGETS brotli
+     RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+   )
+ 
+-  install(
+-    TARGETS ${BROTLI_LIBRARIES_CORE}
+-    ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+-    RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
+-  )
++  if(NOT BROTLI_EMSCRIPTEN)
++    install(
++      TARGETS ${BROTLI_LIBRARIES_CORE}
++      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
++      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
++    )
++  endif()  # BROTLI_EMSCRIPTEN
+ 
+   install(
+     TARGETS ${BROTLI_LIBRARIES_CORE_STATIC}
+@@ -245,7 +246,6 @@ if(NOT BROTLI_BUNDLED_MODE)
+     DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
+   )
+ endif()  # BROTLI_BUNDLED_MODE
+-endif()  # BROTLI_EMSCRIPTEN
+ 
+ # Tests
+ 
+@@ -405,7 +405,6 @@ transform_pc_file("scripts/libbrotlidec.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libb
+ 
+ transform_pc_file("scripts/libbrotlienc.pc.in" "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc" "${BROTLI_VERSION}")
+ 
+-if(NOT BROTLI_EMSCRIPTEN)
+ if(NOT BROTLI_BUNDLED_MODE)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libbrotlicommon.pc"
+     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+@@ -414,7 +413,6 @@ if(NOT BROTLI_BUNDLED_MODE)
+   install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libbrotlienc.pc"
+     DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
+ endif()  # BROTLI_BUNDLED_MODE
+-endif()  # BROTLI_EMSCRIPTEN
+ 
+ if (ENABLE_COVERAGE STREQUAL "yes")
+   SETUP_TARGET_FOR_COVERAGE(coverage test coverage)
+-- 
+2.30.2
+
diff --git a/functions.mk b/functions.mk
index 65ae2016..c27963a0 100644
--- a/functions.mk
+++ b/functions.mk
@@ -5,6 +5,44 @@
 #   Special macros of the name TR_... create targets (and always take arguments)
 #   and thus also need to be $(eval ...)'ed
 
+## Build stuff
+
+# @arg1: name of submodule
+define PREPARE_SRC_PATCHED
+	rm -rf build/lib/$(1)
+	mkdir -p build/lib
+	cp -r lib/$(1) build/lib/$(1)
+	$(foreach file, $(wildcard $(BASE_DIR)build/patches/$(1)/*.patch), \
+		patch -d "$(BASE_DIR)build/lib/$(1)" -Np1 -i $(file) && \
+	) :
+endef
+
+# @arg1: name of submodule
+define PREPARE_SRC_VPATH
+	rm -rf build/lib/$(1)
+	mkdir -p build/lib/$(1)
+endef
+
+# All projects we build have autogen.sh, otherwise we could also fallback to `autoreconf -ivf .`
+RECONF_AUTO := NOCONFIGURE=1 ./autogen.sh
+
+# @arg1: path to source directory; defaults to current working directory
+define CONFIGURE_AUTO
+	emconfigure $(or $(1),.)/configure \
+	  --prefix="$(DIST_DIR)" \
+	  --host=x86-none-linux \
+	  --build=x86_64 \
+	  --enable-static \
+	  --disable-shared
+endef
+
+# @arg1: path to source directory; defaults to current working directory
+define CONFIGURE_CMAKE
+	emcmake cmake -S "$(or $(1),.)" -DCMAKE_INSTALL_PREFIX="$(DIST_DIR)"
+endef
+
+# FIXME: Propagate jobserver info with $(MAKE) and set up our makefile for fully parallel builds
+JSO_MAKE := emmake make -j "$(shell nproc)"
 
 ## Clean and git related
 
diff --git a/src/Makefile b/src/Makefile
new file mode 100644
index 00000000..d1dc2509
--- /dev/null
+++ b/src/Makefile
@@ -0,0 +1,22 @@
+# If needed, override the following variables via `make VARNAME=VAL ...`
+# Note: we only compile and not(!) link here, thus -c
+CXX = em++ -c
+CXXFLAGS = -O3 -g4
+LIBASS_CXXFLAGS = $(shell pkg-config --static --cflags "libass >= 0.14.0")
+LOCAL_CXXFLAGS  = -Wall -Wno-deprecated $(LIBASS_CXXFLAGS)
+
+all: subtitles-octopus-worker.bc
+
+SubOctpInterface.cpp: SubtitleOctopus.idl ../build/webidl_binder.py
+	@# Our version of WebIDL contains JSO-specific patches
+	python3 ../build/webidl_binder.py SubtitleOctopus.idl SubOctpInterface
+
+subtitles-octopus-worker.bc: SubtitleOctopus.cpp libass.cpp SubOctpInterface.cpp
+	@# All later dependencies are already included into the first by CPP
+	$(CXX) $(LOCAL_CXXFLAGS) $(CXXFLAGS) -o $@ $<
+
+clean:
+	rm -f subtitles-octopus-worker.bc
+	rm -f SubOctpInterface.cpp WebIDLGrammar.pkl parser.out
+
+.PHONY: all clean
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index e9011e95..00000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AM_CXXFLAGS = -Wall
-
-# Fix for Emscripten 2 build llvm bitcode instead of js
-AM_LDFLAGS = -r
-EXEEXT = .bc
-
-noinst_PROGRAMS = subtitlesoctopus
-subtitlesoctopus_SOURCES = SubtitleOctopus.cpp
diff --git a/src/configure.ac b/src/configure.ac
deleted file mode 100644
index 94c0d1bc..00000000
--- a/src/configure.ac
+++ /dev/null
@@ -1,20 +0,0 @@
-AC_INIT([subtitlesoctopus], [1.1])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-AC_CONFIG_FILES([Makefile])
-AC_PROG_CXX
-
-AC_HEADER_STDC
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([stdint.h unistd.h iconv.h])
-
-PKG_CHECK_MODULES([LIBASS], libass >= 0.9.1,[],[
-	AC_MSG_WARN([libass not found via pkg-config])
-	#LIBASS_LIBS="-lass"
-])
-
-pkg_requires="libass >= 0.9.1"
-
-AC_SUBST([LIBASS_CXXFLAGS])
-AC_SUBST([LIBASS_LIBS])
-
-AC_OUTPUT