Merge remote-tracking branch 'upstream/pull/3301'

[rails.git] / db / functions / Makefile

diff --git a/db/functions/Makefile b/db/functions/Makefile
index 1bdddce71f9a68ed1fb693791e5319ffacf49518..9388e2d2360521b5c0b673fe27e6159708fd0927 100644 (file)
--- a/db/functions/Makefile
+++ b/db/functions/Makefile
@@ -1,6 +1,8 @@
-QTDIR=../../lib/quad_tile
+BUNDLE ?= bundle
+PG_CONFIG ?= pg_config
+DESTDIR ?= .

 
 

-PGSQLINC=/usr/include/postgresql/8.3/server/
+QTDIR=$(shell ${BUNDLE} show quad_tile | tail -n 1)/ext/quad_tile

 
 OS=$(shell uname -s)
 ifeq (${OS},Darwin)
 
 OS=$(shell uname -s)
 ifeq (${OS},Darwin)


@@ -9,22 +11,15 @@ else
     LDFLAGS=-shared
 endif
 
     LDFLAGS=-shared
 endif
 

-all: libmyosm.so libpgosm.so
+all: ${DESTDIR}/libpgosm.so

 
 clean:
 
 clean:

-       $(RM) *.so *.o
+       $(RM) ${DESTDIR}/*.so ${DESTDIR}/*.o

 
 

-libmyosm.so: quadtile.o maptile-mysql.o
-       cc ${LDFLAGS} -o libmyosm.so quadtile.o maptile-mysql.o
+${DESTDIR}/libpgosm.so: ${DESTDIR}/quadtile.o
+       cc ${LDFLAGS} -o $@ $^

 
 

-libpgosm.so: maptile-pgsql.o
-       cc ${LDFLAGS} -o libpgosm.so maptile-pgsql.o
+${DESTDIR}/%.o: %.c
+       cc -I `${PG_CONFIG} --includedir` -I `${PG_CONFIG} --includedir-server` -I${QTDIR} -fPIC -O3 -DUSE_PGSQL -c -o $@ $<

 
 

-quadtile.o: quadtile.c ${QTDIR}/quad_tile.h
-       cc `mysql_config --include` -I${QTDIR} -fPIC -O3 -c -o quadtile.o quadtile.c
-
-maptile-mysql.o: maptile.c
-       cc `mysql_config --include` -fPIC -O3 -DUSE_MYSQL -c -o maptile-mysql.o maptile.c
-
-maptile-pgsql.o: maptile.c
-       cc -I${PGSQLINC} -O3 -fPIC -DUSE_PGSQL -c -o maptile-pgsql.o maptile.c
\ No newline at end of file
+${DESTDIR}/quadtile.o: ${QTDIR}/quad_tile.h