From: Sandro Santilli <strk@keybit.net>
Date: Thu, 22 Dec 2011 10:21:12 +0000 (+0000)
Subject: Encode dependency of postgis objects on postgis_config.h
X-Git-Tag: 2.0.0alpha1~373
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a51923421e4b945cb2740afcf09e2f801b2b95dd;p=postgis

Encode dependency of postgis objects on postgis_config.h

Fixes ./configure && make check after switching between different
PostgreSQL versions.

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

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index f70fa49ca..aca24136a 100644
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -104,7 +104,10 @@ endif
 
 # Make all PostGIS objects depend upon liblwgeom, so that if an underlying
 # change is made, a PostGIS rebuild is triggered.
-$(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a
+#
+# Also they are all dependent on postgis_config.h
+#
+$(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postgis_config.h
 
 # Borrow the $libdir substitution from PGXS but customise by adding the version number
 %.sql: %.sql.in
@@ -120,4 +123,7 @@ postgis_upgrade_20_minor.sql: postgis_upgrade_20_minor.sql.in
 $(SQL_OBJS): %.in: %.in.c
 	$(CPP) -traditional-cpp -I../libpgcommon $< | grep -v '^#' > $@
 
+# SQL objects are also dependent on postgis_config.h for PostgreSQL version
+$(SQL_OBJS): ../postgis_config.h
+
 postgis.sql.in: geography.sql.in.c