commit a0eed27e45e3096371a06751bb852e6dfa39df36
parent 04a8d973223717c101ce4aff9934632f7f88803b
Author: Roberto E. Vargas Caballero <k0ga@shike2.net>
Date: Fri, 20 Mar 2026 11:03:14 +0100
build: Simplify the dist target
Don't force to do a distclean before making a dist. Distclean
is very costly and it is needed only once. Also, remove the gpg
statement because that is not a normal use case and we are going
to use signify instead.
Diffstat:
2 files changed, 6 insertions(+), 17 deletions(-)
diff --git a/Makefile b/Makefile
@@ -37,7 +37,6 @@ clean: FORCE
touch config.mk
$(MAKE) -f main.mk clean
-dist: distclean
dist distclean: FORCE
touch config.mk
rm -f scripts/scc-make deps
diff --git a/main.mk b/main.mk
@@ -14,17 +14,6 @@ include scripts/rules.mk
ROOT = $(DESTDIR)$(PREFIX)
NODEP = 1
-DIST_FILES =\
- doc\
- include\
- LICENSE\
- main.mk\
- Makefile\
- README\
- scripts\
- src\
- tests\
-
all:
+@$(MAKE) -f main.mk doc
+@$(MAKE) -f main.mk toolchain
@@ -62,14 +51,15 @@ distclean: clean
rm -f include/scc/bits/scc/sys.h
rm -f include/scc/bits/scc/config.h
rm -rf scc-$(VERSION)
- rm -f *.gz *.asc
+ rm -f *.gz *.sig
-dist: distclean
- mkdir scc-$(VERSION)
- cp -R $(DIST_FILES) scc-$(VERSION)/
+dist:
+ mkdir .scc-$(VERSION)
+ cp -R * .scc-$(VERSION)/
+ mv .scc-$(VERSION) scc-$(VERSION)
+ find scc-$(VERSION) -name '.gitignore' | xargs rm
tar -cf - scc-$(VERSION) | gzip > scc-$(VERSION).tar.gz
rm -rf scc-$(VERSION)
- gpg -b -a scc-$(VERSION).tar.gz
include scripts/amd64.mk
include scripts/arm.mk