From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 9 Jun 2024 12:34:30 +0000 (+0100)
Subject: Makefile: Make `all' and `schroot-config' be single-colon rules.
X-Git-Url: https://git.distorted.org.uk/~mdw/distorted-chroot/commitdiff_plain/a914e8822d4102c41faedb42cbdbea69f995f2c4

Makefile: Make `all' and `schroot-config' be single-colon rules.

The parts of double-colon rules don't run in parallel properly.
---

diff --git a/Makefile b/Makefile
index fb888c0..ec9db52 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 ### Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 ### USA.
 
-all::
+all:
 clean::
 check::
 .PHONY: all clean check
@@ -416,7 +416,7 @@ $(PYEXT_ALLOBJ): $(STATE)/obj/%.o: src/%.c
 	$(call v_tag,CC)$(CC) -c $(CFLAGS) $(PYEXT_CFLAGS) -o$@ $<
 
 PYMODULES		 = $(foreach x,$(PYEXTS),$(STATE)/lib/python/$x.so)
-all:: $(PYMODULES)
+all: $(PYMODULES)
 $(PYMODULES): $(STATE)/lib/python/%.so: $$(call c-object,$$($$*_SOURCES))
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,LD)$(LD) $(LDFLAGS) $(PYEXT_LDFLAGS) -o$@ $^
@@ -428,7 +428,7 @@ SCRIPTS			+= chroot-maint
 SCRIPTS			+= mkchrootconf
 
 SUBST_SCRIPTS		 = $(addprefix $(STATE)/bin/,$(SCRIPTS))
-all:: $(SUBST_SCRIPTS)
+all: $(SUBST_SCRIPTS)
 $(SUBST_SCRIPTS): $(STATE)/bin/%: bin/% $(STATE)/config.sh
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,SUBST){ \
@@ -446,7 +446,7 @@ $(SUBST_SCRIPTS): $(STATE)/bin/%: bin/% $(STATE)/config.sh
 ## In a chroot, `/etc/apt/sources.list' links to
 ## `/usr/local.schroot/etc/apt/sources.$d' for the appropriate distribution.
 APT_SOURCES		 = $(foreach d,$(DISTS),$(LOCAL)/etc/apt/sources.$d)
-all:: $(APT_SOURCES)
+all: $(APT_SOURCES)
 
 $(foreach d,$(DISTS),$(STATE)/etc/apt/aptsrc.$d): $(STATE)/etc/apt/aptsrc.%:
 	$(V_AT)mkdir -p $(dir $@)
@@ -467,7 +467,7 @@ CLEANFILES		+= $(APT_SOURCES)
 ## In a chroot, a link `/etc/apt/apt.conf.d/FOO' is created for each file in
 ## `/usr/local.schroot/etc/apt/apt.conf.d/FOO'.
 APT_CONFIGS	       = $(addprefix $(LOCAL)/etc/apt/apt.conf.d/,$(APTCONF))
-all:: $(APT_CONFIGS)
+all: $(APT_CONFIGS)
 $(APT_CONFIGS): $(LOCAL)/etc/apt/apt.conf.d/%: \
 		$$(or $$(_$$*_APTCONFSRC) etc/apt-conf.d/$$*)
 	$(V_AT)mkdir -p $(dir $@)
@@ -481,7 +481,7 @@ check::; $(call check-executable,ERR,/usr/bin/eatmydata)
 
 EATMYDATA_HACKS		+= apt-get aptitude dpkg
 SYMLINK_EATMYDATA_HACKS	 = $(addprefix $(LOCAL)/hacks/,$(EATMYDATA_HACKS))
-all:: $(SYMLINK_EATMYDATA_HACKS)
+all: $(SYMLINK_EATMYDATA_HACKS)
 $(SYMLINK_EATMYDATA_HACKS): $(LOCAL)/hacks/%: \
 		$$(if $$(call symlink-ok-p,$$@,/usr/bin/eatmydata),,_force)
 	$(V_AT)mkdir -p $(dir $@)
@@ -490,7 +490,7 @@ clean::; rm -f $(SYMLINK_EATMYDATA_HACKS)
 
 SCRIPT_HACKS		+= buildwrap
 COPY_SCRIPT_HACKS	 = $(addprefix $(LOCAL)/hacks/,$(SCRIPT_HACKS))
-all:: $(COPY_SCRIPT_HACKS)
+all: $(COPY_SCRIPT_HACKS)
 $(COPY_SCRIPT_HACKS): $(LOCAL)/hacks/%: bin/%
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,COPY)cp $< $@.new && mv $@.new $@
@@ -499,8 +499,8 @@ clean::; rm -f $(COPY_SCRIPT_HACKS)
 ###--------------------------------------------------------------------------
 ### `schroot' and `sbuild' configuration.
 
-all:: schroot-config
-schroot-config::
+all: schroot-config
+schroot-config:
 .PHONY: schroot-config
 
 check::; $(call check-mountpoint,WARN,/var/lib/sbuild/build)
@@ -522,11 +522,11 @@ $(schroot-config_FILE):
 	$(call v_tag,GEN)$(call %print-varlist,$(CONFIG_VARS)) \
 		>$@.new && mv $@.new $@
 
-schroot-config:: $(STATE)/config.sh
+schroot-config: $(STATE)/config.sh
 $(STATE)/config.sh: $(schroot-config_FILE)
 	$(call v_tag,SYMLINK)ln -sf $(notdir $<) $@
 
-schroot-config:: $(LOCAL)/etc/schroot/sbuild.schroot
+schroot-config: $(LOCAL)/etc/schroot/sbuild.schroot
 $(LOCAL)/etc/schroot/sbuild.schroot: $(STATE)/bin/mkchrootconf
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,GEN)$(STATE)/bin/mkchrootconf >$@.new && \
@@ -534,7 +534,7 @@ $(LOCAL)/etc/schroot/sbuild.schroot: $(STATE)/bin/mkchrootconf
 CLEANFILES		+= $(LOCAL)/etc/schroot/sbuild.schroot
 check::; $(call check-symlink,WARN,/etc/schroot/chroot.d/sbuild,$(ABSLOCAL)/etc/schroot/sbuild.schroot)
 
-schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/copyfiles
+schroot-config: $(LOCAL)/etc/schroot/sbuild.profile/copyfiles
 $(LOCAL)/etc/schroot/sbuild.profile/copyfiles: $(schroot-config_STAMP)
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,GEN){ \
@@ -543,7 +543,7 @@ $(LOCAL)/etc/schroot/sbuild.profile/copyfiles: $(schroot-config_STAMP)
 	} >$@.new && mv $@.new $@
 CLEANFILES		+= $(LOCAL)/etc/schroot/sbuild.profile/copyfiles
 
-schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases
+schroot-config: $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases
 $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases: $(schroot-config_STAMP)
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,GEN){ \
@@ -552,7 +552,7 @@ $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases: $(schroot-config_STAMP)
 	} >$@.new && mv $@.new $@
 CLEANFILES		+= $(LOCAL)/etc/schroot/sbuild.profile/nssdatabases
 
-schroot-config:: $(LOCAL)/etc/schroot/sbuild.profile/fstab
+schroot-config: $(LOCAL)/etc/schroot/sbuild.profile/fstab
 $(LOCAL)/etc/schroot/sbuild.profile/fstab: \
 		etc/sbuild.fstab.in $(schroot-config_STAMP)
 	$(V_AT)mkdir -p $(dir $@)
@@ -562,7 +562,7 @@ CLEANFILES		+= $(LOCAL)/etc/schroot/sbuild.profile/fstab
 
 check::; $(call check-symlink,WARN,/etc/schroot/sbuild,$(ABSLOCAL)/etc/schroot/sbuild.profile)
 
-schroot-config:: $(LOCAL)/etc/sbuild.conf
+schroot-config: $(LOCAL)/etc/sbuild.conf
 $(LOCAL)/etc/sbuild.conf: etc/sbuild.conf.in $(schroot-config_STAMP)
 	$(V_AT)mkdir -p $(dir $@)
 	$(call v_tag,SUBST)$(call subst-file,### -*-perl-*-) \
@@ -575,7 +575,7 @@ SCHROOT_SCRIPTS		+= 11private
 SCHROOT_SCRIPTS		+= 15binfmt
 SCHROOT_SCRIPTS		+= 51chrootenv
 COPY_SCHROOT_SCRIPTS	 = $(addprefix $(LOCAL)/etc/schroot/setup.d/,$(SCHROOT_SCRIPTS))
-schroot-config:: $(COPY_SCHROOT_SCRIPTS)
+schroot-config: $(COPY_SCHROOT_SCRIPTS)
 $(COPY_SCHROOT_SCRIPTS): \
 		$(LOCAL)/etc/schroot/setup.d/%: etc/schroot-scripts/%
 	$(V_AT)mkdir -p $(dir $@)
@@ -593,7 +593,7 @@ $(CHECK_SCHROOT_SCRIPTS): check-script/%:
 
 CCACHE_CONFIGS		 = $(foreach r,$(ALL_CHROOTS), \
 	/var/lib/sbuild/build/.ccache/$(LVPREFIX)$r/ccache.conf)
-all:: $(CCACHE_CONFIGS)
+all: $(CCACHE_CONFIGS)
 $(CCACHE_CONFIGS): /var/lib/sbuild/build/.ccache/$(LVPREFIX)%/ccache.conf: \
 		etc/ccache.conf
 	$(V_AT)mkdir -p $(dir $@)
@@ -604,7 +604,7 @@ $(CCACHE_CONFIGS): /var/lib/sbuild/build/.ccache/$(LVPREFIX)%/ccache.conf: \
 
 LOCAL_COMMON_DIRS	 = share/ src/
 LOCAL_EXTRA_DIRS	 = share/man/
-all:: $(foreach d,$(LOCAL_COMMON_DIRS) $(LOCAL_EXTRA_DIRS),$(LOCAL)/$d)
+all: $(foreach d,$(LOCAL_COMMON_DIRS) $(LOCAL_EXTRA_DIRS),$(LOCAL)/$d)
 $(foreach d,$(LOCAL_COMMON_DIRS) $(LOCAL_EXTRA_DIRS),$(LOCAL)/$d):
 	$(V_AT)mkdir -p $(dir $(patsubst %/,%,$@))
 	$(call v_tag,MKDIR)mkdir $@
@@ -613,7 +613,7 @@ LOCAL_ARCH_DIRS		 = bin/ etc/ games/ include/ include.aside/
 LOCAL_ARCH_DIRS		+= lib/ libexec/ sbin/
 LOCAL_ARCH_LINKS	 = man
 man_LINKDEST		 = share/man
-all:: $(foreach a,$(ALL_ARCHS),\
+all: $(foreach a,$(ALL_ARCHS),\
 	$(LOCAL)/$a/ \
 	$(foreach d,$(LOCAL_ARCH_DIRS),$(LOCAL)/$a/$d) \
 	$(foreach d,$(LOCAL_ARCH_LINKS),$(LOCAL)/$a/$d) \