Merge branch 'master' into redesign

[rails.git] / db / functions / Makefile

diff --git a/db/functions/Makefile b/db/functions/Makefile
index 1bdddce71f9a68ed1fb693791e5319ffacf49518..231496d409d74aee0f3159308cafcc2a593a32f0 100644 (file)
--- a/db/functions/Makefile
+++ b/db/functions/Makefile
@@ -1,7 +1,5 @@
 QTDIR=../../lib/quad_tile
 
 QTDIR=../../lib/quad_tile
 

-PGSQLINC=/usr/include/postgresql/8.3/server/
-

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


@@ -9,22 +7,19 @@ else
     LDFLAGS=-shared
 endif
 
     LDFLAGS=-shared
 endif
 

-all: libmyosm.so libpgosm.so
+all: libpgosm.so

 
 clean:
        $(RM) *.so *.o
 
 
 clean:
        $(RM) *.so *.o
 

-libmyosm.so: quadtile.o maptile-mysql.o
-       cc ${LDFLAGS} -o libmyosm.so quadtile.o maptile-mysql.o
-
-libpgosm.so: maptile-pgsql.o
-       cc ${LDFLAGS} -o libpgosm.so maptile-pgsql.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

 
 

-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
+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

 
 maptile-pgsql.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
+       cc -I `pg_config --includedir` -I `pg_config --includedir-server` -fPIC -O3 -DUSE_PGSQL -c -o maptile-pgsql.o maptile.c
+
+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