X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/beb0ef6357e426ab08349109d47c3726ed50042e..e4c40cbd36567d050f1b779f1444c4ef26c50a5b:/db/functions/Makefile?ds=sidebyside

diff --git a/db/functions/Makefile b/db/functions/Makefile
index 231496d40..9388e2d23 100644
--- a/db/functions/Makefile
+++ b/db/functions/Makefile
@@ -1,4 +1,8 @@
-QTDIR=../../lib/quad_tile
+BUNDLE ?= bundle
+PG_CONFIG ?= pg_config
+DESTDIR ?= .
+
+QTDIR=$(shell ${BUNDLE} show quad_tile | tail -n 1)/ext/quad_tile
 
 OS=$(shell uname -s)
 ifeq (${OS},Darwin)
@@ -7,19 +11,15 @@ else
     LDFLAGS=-shared
 endif
 
-all: libpgosm.so
+all: ${DESTDIR}/libpgosm.so
 
 clean:
-	$(RM) *.so *.o
-
-libpgosm.so: quadtile-pgsql.o maptile-pgsql.o xid_to_int4-pgsql.o
-	cc ${LDFLAGS} -o libpgosm.so quadtile-pgsql.o maptile-pgsql.o xid_to_int4-pgsql.o
+	$(RM) ${DESTDIR}/*.so ${DESTDIR}/*.o
 
-quadtile-pgsql.o: quadtile.c ${QTDIR}/quad_tile.h
-	cc -I `pg_config --includedir` -I `pg_config --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o quadtile-pgsql.o quadtile.c
+${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o
+	cc ${LDFLAGS} -o $@ $^
 
-maptile-pgsql.o: maptile.c
-	cc -I `pg_config --includedir` -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o maptile-pgsql.o maptile.c
+${DESTDIR}/%.o: %.c
+	cc -I `${PG_CONFIG} --includedir` -I `${PG_CONFIG} --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o $@ $<
 
-xid_to_int4-pgsql.o: xid_to_int4.c
-	cc -I `pg_config --includedir` -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o xid_to_int4-pgsql.o xid_to_int4.c
+${DESTDIR}/quadtile.o: ${QTDIR}/quad_tile.h