From e4c6750db2fdbf80222a30cf9171461c317cd676 Mon Sep 17 00:00:00 2001 From: Yuchen Pei Date: Sat, 7 Oct 2023 18:22:58 +1100 Subject: Add dependencies to dist/conflate etc. This eases make, as it will walk the dependencies automatically --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 92f716e..40b3bc5 100644 --- a/Makefile +++ b/Makefile @@ -196,9 +196,9 @@ summariseBlocksByOSMAddr: dist/blocksByOSMAddr.geojson ogrinfo -dialect sqlite -sql 'select count(*), NUMPOINTS = 0 from blocksByOSMAddr group by (NUMPOINTS = 0)' $< # conflate processed vicmap data with osm data -dist/conflate: +dist/conflate: dist/vicmap-osm-uniq-flats-withinrange.geojson data/victoria-addr.osm.geojson dist/blocksByOSMAddr.geojson mkdir -p $@ - ./bin/conflate.js dist/vicmap-osm-uniq-flats-withinrange.geojson data/victoria-addr.osm.geojson dist/blocksByOSMAddr.geojson $@ + ./bin/conflate.js $^ $@ ./bin/mrCoopDiff.js $@/mr_exactMatchSetFlats.geojson $@/mr_exactMatch.changes.json dist/unitFromNumber.osc: dist/conflate/mr_explodeUnitFromNumber.geojson @@ -215,13 +215,13 @@ convertConflationResultsToFGB: ogr2ogr -f FlatGeobuf dist/conflate/fuzzyStreetMatchesSingle.fgb dist/conflate/fuzzyStreetMatchesSingle.geojson ogr2ogr -f FlatGeobuf dist/conflate/fuzzyStreetMatchesMultiple.fgb dist/conflate/fuzzyStreetMatchesMultiple.geojson -dist/vicmap-complex-conflation: dist/vicmap-complex.geojson +dist/vicmap-complex-conflation: dist/vicmap-complex.geojson data/victoria-named-features.osm.geojson mkdir -p $@ - ./bin/complex.js $< data/victoria-named-features.osm.geojson $@ + ./bin/complex.js $^ $@ -dist/vicmap-building-conflation: dist/vicmap-building.geojson +dist/vicmap-building-conflation: dist/vicmap-building.geojson data/victoria-named-features.osm.geojson mkdir -p $@ - ./bin/building.js $< data/victoria-named-features.osm.geojson $@ + ./bin/building.js $^ $@ # extract admin_level=9 from OSM data/victoria-admin.osm.pbf: data/victoria.osm.pbf -- cgit v1.2.3