Skip to content

Commit fed87e0

Browse files
author
g_j_m
committed
Undo the Makefile.am changes done in r5821. Were accidently committed,
and were system configuration specific :( git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5885 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 3b519cf commit fed87e0

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/gui/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ lib_LTLIBRARIES = libqgis_gui.la
4848

4949
qgis_SOURCES = main.cpp
5050

51-
qgis_LDADD = $(GDAL_LDADD) $(GEOS_LDADD) ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(PG_LIB) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la ../core/libqgis_core.la
51+
qgis_LDADD = ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la ../core/libqgis_core.la
5252
if HAVE_QTMAC
5353
qgis_LDFLAGS = -framework ApplicationServices
5454
else
5555
qgis_LDFLAGS = -rdynamic
5656
endif
57-
qgis_CXXFLAGS = $(GEOS_CFLAGS) $(GDAL_CFLAGS) $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
57+
qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
5858

5959

6060
##
@@ -295,7 +295,7 @@ nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC)
295295
BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC) $(postgresMOC)
296296

297297

298-
libqgis_gui_la_LIBADD = $(GEOS_LDADD) ../core/libqgis_core.la ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
298+
libqgis_gui_la_LIBADD = ../core/libqgis_core.la ../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
299299
libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
300300

301301
libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(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../core/ -I../plugins/

0 commit comments

Comments
 (0)