Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add in include and lib directories for the gdal stuff in the core dir…
…ectory, cause if the gdal stuff is in a different place to the geos stuff, compilation fails to find the ogr includes

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5528 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
g_j_m committed Jun 17, 2006
1 parent 2b86361 commit f0314f3
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/core/Makefile.am
Expand Up @@ -144,7 +144,7 @@ libqgis_core_la_SOURCES =\
qgssymbol.cpp \
qgssymbologyutils.cpp \
qgsvectordataprovider.cpp


AM_YFLAGS = -d
qgis_YACC = qgssearchstringparser.h
Expand All @@ -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/

##
## ----------------------------------------------------------------------
Expand Down

0 comments on commit f0314f3

Please sign in to comment.