Maintained separate vars for CFLAGS and CXXFLAGS

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

diff --git a/lwgeom/Makefile b/lwgeom/Makefile
index bc5e78f2c78ceec217aed1d04932d9bea8226e13..eb171725333f519c82c090a50b8bd2a7be679bb4 100644 (file)
--- a/lwgeom/Makefile
+++ b/lwgeom/Makefile
@@ -37,8 +37,8 @@ POSTGIS_BUILD_DATE := $(shell date -u "+%Y-%m-%d %H:%M:%S")
 
 #---------------------------------------------------------------
 
-override CFLAGS += -g -O2 -fexceptions
-override CFLAGS += -fPIC
+CSTAR_FLAGS = -g -O2 -fPIC -fexceptions
+
 #override CFLAGS += -I$(srcdir) -DFRONTEND -DSYSCONFDIR='"$(sysconfdir)"' 
 override CFLAGS += -DUSE_VERSION=$(USE_VERSION)
 override CFLAGS += -DPOSTGIS_LIB_VERSION='"$(POSTGIS_LIB_VERSION)"'
@@ -47,7 +47,8 @@ override CFLAGS += -DPOSTGIS_BUILD_DATE='"$(POSTGIS_BUILD_DATE)"'
 
 JTS_OBJ=lwgeom_nojts.o
 ifeq ($(USE_GEOS),1)
-       override CFLAGS += -I$(GEOS_DIR)/include -DUSE_GEOS
+       CXXFLAGS += -I$(GEOS_DIR)/include 
+       CSTAR_FLAGS += -DUSE_GEOS
        GEOS_RULES=detect_geos_version
        GEOS_WRAPPER=lwgeom_geos_wrapper.o
        JTS_OBJ=lwgeom_geos.o
@@ -55,7 +56,8 @@ ifeq ($(USE_GEOS),1)
 endif
 
 ifeq ($(USE_JTS),1)
-       override CFLAGS += -I$(JTS_INCLUDES) -DUSE_JTS
+       CXXFLAGS += -I$(JTS_INCLUDES)
+       CSTAR_FLAGS += -DUSE_JTS
        JTS_WRAPPER=lwgeom_jts_wrapper.o
        JTS_OBJ=lwgeom_jts.o
        SHLIB_LINK += -lgcj -ljts -lstdc++ -L$(JTS_LIBDIR) 
@@ -68,7 +70,6 @@ endif
 
 override CFLAGS += $(PGBEINCLUDES) -DAUTOCACHE_BBOX=$(AUTOCACHE_BBOX) 
 
-override CXXFLAGS := $(CFLAGS)
 # memory debug for gcc 2.91, 2.95, 3.0 and 3.1
 # for gcc >= 3.2.2 set GLIBCPP_FORCE_NEW at runtime instead
 #override CXXFLAGS += -D__USE_MALLOC
@@ -80,6 +81,9 @@ ifeq ($(USE_STATS),1)
        override CFLAGS += -DUSE_STATS
 endif
 
+override CFLAGS += $(CSTAR_FLAGS)
+override CXXFLAGS += $(CSTAR_FLAGS)
+
 SA_OBJS=measures.o box2d.o ptarray.o lwgeom_api.o lwgeom.o lwpoint.o lwline.o lwpoly.o lwmpoint.o lwmline.o lwmpoly.o lwcollection.o $(GEOS_WRAPPER) $(JTS_WRAPPER) wktunparse.o lwgparse.o wktparse.tab.o lex.yy.o vsprintf.o
 
 OBJS=$(SA_OBJS) liblwgeom.o lwgeom_pg.o lwgeom_debug.o lwgeom_spheroid.o lwgeom_ogc.o lwgeom_functions_analytic.o $(JTS_OBJ) lwgeom_inout.o lwgeom_estimate.o lwgeom_functions_basic.o lwgeom_gist.o lwgeom_btree.o lwgeom_transform.o stringBuffer.o lwgeom_box.o lwgeom_box3d.o lwgeom_box2dfloat4.o lwgeom_chip.o lwgeom_svg.o lwgeom_gml.o lwgeom_triggers.o lwgeom_dump.o