Refactored libqgis into two roughly inequal parts.

timlinux · timlinux · commit 803a65ff1963 · 2006-01-08T01:19:16.000Z
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
diff --git a/src/legend/Makefile.am b/src/legend/Makefile.am
@@ -37,7 +37,7 @@ libqgis_legend_la_SOURCES =	qgslegendgroup.cpp \
 libqgis_legend_la_LIBFLAGS = $(QT_LDADD)
 
 libqgis_legend_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
-libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ \
+libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ -I../core/ \
 				$(CXXFLAGS) $(EXTRA_CXXFLAGS) \
 				$(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
 
diff --git a/src/raster/Makefile.am b/src/raster/Makefile.am
@@ -24,7 +24,7 @@ BUILT_SOURCES = $(libqgis_raster_la_MOC) $(libqgis_raster_la_SOURCES)
 ##libqgis_raster_la_LDFLAGS = -no-undefined
 libqgis_raster_la_CPPFLAGS = -I$(OMSRCDIR)
 libqgis_raster_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD)
-libqgis_raster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../ -I../legend/ -I../ui/
+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/
 
 EXTRA_DIST = \
 	qgsrasterbandstats.h \
diff --git a/src/widgets/projectionselector/Makefile.am b/src/widgets/projectionselector/Makefile.am
@@ -34,7 +34,6 @@ selector_UI = ui_qgsprojectionselectorbase.h
 
 
 libqgsprojectionselector_la_SOURCES =  qgsprojectionselector.cpp \
-					../../qgsapplication.cpp \
 			         $(selector_UI) \
 			         $(selector_UIC) \
 			         $(selector_MOC) 
@@ -44,8 +43,8 @@ BUILT_SOURCES = $(selector_MOC) $(selector_UI)
 CLEANFILES = $(BUILT_SOURCES)
 
 
-libqgsprojectionselector_la_LIBADD =  $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3
+libqgsprojectionselector_la_LIBADD =  $(LDADD) $(QT_LDADD) $(GDAL_LDADD) -lsqlite3 ../../core/libqgis_core.la
 libqgsprojectionselector_la_LDFLAGS = -avoid-version 
-libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../
+libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../core/
 
 EXTRA_DIST = $(selector_UIC)
