Use grouped targets to avoid contention in parallel runs

diff --git a/Makefile b/Makefile
index b0e8ca0612e465a1d54d35dc34a8719360a760ae..e46c31f2ccf48cfcc02c4b7544e7f229d1e2bb22 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,20 +17,20 @@ clean:
 lib/countries.xml:
        curl -s -o $@ http://api.geonames.org/countryInfo?username=demo
 
-include/sshfp.js: bin/mksshfp $(wildcard /etc/ssh/ssh_known_hosts)
+include/sshfp.js&: bin/mksshfp $(wildcard /etc/ssh/ssh_known_hosts)
        bin/mksshfp
 
-origins/tile.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
+origins/tile.openstreetmap.yml&: bin/mkcountries lib/countries.xml bandwidth/tile.openstreetmap.yml
        bin/mkcountries bandwidth/tile.openstreetmap.yml origins/tile.openstreetmap.yml
 
-include/tile.js json/tile.openstreetmap.org.json origins/render.openstreetmap.yml gdns/tile.map gdns/tile.resource gdns/tile.weighted: bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap.yml
+include/tile.js json/tile.openstreetmap.org.json origins/render.openstreetmap.yml gdns/tile.map gdns/tile.resource gdns/tile.weighted&: bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap.yml
        bin/mkgeo origins/tile.openstreetmap.yml src/tile.openstreetmap.yml tile origins/render.openstreetmap.yml tile
 
-include/render.js json/render.openstreetmap.org.json: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml
+include/render.js json/render.openstreetmap.org.json&: bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml
        bin/mkgeo origins/render.openstreetmap.yml src/render.openstreetmap.yml render origins/tile-total.openstreetmap.yml
 
-origins/nominatim.openstreetmap.yml: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
+origins/nominatim.openstreetmap.yml&: bin/mkcountries lib/countries.xml bandwidth/nominatim.openstreetmap.yml
        bin/mkcountries bandwidth/nominatim.openstreetmap.yml origins/nominatim.openstreetmap.yml
 
-include/nominatim.js json/nominatim.openstreetmap.org.json origins/nominatim-total.openstreetmap.yml gdns/nominatim.map gdns/nominatim.resource gdns/nominatim.weighted: bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap.yml
+include/nominatim.js json/nominatim.openstreetmap.org.json origins/nominatim-total.openstreetmap.yml gdns/nominatim.map gdns/nominatim.resource gdns/nominatim.weighted&: bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap.yml
        bin/mkgeo origins/nominatim.openstreetmap.yml src/nominatim.openstreetmap.yml nominatim origins/nominatim-total.openstreetmap.yml nominatim