Skip to content

Commit c3813f8

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@4500 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1Preview-0.9.0-1
1 parent 8d07eda commit c3813f8

25 files changed

+106
-106
lines changed
 

‎plugins/copyright_label/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ pluginguibase.cpp: pluginguibase.h pluginguibase.ui
4949
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
5050

5151

52-
copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
52+
copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
5353
copyrightlabelplugin_la_LDFLAGS = -avoid-version -module
54-
copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
54+
copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
5555

5656
CLEANFILES = $(BUILT_SOURCES)
5757

‎plugins/delimited_text/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
5050

5151

5252

53-
delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
53+
delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
5454
delimitedtextplugin_la_LDFLAGS = -avoid-version -module
55-
delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ -I../../src/ui
55+
delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ -I../../src/ui
5656

5757
CLEANFILES = $(BUILT_SOURCES)
5858

‎plugins/geoprocessing/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@ qgsdlgpgbufferbase.h: qgsdlgpgbufferbase.ui
5151
BUILT_SOURCES = $(pggeoprocessing_MOC) $(pggeoprocessing_UI)
5252

5353

54-
pggeoprocessingplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) ../../src/libqgis.la
54+
pggeoprocessingplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
5555
pggeoprocessingplugin_la_LDFLAGS = -avoid-version -module
56-
pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src
56+
pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src -I../../src/core
5757

5858
CLEANFILES = $(BUILT_SOURCES)
5959

‎plugins/geoprocessing/qgspggeoprocessing.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ email : sherman at mrcc.com
2323
// includes
2424
#include <iostream>
2525
#include <vector>
26-
#include "../../src/qgisapp.h"
27-
#include "../../src/qgsmaplayer.h"
28-
#include "../../src/qgsvectorlayer.h"
29-
#include "../../src/qgsvectordataprovider.h"
30-
#include "../../src/qgsfield.h"
26+
#include "qgisapp.h"
27+
#include "qgsmaplayer.h"
28+
#include "qgsvectorlayer.h"
29+
#include "qgsvectordataprovider.h"
30+
#include "qgsfield.h"
3131

3232
#include <q3toolbar.h>
3333
#include <qmenubar.h>

‎plugins/georeferencer/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ georefplugin_la_SOURCES = plugin.cpp \
6464

6565
nodist_georefplugin_la_SOURCES = $(plugin_MOC) $(plugin_UIHEADERS) $(plugin_UISOURCES)
6666

67-
georefplugin_la_CXXFLAGS = -I../ -I../../src $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
68-
georefplugin_la_LDFLAGS = -avoid-version -module ../../src/libqgis.la $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD)
67+
georefplugin_la_CXXFLAGS = -I../ -I../../src/ui -I../../src/raster -I../../src -I../../src/core $(GDAL_CFLAGS) $(GSL_CFLAGS) $(QT_CXXFLAGS) $(GEOS_CFLAGS)
68+
georefplugin_la_LDFLAGS = -avoid-version -module $(GDAL_LDADD) $(GSL_LIBS) $(QT_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
6969

7070
BUILT_SOURCES = $(plugin_UIHEADERS) $(plugin_UISOURCES) $(plugin_MOC)
7171
CLEANFILES = $(BUILT_SOURCES)

‎plugins/gps_importer/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ plugin_QRC = qgsgps_plugin.qrc
6060

6161
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
6262

63-
gpsimporterplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
63+
gpsimporterplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis_gui.la ../../src/core/libqgis_core.la
6464
gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
65-
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
65+
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src
6666
gpsimporterplugin_la_LDFLAGS = -avoid-version -module
6767

6868
CLEANFILES = $(BUILT_SOURCES)

‎plugins/gps_importer/qgsgpsplugin.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
// includes
2121

22-
#include "../../src/qgisapp.h"
23-
#include "../../src/qgsmaplayerregistry.h"
24-
#include "../../src/qgsmaplayer.h"
25-
#include "../../src/qgsvectorlayer.h"
26-
#include "../../src/qgsdataprovider.h"
22+
#include "qgisapp.h"
23+
#include "qgsmaplayerregistry.h"
24+
#include "qgsmaplayer.h"
25+
#include "qgsvectorlayer.h"
26+
#include "qgsdataprovider.h"
2727
#include "qgsgpsplugin.h"
2828

2929

‎plugins/gps_importer/qgsgpsplugingui.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
***************************************************************************/
1212
#include "qgsgpsplugingui.h"
1313
#include "qgsgpsdevicedialog.h"
14-
#include "../../src/qgsmaplayer.h"
15-
#include "../../src/qgsdataprovider.h"
14+
#include "qgsmaplayer.h"
15+
#include "qgsdataprovider.h"
1616

1717
//qt includes
1818
#include <QFileDialog>

‎plugins/grass/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
SUBDIRS = config modules themes
1414

15-
INCLUDES = -I../../src
15+
INCLUDES = -I../../src -I../../src/core
1616

1717
DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" -DHAVE_OPENPTY=$(HAVE_OPENPTY)
1818
if !HAVE_QTMAC
@@ -114,9 +114,9 @@ qgsgrassregionbase.h: qgsgrassregionbase.ui
114114
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
115115

116116

117-
grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis.la ../../src/raster/libqgis_raster.la
117+
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
118118
grassplugin_la_LDFLAGS = -avoid-version -module
119-
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
119+
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
120120

121121
CLEANFILES = $(BUILT_SOURCES)
122122

‎plugins/grass/qgsgrassattributes.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
//Added by qt3to4:
4040
#include <QKeyEvent>
4141

42-
#include "../../src/qgis.h"
43-
#include "../../src/qgsmapcanvas.h"
44-
#include "../../src/qgsmaplayer.h"
45-
#include "../../src/qgsvectorlayer.h"
46-
#include "../../src/qgsdataprovider.h"
47-
#include "../../src/qgsmaptopixel.h"
48-
#include "../../src/qgsfeatureattribute.h"
42+
#include "qgis.h"
43+
#include "qgsmapcanvas.h"
44+
#include "qgsmaplayer.h"
45+
#include "qgsvectorlayer.h"
46+
#include "qgsdataprovider.h"
47+
#include "qgsmaptopixel.h"
48+
#include "qgsfeatureattribute.h"
4949

5050
extern "C" {
5151
#include <gis.h>

‎plugins/grass/qgsgrassedit.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,14 @@
4141
//Added by qt3to4:
4242
#include <QCloseEvent>
4343

44-
#include "../../src/qgis.h"
45-
#include "../../src/qgsmapcanvas.h"
46-
#include "../../src/qgsmaplayer.h"
47-
#include "../../src/qgsvectorlayer.h"
48-
#include "../../src/qgsdataprovider.h"
49-
#include "../../src/qgsmaptopixel.h"
50-
#include "../../src/qgsfield.h"
51-
#include "../../src/qgsfeatureattribute.h"
44+
#include "qgis.h"
45+
#include "qgsmapcanvas.h"
46+
#include "qgsmaplayer.h"
47+
#include "qgsvectorlayer.h"
48+
#include "qgsdataprovider.h"
49+
#include "qgsmaptopixel.h"
50+
#include "qgsfield.h"
51+
#include "qgsfeatureattribute.h"
5252

5353
extern "C" {
5454
#include <gis.h>

‎plugins/grass/qgsgrassedit.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@ class QCloseEvent;
3030
#include <qpainter.h>
3131

3232
// Must be here, so that it is included to moc file
33-
#include "../../src/qgisapp.h"
34-
#include "../../src/qgspoint.h"
35-
#include "../../src/qgisiface.h"
36-
#include "../../src/qgsmaptopixel.h"
33+
#include "qgisapp.h"
34+
#include "qgspoint.h"
35+
#include "qgisiface.h"
36+
#include "qgsmaptopixel.h"
3737

3838
class QgsGrassProvider;
3939
#include "ui_qgsgrasseditbase.h"

‎plugins/grass/qgsgrassmapcalc.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,13 @@
4242
#include <QGridLayout>
4343
#include <QTextStream>
4444

45-
#include "../../src/qgis.h"
46-
#include "../../src/qgsmapcanvas.h"
47-
#include "../../src/qgsmaplayer.h"
48-
#include "../../src/qgsvectorlayer.h"
49-
#include "../../src/qgsdataprovider.h"
50-
#include "../../src/qgsfield.h"
51-
#include "../../src/qgsfeatureattribute.h"
45+
#include "qgis.h"
46+
#include "qgsmapcanvas.h"
47+
#include "qgsmaplayer.h"
48+
#include "qgsvectorlayer.h"
49+
#include "qgsdataprovider.h"
50+
#include "qgsfield.h"
51+
#include "qgsfeatureattribute.h"
5252

5353
extern "C" {
5454
#include <gis.h>

‎plugins/grass/qgsgrassmodule.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,14 @@
6262
#include <QVBoxLayout>
6363
#include <QGridLayout>
6464

65-
#include "../../src/qgis.h"
66-
#include "../../src/qgsmapcanvas.h"
67-
#include "../../src/qgsmaplayer.h"
68-
#include "../../src/qgsvectorlayer.h"
69-
#include "../../src/qgsdataprovider.h"
70-
#include "../../src/qgsfield.h"
71-
#include "../../src/qgsfeature.h"
72-
#include "../../src/qgsfeatureattribute.h"
65+
#include "qgis.h"
66+
#include "qgsmapcanvas.h"
67+
#include "qgsmaplayer.h"
68+
#include "qgsvectorlayer.h"
69+
#include "qgsdataprovider.h"
70+
#include "qgsfield.h"
71+
#include "qgsfeature.h"
72+
#include "qgsfeatureattribute.h"
7373

7474
extern "C" {
7575
#include <gis.h>

‎plugins/grass/qgsgrassnewmapset.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646
#include <QCloseEvent>
4747
#include <Q3Wizard>
4848

49-
#include "../../src/qgis.h"
50-
#include "../../src/qgsmapcanvas.h"
51-
#include "../../src/qgsproject.h"
52-
#include "../../src/qgsrect.h"
53-
#include "../../src/qgscoordinatetransform.h"
54-
#include "../../src/qgsspatialrefsys.h"
49+
#include "qgis.h"
50+
#include "qgsmapcanvas.h"
51+
#include "qgsproject.h"
52+
#include "qgsrect.h"
53+
#include "qgscoordinatetransform.h"
54+
#include "qgsspatialrefsys.h"
5555
#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
5656

5757
#include "../../providers/grass/qgsgrass.h"

‎plugins/grass/qgsgrassnewmapset.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@ class QCloseEvent;
2626
#include <qlabel.h>
2727

2828
// Must be here, so that it is included to moc file
29-
#include "../../src/qgisapp.h"
30-
#include "../../src/qgisiface.h"
31-
#include "../../src/qgspoint.h"
32-
#include "../../src/qgsspatialrefsys.h"
33-
#include "../../src/widgets/projectionselector/qgsprojectionselector.h"
29+
#include "qgisapp.h"
30+
#include "qgisiface.h"
31+
#include "qgspoint.h"
32+
#include "qgsspatialrefsys.h"
33+
#include "widgets/projectionselector/qgsprojectionselector.h"
3434

3535
class QgsGrassProvider;
3636
#include "qgsgrassplugin.h"

‎plugins/grass/qgsgrassplugin.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@
1616
/* $Id$ */
1717

1818
// includes
19-
#include "../../src/qgisapp.h"
20-
#include "../../src/qgsmaplayer.h"
19+
#include "qgisapp.h"
20+
#include "qgsmaplayer.h"
21+
#include "qgisiface.h"
22+
#include "qgsmapcanvas.h"
23+
#include "qgsmaplayer.h"
24+
#include "qgsvectorlayer.h"
25+
#include "qgsdataprovider.h"
26+
#include "qgsfeatureattribute.h"
27+
#include "qgsproviderregistry.h"
2128
#include <qgsrasterlayer.h>
22-
#include "../../src/qgisiface.h"
23-
#include "../../src/qgsmapcanvas.h"
24-
#include "../../src/qgsmaplayer.h"
25-
#include "../../src/qgsvectorlayer.h"
26-
#include "../../src/qgsdataprovider.h"
27-
#include "../../src/qgsfeatureattribute.h"
28-
#include "../../src/qgsproviderregistry.h"
2929

3030
#include <qtoolbar.h>
3131
#include <qmenubar.h>

‎plugins/grass/qgsgrassregion.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,15 @@
4141
#include <qspinbox.h>
4242
#include <qglobal.h>
4343

44-
#include "../../src/qgis.h"
45-
#include "../../src/qgisapp.h"
46-
#include "../../src/qgsmaplayer.h"
4744
#include <qgsrasterlayer.h>
48-
#include "../../src/qgsvectorlayer.h"
49-
#include "../../src/qgisiface.h"
50-
#include "../../src/qgsmapcanvas.h"
51-
#include "../../src/qgsmaptopixel.h"
52-
#include "../../src/qgspoint.h"
45+
#include "qgis.h"
46+
#include "qgisapp.h"
47+
#include "qgsmaplayer.h"
48+
#include "qgsvectorlayer.h"
49+
#include "qgisiface.h"
50+
#include "qgsmapcanvas.h"
51+
#include "qgsmaptopixel.h"
52+
#include "qgspoint.h"
5353

5454
extern "C" {
5555
#include <gis.h>

‎plugins/grass/qgsgrasstools.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,13 @@
5050
//Added by qt3to4:
5151
#include <QCloseEvent>
5252

53-
#include "../../src/qgis.h"
54-
#include "../../src/qgsmapcanvas.h"
55-
#include "../../src/qgsmaplayer.h"
56-
#include "../../src/qgsvectorlayer.h"
57-
#include "../../src/qgsdataprovider.h"
58-
#include "../../src/qgsfield.h"
59-
#include "../../src/qgsfeatureattribute.h"
53+
#include "qgis.h"
54+
#include "qgsmapcanvas.h"
55+
#include "qgsmaplayer.h"
56+
#include "qgsvectorlayer.h"
57+
#include "qgsdataprovider.h"
58+
#include "qgsfield.h"
59+
#include "qgsfeatureattribute.h"
6060

6161
extern "C" {
6262
#include <gis.h>

‎plugins/grid_maker/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,9 @@ plugin_QRC = gridmaker_plugin.qrc
6262

6363
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
6464

65-
gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
65+
gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la ../../src/libqgis_gui.la
6666
gridmakerplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
67-
gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
67+
gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/core -I../../src/ui -I../../src
6868
gridmakerplugin_la_LDFLAGS = -avoid-version -module
6969

7070
##
@@ -83,7 +83,7 @@ gridmaker_SOURCES = main.cpp \
8383

8484
gridmaker_LDADD = $(QT_LDADD)
8585
gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
86-
gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui
86+
gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui -I../../src/core
8787

8888
standalone_MOC = plugingui.moc.cpp
8989

‎plugins/north_arrow/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ plugin_QRC = northarrow_plugin.qrc
5050
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
5151

5252

53-
northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
53+
northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/core/libqgis_core.la
5454
northarrowplugin_la_LDFLAGS = -avoid-version -module
55-
northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui
55+
northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui -I../../src/core
5656

5757
CLEANFILES = $(BUILT_SOURCES)
5858

‎plugins/north_arrow/plugin.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ email : tim@linfiniti.com
2727
#include "plugin.h"
2828
#include "qgsproject.h"
2929
#include "qgsmapcanvas.h"
30-
#include "../../src/qgsapplication.h"
30+
#include "qgsapplication.h"
3131

3232
// qt includes
3333
#include <QPainter>

‎plugins/north_arrow/plugingui.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* (at your option) any later version. *
1111
***************************************************************************/
1212
#include "plugingui.h"
13-
#include "../../src/qgsapplication.h"
13+
#include "qgsapplication.h"
1414

1515
#include <QPainter>
1616
#include <cmath>

‎plugins/scale_bar/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ pluginguibase.cpp: pluginguibase.h pluginguibase.ui
4949
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
5050

5151

52-
libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/libqgis.la
52+
libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/core/libqgis_core.la
5353
libScaleBarplugin_la_LDFLAGS = -avoid-version -module
54-
libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
54+
libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
5555

5656
CLEANFILES = $(BUILT_SOURCES)
5757

‎plugins/spit/Makefile.am

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,14 @@ nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC)
6565
BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)
6666

6767

68-
spitplugin_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis.la
68+
spitplugin_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../src/core/libqgis_core.la
6969
spitplugin_la_LDFLAGS = -avoid-version -module
70-
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src -I../../src/ui
70+
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src -I../../src/ui -I../../src/core
7171

7272

7373
spit_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD)
7474
#spit_LDFLAGS = -avoid-version -module
75-
spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../src -I../../src/ui
75+
spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../src -I../../src/ui -I../../src/core
7676

7777
CLEANFILES = $(BUILT_SOURCES)
7878

0 commit comments

Comments
 (0)
Please sign in to comment.