Add in include and lib directories for the gdal stuff in the core directory, cause if the gdal stuff is in a different place to the geos stuff, compilation fails to find the ogr includes

g_j_m · g_j_m · commit 4eab096735fd · 2006-06-17T02:22:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5528 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
@@ -144,7 +144,7 @@ libqgis_core_la_SOURCES =\
 		qgssymbol.cpp						\
 		qgssymbologyutils.cpp		\
 		qgsvectordataprovider.cpp			
-		
+
 
 AM_YFLAGS       = -d
 qgis_YACC       = qgssearchstringparser.h
@@ -156,10 +156,10 @@ BUILT_SOURCES = $(libqgis_core_la_MOC) $(qgis_YACC)  $(postgresMOC)
 
 
 #libqgis_core_la_LIBADD = ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
-libqgis_core_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) $(PYTHON_LIB) -lsqlite3
+libqgis_core_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) $(PYTHON_LIB) -lsqlite3
 libqgis_core_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
-libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../gui/
+libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../gui/
 
 ##
 ## ----------------------------------------------------------------------
