meso-web

commit c6b05e8e91289da3095ae4d375b56a176d55f747
parent 856b733c62b79ffa06e2e2f5b88cb4c5c99e6dc1
Author: Vincent Forest <vincent.forest@meso-star.com>
Date:   Fri, 18 Feb 2022 15:51:30 +0100

solstice: minor adjustment of the Makefile

Diffstat:
M
solstice/Makefile
 | 
32
+++++++++++++++-----------------

1 file changed, 15 insertions(+), 17 deletions(-)
diff --git a/solstice/Makefile b/solstice/Makefile
@@ -20,10 +20,10 @@ include ../config.mk
 SOLSTICE_VERSION=0.9.1
 SOLPP_VERSION=0.3.1
 
-SOLSTICE=downloads/Solstice-$(SOLSTICE_VERSION)-GNU-Linux64.tar.gz
+SOLSTICE_ARCH=downloads/Solstice-$(SOLSTICE_VERSION)-GNU-Linux64.tar.gz
 SOLSTICE_DIR=Solstice-$(SOLSTICE_VERSION)-GNU-Linux64
 SOLSTICE_README=$(SOLSTICE_DIR)/share/doc/solstice/README.md
-SOLPP=downloads/Solstice-PP-Sources-$(SOLPP_VERSION).tar.gz
+SOLPP_ARCH=downloads/Solstice-PP-Sources-$(SOLPP_VERSION).tar.gz
 SOLPP_README=Solstice-PP-Sources-$(SOLPP_VERSION)/README.md
 
 SOLPP_PKG=\
@@ -73,16 +73,13 @@ HTML=\
  solstice-downloads.html\
  solstice-resources.html
 
-build: .sigs .mans
-	@$(MAKE) -fMakefile -f .sigs -f .mans build_all
+build: .sig .man
+	@$(MAKE) -fMakefile -f .sig -f .man build_all
 
-build_all: solstice.html solstice-downloads.html solstice-resources.html man
+build_all: $(HTML) man
 
 publish: build
 	rsync -avzr \
-		solstice.html \
-		solstice-downloads.html \
-		solstice-resources.html \
 		$(HTML) \
 		$(IMG) \
 		downloads \
@@ -91,7 +88,7 @@ publish: build
 
 clean:
 	rm -rf man
-	rm -f .sigs .chks \
+	rm -f .sig .chk .man \
 		solstice-release-notes.html.in \
 		solstice-pp-release-notes.html.in \
 		$(HTML) \
@@ -99,7 +96,8 @@ clean:
 
 distclean: clean
 	rm -f \
-		downloads/*.sig \
+		$(SOLSTICE_SIG)\
+		$(SOLPP_SIG) \
 		$(MAN) \
 		$(SOLPP_README) \
 		$(SOLSTICE_README) \
@@ -107,7 +105,7 @@ distclean: clean
 ################################################################################
 # Overview web page
 ################################################################################
-solstice.html: solstice.html.in themis.png solstice_build.sh ../meso-menu.sh
+solstice.html: solstice.html.in themis.png solstice_build.sh ../meso-menu.sh Makefile
 	@echo "Building $@"
 	@sh solstice_build.sh overview $(SOLSTICE_VERSION)
 
@@ -126,8 +124,8 @@ solstice-release-notes.html.in: $(SOLSTICE_README)
 		| sed -n '/^<h2>Release notes<\/h2>/,/^<h2>License<\/h2>/p' | sed '$$d' > $@
 
 $(SOLSTICE_README) $(MAN):
-	@echo "Extracting data from $(SOLSTICE)"
-	@tar -xz -f $(SOLSTICE) -i $(SOLSTICE_README) $(MAN)
+	@echo "Extracting data from $(SOLSTICE_ARCH)"
+	@tar -xz -f $(SOLSTICE_ARCH) $(SOLSTICE_README) $(MAN)
 
 ################################################################################
 # Additional resources
@@ -147,14 +145,14 @@ solstice-pp-release-notes.html.in: $(SOLPP_README)
 		| sed -e '$$d' -e 's/\<h3\>/h4/g' > $@
 
 $(SOLPP_README):
-	@echo "Extracting $@ from $(SOLPP)"
-	@tar -xz -f $(SOLPP) -i $(SOLPP_README)
+	@echo "Extracting $@ from $(SOLPP_ARCH)"
+	@tar -xz -f $(SOLPP_ARCH) $(SOLPP_README)
 
 ################################################################################
 # Check files
 ################################################################################
-check: build .chks .sigs .mans
-	@$(MAKE) -fMakefile -f .chks -f .sigs -f .mans check_all
+check: build .chk .sig .man
+	@$(MAKE) -fMakefile -f .chk -f .sig -f .man check_all
 
 check_all: check_shells $(HTML:=.chk)