capsite

commit 5a21f1e55eb2edd4ff5682c65119567fe03a473e
parent 8671637c60ceb9e8258f40d9b79bf31627192fb7
Auteur: Selve <selve@asteride.xyz>
Date:   Sat,  8 Apr 2023 17:05:20 -0400

modification dans le système de génération

La version compressée des fichiers html est produite en même temps que leur
version originale, par la même règle. La règle de synchronisation avec le
serveur a été modifiée pour en exclure le fichier git/.

Diffstat:
M
Makefile
 | 
23
+++++++++++++++--------

1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/Makefile b/Makefile
@@ -43,18 +43,15 @@ FCH_RES_HTM_GZ = ${FCH_RES_HTM:=.gz}
 M4_GMI = m4 -DL_FORMAT=gemini
 M4_HTM = m4 -DL_FORMAT=html
 
-GZIP = gzip -fk9
+GZIP = gzip -9fk
 
-SYNC = openrsync --rsync-path=/usr/bin/openrsync -va --del
+SYNC = openrsync --rsync-path=/usr/bin/openrsync -va --del --exclude='git/'
 
 tous: gemini html
 
 gemini: ${FCH_RES_GMI}
 
-html: ${FCH_RES_HTM} ${FCH_RES_HTM_GZ}
-
-${FCH_RES_HTM_GZ}: ${FCH_RES_HTM}
-	${GZIP} ${@:.gz=} -o $@
+html: ${FCH_RES_HTM}
 
 ${DOS_GMI}/index.gmi: ${DOS_SRC}/index.m4
 	@mkdir -p ${DOS_GMI}
@@ -63,6 +60,7 @@ ${DOS_GMI}/index.gmi: ${DOS_SRC}/index.m4
 ${DOS_HTM}/index.html: ${DOS_SRC}/index.m4
 	@mkdir -p ${DOS_HTM}
 	${M4_HTM} ${DOS_SRC}/index.m4 > $@
+	${GZIP} $@
 
 ${DOS_GMI}/a_visiter.gmi: ${DOS_SRC}/a_visiter.m4
 	@mkdir -p ${DOS_GMI}
@@ -71,6 +69,7 @@ ${DOS_GMI}/a_visiter.gmi: ${DOS_SRC}/a_visiter.m4
 ${DOS_HTM}/a_visiter.html: ${DOS_SRC}/a_visiter.m4
 	@mkdir -p ${DOS_HTM}
 	${M4_HTM} ${DOS_SRC}/a_visiter.m4 > $@
+	${GZIP} $@
 
 ${DOS_GMI}/humans.txt: ${DOS_SRC}/humans.txt
 	@mkdir -p ${DOS_GMI}
@@ -79,6 +78,7 @@ ${DOS_GMI}/humans.txt: ${DOS_SRC}/humans.txt
 ${DOS_HTM}/humans.txt: ${DOS_SRC}/humans.txt
 	@mkdir -p ${DOS_HTM}
 	cp ${DOS_SRC}/humans.txt $@
+	${GZIP} $@
 
 ${DOS_GMI}/robots.txt: ${DOS_SRC}/robots.txt
 	@mkdir -p ${DOS_GMI}
@@ -87,6 +87,7 @@ ${DOS_GMI}/robots.txt: ${DOS_SRC}/robots.txt
 ${DOS_HTM}/robots.txt: ${DOS_SRC}/robots.txt
 	@mkdir -p ${DOS_HTM}
 	cp ${DOS_SRC}/robots.txt $@
+	${GZIP} $@
 
 ${DOS_GMI}/LICENSE.txt: ${DOS_SRC}/LICENSE.txt
 	@mkdir -p ${DOS_GMI}
@@ -95,6 +96,7 @@ ${DOS_GMI}/LICENSE.txt: ${DOS_SRC}/LICENSE.txt
 ${DOS_HTM}/LICENSE.txt: ${DOS_SRC}/LICENSE.txt
 	@mkdir -p ${DOS_HTM}
 	cp ${DOS_SRC}/LICENSE.txt $@
+	${GZIP} $@
 
 ${DOS_GMI_FLO}/index.gmi: ${DOS_SRC_FLO}/index.m4
 	@mkdir -p ${DOS_GMI_FLO}
@@ -103,6 +105,7 @@ ${DOS_GMI_FLO}/index.gmi: ${DOS_SRC_FLO}/index.m4
 ${DOS_HTM_FLO}/index.html: ${DOS_SRC_FLO}/index.m4
 	@mkdir -p ${DOS_HTM_FLO}
 	${M4_HTM} ${DOS_SRC_FLO}/index.m4 > $@
+	${GZIP} $@
 
 ${DOS_GMI_ART}/index.gmi: ${DOS_SRC_ART}/index.m4
 	@mkdir -p ${DOS_GMI_ART}
@@ -127,22 +130,27 @@ ${DOS_GMI_ART}/finger_openbsd.gmi: ${DOS_SRC_ART}/finger_openbsd.m4
 ${DOS_HTM_ART}/index.html: ${DOS_SRC_ART}/index.m4
 	@mkdir -p ${DOS_HTM_ART}
 	${M4_HTM} ${DOS_SRC_ART}/index.m4 > $@
+	${GZIP} $@
 
 ${DOS_HTM_ART}/avant-propos.html: ${DOS_SRC_ART}/avant-propos.m4
 	@mkdir -p ${DOS_HTM_ART}
 	${M4_HTM} ${DOS_SRC_ART}/avant-propos.m4 > $@
+	${GZIP} $@
 
 ${DOS_HTM_ART}/chute_voyelles_aymara.html: ${DOS_SRC_ART}/chute_voyelles_aymara.m4
 	@mkdir -p ${DOS_HTM_ART}
 	${M4_HTM} ${DOS_SRC_ART}/chute_voyelles_aymara.m4 > $@
+	${GZIP} $@
 
 ${DOS_HTM_ART}/curiosites_catalan.html: ${DOS_SRC_ART}/curiosites_catalan.m4
 	@mkdir -p ${DOS_HTM_ART}
 	${M4_HTM} ${DOS_SRC_ART}/curiosites_catalan.m4 > $@
+	${GZIP} $@
 
 ${DOS_HTM_ART}/finger_openbsd.html: ${DOS_SRC_ART}/finger_openbsd.m4
 	@mkdir -p ${DOS_HTM_ART}
 	${M4_HTM} ${DOS_SRC_ART}/finger_openbsd.m4 > $@
+	${GZIP} $@
 
 test:
 	doas cp -r res/html/* /var/www/htdocs/test/
@@ -156,5 +164,4 @@ publier-html:
 	${SYNC} ${DOS_HTM}/ 'asteride.xyz:/var/www/htdocs/asteride.xyz/~selve/'
 
 balais:
-	rm -rf res/gemini/*
-	rm -rf res/html/*
+	rm -rf ${DOS_RES}