mudhorn/prometheus
1
0
Fork 0
mirror of https://github.com/prometheus/prometheus.git synced 2024-11-09 23:24:05 -08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge web/blob/Makefile into web/Makefile

Browse source 
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.
This commit is contained in:
Tobias Schmidt 2015-01-29 19:12:32 -05:00
parent 5f27629985
commit edadba3b25
2 changed files with 10 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
web/Makefile
View file

@ -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

27
web/blob/Makefile
View file

@ -1,27 +0,0 @@
# Copyright 2013 The Prometheus Authors
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
include ../../Makefile.INCLUDE
all: files.go
SUFFIXES:
# Do not embed map files and the non-minified bootstrap files.
files.go: $(shell find ../templates/ ../static/ -type f)
../../utility/embed-static.sh ../static ../templates | $(GOFMT) > $@
clean:
-rm files.go
.PHONY: clean