From 63cd9b8def01d686c224485fd75cc2c7ccff37b1 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Mon, 13 Jun 2011 20:20:56 +0000 Subject: [PATCH] Allow cunit tests to build and run in OS/X git-svn-id: http://svn.osgeo.org/postgis/trunk@7388 b70326c6-7e19-0410-871a-916f4a2858ee --- loader/cunit/Makefile.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in index ac25e5238..5bc7df4b7 100644 --- a/loader/cunit/Makefile.in +++ b/loader/cunit/Makefile.in @@ -28,6 +28,15 @@ PGSQL_FE_LDFLAGS=@PGSQL_FE_LDFLAGS@ # liblwgeom LIBLWGEOM=../../liblwgeom/liblwgeom.a +# GetText includes and libraries +LIBICONV=@LIBICONV@ +LTLIBICONV=@LTLIBICONV@ +GETTEXT_CFLAGS = @GETTEXT_CFLAGS@ +GETTEXT_LDFLAGS = @GETTEXT_LDFLAGS@ @LIBINTL@ + +# Build full linking line +LDFLAGS = -lm $(GETTEXT_LDFLAGS) $(PGSQL_FE_LDFLAGS) $(LTLIBICONV) $(CUNIT_LDFLAGS) + OBJS= \ cu_list.o \ cu_pgsql2shp.o \ @@ -62,8 +71,7 @@ endif # Build the main unit test executable cu_tester: $(LOADER_OBJS) $(OBJS) - #$(CC) $(GTK_WIN32_FLAGS) $^ -o $@ $(GTK_LIBS) $(ICONV_LDFLAGS) $(PGSQL_FE_LDFLAGS) -lm $(CUNIT_LDFLAGS) - $(CC) $^ -o $@ $(LIBLWGEOM) $(PGSQL_FE_LDFLAGS) -lm $(CUNIT_LDFLAGS) + $(CC) $^ -o $@ $(LIBLWGEOM) $(LDFLAGS) # Command to build each of the .o files $(OBJS): %.o: %.c -- 2.50.1