Fix extension module build

Author: nickstenning

Makefile

@@ -6,22 +6,33 @@ ifeq ($(shell which $(BROWSERIFY) >/dev/null 2>&1; echo $$?), 1)
 $(error The 'browserify' command was not found. Please ensure you have run 'npm install' before running make.)
 endif
 
-# These are the plugins which are built separately and included in the
-# annotator-full build. Not all of the plugins in src/plugin are suited for this
-# at the moment.
-PLUGINS := \
+# These are the annotator.ext modules which are built from this repository.
+EXT := \
 	document \
-	filter \
 	unsupported
-PLUGINS_PKG := $(patsubst %,pkg/annotator.%.js,$(PLUGINS))
 
 SRC := $(shell find src -type f -name '*.js')
 
-all: annotator plugins annotator-full
+all: annotator exts
 
 annotator: pkg/annotator.min.js
-plugins: $(patsubst %.js,%.min.js,$(PLUGINS_PKG))
-annotator-full: pkg/annotator-full.min.js
+exts: $(patsubst %,pkg/annotator.%.min.js,$(EXT))
+
+pkg/%.min.js: pkg/%.js
+	@echo Writing $@
+	@$(UGLIFYJS) --preamble "$$(tools/preamble)" $< >$@
+
+pkg/annotator.js: browser.js
+	@mkdir -p pkg/ .deps/
+	@$(BROWSERIFY) -s annotator $< >$@
+	@$(BROWSERIFY) --list $< | \
+	sed 's#^#$@: #' >.deps/annotator.d
+
+pkg/annotator.%.js: src/ext/%.js
+	@mkdir -p pkg/ .deps/
+	@$(BROWSERIFY) $< >$@
+	@$(BROWSERIFY) --list $< | \
+	sed 's#^#$@: #' >.deps/annotator.$*.d
 
 clean:
 	rm -rf .deps pkg
@@ -41,25 +52,6 @@ doc/api/%.rst: src/%.js
 	@mkdir -p $(@D)
 	tools/apidoc $< $@
 
-pkg/%.min.js: pkg/%.js
-	@echo Writing $@
-	@$(UGLIFYJS) --preamble "$$(tools/preamble)" $< >$@
-
-pkg/annotator.js: browser.js
-	@mkdir -p pkg/ .deps/
-	@$(BROWSERIFY) -s annotator $< >$@
-	@$(BROWSERIFY) --list $< | \
-	sed 's#^#$@: #' >.deps/annotator.d
-
-pkg/annotator.%.js: src/plugin/%.js
-	@mkdir -p pkg/ .deps/
-	@$(BROWSERIFY) $< >$@
-	@$(BROWSERIFY) --list $< | \
-	sed 's#^#$@: #' >.deps/annotator.$*.d
-
-pkg/annotator-full.js: pkg/annotator.js $(PLUGINS_PKG)
-	@cat $^ > $@
-
 -include .deps/*.d
 
-.PHONY: all annotator plugins annotator-full clean test develop doc
+.PHONY: all annotator exts clean test develop doc