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@4500 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 8, 2006 · c3813f8 · c3813f8
1 parent 8d07eda
commit c3813f8
Show file tree

Hide file tree

Showing 25 changed files with 106 additions and 106 deletions.
diff --git a/plugins/copyright_label/Makefile.am b/plugins/copyright_label/Makefile.am
@@ -49,9 +49,9 @@ pluginguibase.cpp: pluginguibase.h pluginguibase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
-copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
+copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
 copyrightlabelplugin_la_LDFLAGS = -avoid-version -module
-copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
+copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/delimited_text/Makefile.am b/plugins/delimited_text/Makefile.am
@@ -50,9 +50,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
 
-delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
+delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
 delimitedtextplugin_la_LDFLAGS = -avoid-version -module
-delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ -I../../src/ui
+delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ -I../../src/ui
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/geoprocessing/Makefile.am b/plugins/geoprocessing/Makefile.am
@@ -51,9 +51,9 @@ qgsdlgpgbufferbase.h: qgsdlgpgbufferbase.ui
 BUILT_SOURCES = $(pggeoprocessing_MOC) $(pggeoprocessing_UI)
 
 
-pggeoprocessingplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(PG_LIB) ../../src/libqgis.la
+pggeoprocessingplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) $(PG_LIB) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
 pggeoprocessingplugin_la_LDFLAGS = -avoid-version -module
-pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src
+pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/geoprocessing/qgspggeoprocessing.cpp b/plugins/geoprocessing/qgspggeoprocessing.cpp
@@ -23,11 +23,11 @@ email                : sherman at mrcc.com
 // includes
 #include <iostream>
 #include <vector>
-#include "../../src/qgisapp.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsvectordataprovider.h"
-#include "../../src/qgsfield.h"
+#include "qgisapp.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsvectordataprovider.h"
+#include "qgsfield.h"
 
 #include <q3toolbar.h>
 #include <qmenubar.h>

diff --git a/plugins/georeferencer/Makefile.am b/plugins/georeferencer/Makefile.am
@@ -64,8 +64,8 @@ georefplugin_la_SOURCES = plugin.cpp \
 
 nodist_georefplugin_la_SOURCES = $(plugin_MOC) $(plugin_UIHEADERS) $(plugin_UISOURCES) 
 
-georefplugin_la_CXXFLAGS = -I../ -I../../src $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
-georefplugin_la_LDFLAGS = -avoid-version -module ../../src/libqgis.la $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD)
+georefplugin_la_CXXFLAGS = -I../ -I../../src/ui -I../../src/raster -I../../src -I../../src/core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
+georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD)  ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
 
 BUILT_SOURCES = $(plugin_UIHEADERS) $(plugin_UISOURCES) $(plugin_MOC)
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/plugins/gps_importer/Makefile.am b/plugins/gps_importer/Makefile.am
@@ -60,9 +60,9 @@ plugin_QRC = qgsgps_plugin.qrc
 
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
-gpsimporterplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD) ../../src/libqgis.la
+gpsimporterplugin_la_LIBADD = $(QT_LDADD)  $(GDAL_LDADD)  ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
 gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
-gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
+gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src
 gpsimporterplugin_la_LDFLAGS = -avoid-version -module 
 
 CLEANFILES = $(BUILT_SOURCES)

diff --git a/plugins/gps_importer/qgsgpsplugin.cpp b/plugins/gps_importer/qgsgpsplugin.cpp
@@ -19,11 +19,11 @@
 
 // includes
 
-#include "../../src/qgisapp.h"
-#include "../../src/qgsmaplayerregistry.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
+#include "qgisapp.h"
+#include "qgsmaplayerregistry.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
 #include "qgsgpsplugin.h"
 
 

diff --git a/plugins/gps_importer/qgsgpsplugingui.cpp b/plugins/gps_importer/qgsgpsplugingui.cpp
@@ -11,8 +11,8 @@
  ***************************************************************************/
 #include "qgsgpsplugingui.h"
 #include "qgsgpsdevicedialog.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsdataprovider.h"
+#include "qgsmaplayer.h"
+#include "qgsdataprovider.h"
 
 //qt includes
 #include <QFileDialog>

diff --git a/plugins/grass/Makefile.am b/plugins/grass/Makefile.am
@@ -12,7 +12,7 @@
 
 SUBDIRS = config modules themes
 
-INCLUDES = -I../../src
+INCLUDES = -I../../src -I../../src/core
 
 DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" -DHAVE_OPENPTY=$(HAVE_OPENPTY) 
 if !HAVE_QTMAC
@@ -114,9 +114,9 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
 
 
-grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis.la ../../src/raster/libqgis_raster.la
+grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la ../../src/raster/libqgis_raster.la
 grassplugin_la_LDFLAGS = -avoid-version -module
-grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/legend/ -I../../src/raster -I../../src/ui
+grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC)  $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/legend/ -I../../src/raster -I../../src/ui 
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/grass/qgsgrassattributes.cpp b/plugins/grass/qgsgrassattributes.cpp
@@ -39,13 +39,13 @@
 //Added by qt3to4:
 #include <QKeyEvent>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsmaptopixel.h"
-#include "../../src/qgsfeatureattribute.h"
+#include "qgis.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
+#include "qgsmaptopixel.h"
+#include "qgsfeatureattribute.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/plugins/grass/qgsgrassedit.cpp b/plugins/grass/qgsgrassedit.cpp
@@ -41,14 +41,14 @@
 //Added by qt3to4:
 #include <QCloseEvent>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsmaptopixel.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsfeatureattribute.h"
+#include "qgis.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
+#include "qgsmaptopixel.h"
+#include "qgsfield.h"
+#include "qgsfeatureattribute.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/plugins/grass/qgsgrassedit.h b/plugins/grass/qgsgrassedit.h
@@ -30,10 +30,10 @@ class QCloseEvent;
 #include <qpainter.h>
 
 // Must be here, so that it is included to moc file
-#include "../../src/qgisapp.h"
-#include "../../src/qgspoint.h"
-#include "../../src/qgisiface.h"
-#include "../../src/qgsmaptopixel.h"
+#include "qgisapp.h"
+#include "qgspoint.h"
+#include "qgisiface.h"
+#include "qgsmaptopixel.h"
 
 class QgsGrassProvider;
 #include "ui_qgsgrasseditbase.h"

diff --git a/plugins/grass/qgsgrassmapcalc.cpp b/plugins/grass/qgsgrassmapcalc.cpp
@@ -42,13 +42,13 @@
 #include <QGridLayout>
 #include <QTextStream>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsfeatureattribute.h"
+#include "qgis.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
+#include "qgsfield.h"
+#include "qgsfeatureattribute.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/plugins/grass/qgsgrassmodule.cpp b/plugins/grass/qgsgrassmodule.cpp
@@ -62,14 +62,14 @@
 #include <QVBoxLayout>
 #include <QGridLayout>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsfeature.h"
-#include "../../src/qgsfeatureattribute.h"
+#include "qgis.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
+#include "qgsfield.h"
+#include "qgsfeature.h"
+#include "qgsfeatureattribute.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/plugins/grass/qgsgrassnewmapset.cpp b/plugins/grass/qgsgrassnewmapset.cpp
@@ -46,12 +46,12 @@
 #include <QCloseEvent>
 #include <Q3Wizard>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsproject.h"
-#include "../../src/qgsrect.h"
-#include "../../src/qgscoordinatetransform.h"
-#include "../../src/qgsspatialrefsys.h"
+#include "qgis.h"
+#include "qgsmapcanvas.h"
+#include "qgsproject.h"
+#include "qgsrect.h"
+#include "qgscoordinatetransform.h"
+#include "qgsspatialrefsys.h"
 #include "../../src/widgets/projectionselector/qgsprojectionselector.h"
 
 #include "../../providers/grass/qgsgrass.h"

diff --git a/plugins/grass/qgsgrassnewmapset.h b/plugins/grass/qgsgrassnewmapset.h
@@ -26,11 +26,11 @@ class QCloseEvent;
 #include <qlabel.h>
 
 // Must be here, so that it is included to moc file
-#include "../../src/qgisapp.h"
-#include "../../src/qgisiface.h"
-#include "../../src/qgspoint.h"
-#include "../../src/qgsspatialrefsys.h"
-#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
+#include "qgisapp.h"
+#include "qgisiface.h"
+#include "qgspoint.h"
+#include "qgsspatialrefsys.h"
+#include "widgets/projectionselector/qgsprojectionselector.h"
 
 class QgsGrassProvider;
 #include "qgsgrassplugin.h"

diff --git a/plugins/grass/qgsgrassplugin.cpp b/plugins/grass/qgsgrassplugin.cpp
@@ -16,16 +16,16 @@
 /*  $Id$ */
 
 // includes
-#include "../../src/qgisapp.h"
-#include "../../src/qgsmaplayer.h"
+#include "qgisapp.h"
+#include "qgsmaplayer.h"
+#include "qgisiface.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
+#include "qgsfeatureattribute.h"
+#include "qgsproviderregistry.h"
 #include <qgsrasterlayer.h>
-#include "../../src/qgisiface.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfeatureattribute.h"
-#include "../../src/qgsproviderregistry.h"
 
 #include <qtoolbar.h>
 #include <qmenubar.h>

diff --git a/plugins/grass/qgsgrassregion.cpp b/plugins/grass/qgsgrassregion.cpp
@@ -41,15 +41,15 @@
 #include <qspinbox.h>
 #include <qglobal.h>
 
-#include "../../src/qgis.h"
-#include "../../src/qgisapp.h"
-#include "../../src/qgsmaplayer.h"
 #include <qgsrasterlayer.h>
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgisiface.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaptopixel.h"
-#include "../../src/qgspoint.h"
+#include "qgis.h"
+#include "qgisapp.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgisiface.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaptopixel.h"
+#include "qgspoint.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/plugins/grass/qgsgrasstools.cpp b/plugins/grass/qgsgrasstools.cpp
@@ -50,13 +50,13 @@
 //Added by qt3to4:
 #include <QCloseEvent>
 
-#include "../../src/qgis.h"
-#include "../../src/qgsmapcanvas.h"
-#include "../../src/qgsmaplayer.h"
-#include "../../src/qgsvectorlayer.h"
-#include "../../src/qgsdataprovider.h"
-#include "../../src/qgsfield.h"
-#include "../../src/qgsfeatureattribute.h"
+#include "qgis.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
+#include "qgsvectorlayer.h"
+#include "qgsdataprovider.h"
+#include "qgsfield.h"
+#include "qgsfeatureattribute.h"
 
 extern "C" {
 #include <gis.h>

diff --git a/plugins/grid_maker/Makefile.am b/plugins/grid_maker/Makefile.am
@@ -62,9 +62,9 @@ plugin_QRC = gridmaker_plugin.qrc
 
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
-gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
+gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
 gridmakerplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
-gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
+gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src 
 gridmakerplugin_la_LDFLAGS = -avoid-version -module
 
 ##
@@ -83,7 +83,7 @@ gridmaker_SOURCES = main.cpp \
 
 gridmaker_LDADD = $(QT_LDADD) 
 gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
-gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui
+gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui -I../../src/core
 
 standalone_MOC = plugingui.moc.cpp 
 

diff --git a/plugins/north_arrow/Makefile.am b/plugins/north_arrow/Makefile.am
@@ -50,9 +50,9 @@ plugin_QRC = northarrow_plugin.qrc
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
-northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
+northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la 
 northarrowplugin_la_LDFLAGS = -avoid-version -module
-northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui
+northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui -I../../src/core
 
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/plugins/north_arrow/plugin.cpp b/plugins/north_arrow/plugin.cpp
@@ -27,7 +27,7 @@ email                : tim@linfiniti.com
 #include "plugin.h"
 #include "qgsproject.h"
 #include "qgsmapcanvas.h"
-#include "../../src/qgsapplication.h"
+#include "qgsapplication.h"
 
 // qt includes
 #include <QPainter>

diff --git a/plugins/north_arrow/plugingui.cpp b/plugins/north_arrow/plugingui.cpp
@@ -10,7 +10,7 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 #include "plugingui.h"
-#include "../../src/qgsapplication.h"
+#include "qgsapplication.h"
 
 #include <QPainter>
 #include <cmath>

diff --git a/plugins/scale_bar/Makefile.am b/plugins/scale_bar/Makefile.am
@@ -49,9 +49,9 @@ pluginguibase.cpp: pluginguibase.h pluginguibase.ui
 BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
 
 
-libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/libqgis.la
+libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/core/libqgis_core.la
 libScaleBarplugin_la_LDFLAGS = -avoid-version -module
-libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
+libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core 
 
 CLEANFILES = $(BUILT_SOURCES)