Merge web/blob/Makefile into web/Makefile

While the recent commit 7e5745f solved the issue of having an independent blob-stamp file, which was possible to become out of sync with the necessary web/blob/files.go file, this change further simplifies the setup by merging the two Makefile. The only purpose of web/Makefile was to call targets in web/blob/Makefile. As all dependencies for blob/files.go are outside of the blob/ directory, the separation isn't logically necessary.
awafer · Jan 30, 2015 · edadba3 · edadba3
1 parent 5f27629
commit edadba3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 32 deletions.
diff --git a/web/Makefile b/web/Makefile
@@ -11,12 +11,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-all: blob
+include ../Makefile.INCLUDE
 
-blob:
-	$(MAKE) -C blob
+all: blob/files.go
+
+SUFFIXES:
+
+# Do not embed map files and the non-minified bootstrap files.
+blob/files.go: $(shell find templates/ static/ -type f)
+	../utility/embed-static.sh static templates | $(GOFMT) > $@
 
 clean:
-	$(MAKE) -C blob clean
+	-rm -f blob/files.go
 
-.PHONY: clean blob
+.PHONY: clean
diff --git a/web/blob/Makefile b/web/blob/Makefile