Skip to content

Commit 803a65f

Browse files
author
timlinux
committedJan 8, 2006
Refactored libqgis into two roughly inequal parts.
libqgis_core is intended to have non gui code libqgis_gui is intended to have gui related code Updated makefiles and code throughout in order for it to build with this new arrangemetn Code in src/ will be moved into src/gui in a follow up commit git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4503 c8812cc2-4d05-0410-92ff-de0c093fc19c

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed
 

‎src/legend/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ libqgis_legend_la_SOURCES = qgslegendgroup.cpp \
3737
libqgis_legend_la_LIBFLAGS = $(QT_LDADD)
3838

3939
libqgis_legend_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
40-
libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ \
40+
libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ -I../core/ \
4141
$(CXXFLAGS) $(EXTRA_CXXFLAGS) \
4242
$(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
4343

‎src/raster/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ BUILT_SOURCES = $(libqgis_raster_la_MOC) $(libqgis_raster_la_SOURCES)
2424
##libqgis_raster_la_LDFLAGS = -no-undefined
2525
libqgis_raster_la_CPPFLAGS = -I$(OMSRCDIR)
2626
libqgis_raster_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD)
27-
libqgis_raster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../ -I../legend/ -I../ui/
27+
libqgis_raster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../ -I../legend/ -I../ui/ -I../core/
2828

2929
EXTRA_DIST = \
3030
qgsrasterbandstats.h \

‎src/widgets/projectionselector/Makefile.am

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ selector_UI = ui_qgsprojectionselectorbase.h
3434

3535

3636
libqgsprojectionselector_la_SOURCES = qgsprojectionselector.cpp \
37-
../../qgsapplication.cpp \
3837
$(selector_UI) \
3938
$(selector_UIC) \
4039
$(selector_MOC)
@@ -44,8 +43,8 @@ BUILT_SOURCES = $(selector_MOC) $(selector_UI)
4443
CLEANFILES = $(BUILT_SOURCES)
4544

4645

47-
libqgsprojectionselector_la_LIBADD = $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3
46+
libqgsprojectionselector_la_LIBADD = $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3 ../../core/libqgis_core.la
4847
libqgsprojectionselector_la_LDFLAGS = -avoid-version
49-
libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../
48+
libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../core/
5049

5150
EXTRA_DIST = $(selector_UIC)

0 commit comments

Comments
 (0)
Please sign in to comment.