Simplify use of flags

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

diff --git a/liblwgeom/cunit/Makefile.in b/liblwgeom/cunit/Makefile.in
index e4aa80d960b57ac5b6990b542d38e569cb9ec47b..1e65501ca05953978b2fc77d5951303ab654111c 100644 (file)
--- a/liblwgeom/cunit/Makefile.in
+++ b/liblwgeom/cunit/Makefile.in
@@ -11,8 +11,6 @@
 # **********************************************************************
 
 CC=@CC@
-CFLAGS=@CFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ 
-LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c
 top_builddir = @top_builddir@
 SHELL = @SHELL@
 LIBTOOL = @LIBTOOL@
@@ -20,6 +18,9 @@ LIBTOOL = @LIBTOOL@
 CUNIT_LDFLAGS=@CUNIT_LDFLAGS@
 CUNIT_CPPFLAGS=@CUNIT_CPPFLAGS@ -I..
 
+CFLAGS=@CFLAGS@ @WARNFLAGS@ @GEOS_CPPFLAGS@ @PROJ_CPPFLAGS@ $(CUNIT_CPPFLAGS)
+LDFLAGS = @GEOS_LDFLAGS@ -lgeos_c $(CUNIT_LDFLAGS) -lm
+
 # ADD YOUR NEW TEST FILE HERE (1/1)
 OBJS=  \
        cu_algorithm.o \
@@ -76,12 +77,11 @@ endif
 
 # Build the main unit test executable
 cu_tester: ../liblwgeom.la $(OBJS)
-       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(OBJS) ../liblwgeom.la -lm $(CUNIT_LDFLAGS)
-       #$(CC) -o $@ $(OBJS) ../.libs/liblwgeom.a -lm $(CUNIT_LDFLAGS) $(LDFLAGS)
+       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o $@ $(OBJS) ../liblwgeom.la $(LDFLAGS)
 
 # Command to build each of the .o files
 $(OBJS): %.o: %.c
-       $(CC) $(CFLAGS) $(CUNIT_CPPFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) -c -o $@ $<
 
 # Clean target
 clean: