Better parallel build (references #4105)

git-svn-id: http://svn.osgeo.org/postgis/trunk@16667 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 9b73012f33ae6d8177f0e51100ab07310ae63e9b..cbab6a99c85d7c68f08ef76782949c001c2c383a 100644 (file)
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -80,21 +80,26 @@ sql/%.sql: %.sql.in
 
 sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql: sql/address_standardizer_types.sql \
     sql/address_standardizer_functions.sql
+       mkdir -p sql
        cat $^ > $@
 
 sql/address_standardizer.sql: sql/address_standardizer_types.sql \
     sql/address_standardizer_functions.sql
+       mkdir -p sql
        cat $^ > $@
 
 sql/address_standardizer--1.0--$(EXTVERSION).sql:  sql/address_standardizer_functions.sql
+       mkdir -p sql
        cat $^ > $@
 
 # upgrade logic for us data extension (to go to next cludge for dev upgrading)
 sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/address_standardizer_functions.sql
+       mkdir -p sql
        cat $^ > $@
 
 # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
 sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/address_standardizer_functions.sql
+       mkdir -p sql
        cat $^ > $@
 
 # build us data extension
@@ -108,10 +113,12 @@ sql/$(EXTENSION)_data_us.sql: us_lex.sql us_gaz.sql us_rules.sql sql_bits/addres
 
 # upgrade logic for us data extension (to go to next cludge for dev upgrading)
 sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+       mkdir -p sql
        cat $^ > $@
 
 # upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
 sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+       mkdir -p sql
        cat $^ > $@
 
 mk-st-regexp: mk-st-regexp.pl

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 1b17880103fb1b08921dff09f5d3c71e46507173..bbceea145c6a8cdede0c7853387ce06ac2b3ef87 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -113,6 +113,7 @@ sql_bits/postgis_comments.sql: ../../doc/postgis_comments.sql | sql_bits
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/rtpostgis.sql: ../../raster/rt_pg/rtpostgis_for_extension.sql | sql_bits
+       mkdir -p sql
        $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 sql_bits/spatial_ref_sys_config_dump.sql: ../../spatial_ref_sys.sql ../../utils/create_spatial_ref_sys_config_dump.pl | sql_bits

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 9c59423cb996f301920bd11007d64b70025230f6..88af96def49e46a046e6d04a6494783720a640a7 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -124,6 +124,7 @@ sql_bits/tiger_geocoder_minor.sql.in: ../../extras/tiger_geocoder/utility/set_se
        ../../extras/tiger_geocoder/geocode/geocode.sql \
        ../../extras/tiger_geocoder/geocode/reverse_geocode.sql \
        ../../extras/tiger_geocoder/geocode/census_tracts_functions.sql
+       mkdir -p sql_bits
        cat $^ > $@
 
 #also remove tiger_data from extension if it is part of it so data gets backed up
@@ -163,21 +164,25 @@ sql_bits/tiger_geocoder.sql.in: sql_bits/norm_addy_create.sql.in \
        ../../extras/tiger_geocoder/topology/tiger_topology_loader.sql \
        ../postgis_extension_helper.sql \
        sql_bits/add_search_path.sql
+       mkdir -p sql_bits
        cat $^ > $@
        echo "SELECT postgis_extension_drop_if_exists('${EXTENSION}', 'DROP SCHEMA tiger_data');" >> $@
        cat ../postgis_extension_helper_uninstall.sql  >> $@
 
 sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
+       mkdir -p sql_bits
        sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
        $(PERL) -pe 's/BEGIN\;//g ; s/COMMIT\;//g' $< > $@
 
 sql_bits/add_search_path.sql: sql_bits/add_search_path.sql.in
+       mkdir -p sql_bits
        cp $< $@
 
 ../../doc/tiger_geocoder_comments.sql:
        $(MAKE) -C ../../doc comments
 
 sql_bits/tiger_geocoder_comments.sql: ../../doc/tiger_geocoder_comments.sql
+       mkdir -p sql_bits
        cp $< $@
 
 #grep all lines that start with CREATE OR REPLACE FUNCTION, TRIGGER...