Skip to content

Commit c05623a

Browse files
author
timlinux
committedDec 30, 2005
More fixes for problems caused by moving all ui's into their own dir
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4417 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1Preview-0.9.0-1
1 parent 5831742 commit c05623a

File tree

9 files changed

+11
-11
lines changed

9 files changed

+11
-11
lines changed
 

‎plugins/copyright_label/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
5151

5252
copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.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
54+
copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
5555

5656
CLEANFILES = $(BUILT_SOURCES)
5757

‎plugins/delimited_text/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
5252

5353
delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.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/
55+
delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ -I../../src/ui
5656

5757
CLEANFILES = $(BUILT_SOURCES)
5858

‎plugins/geoprocessing/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ BUILT_SOURCES = $(pggeoprocessing_MOC) $(pggeoprocessing_UI)
5353

5454
pggeoprocessingplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) ../../src/libqgis.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
56+
pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src/ui -I../../src
5757

5858
CLEANFILES = $(BUILT_SOURCES)
5959

‎plugins/gps_importer/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
5555

5656
gpsimporterplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
5757
gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
58-
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src
58+
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
5959
gpsimporterplugin_la_LDFLAGS = -avoid-version -module
6060

6161
CLEANFILES = $(BUILT_SOURCES)

‎plugins/grass/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
116116

117117
grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis.la ../../src/raster/libqgsraster.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
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/grid_maker/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
5656

5757
gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
5858
gridmakerplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
59-
gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src
59+
gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
6060
gridmakerplugin_la_LDFLAGS = -avoid-version -module
6161

6262
##
@@ -75,7 +75,7 @@ gridmaker_SOURCES = main.cpp \
7575

7676
gridmaker_LDADD = $(QT_LDADD)
7777
gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
78-
gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src
78+
gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src -I../../src/ui
7979

8080
standalone_MOC = plugingui.moc.cpp
8181

‎plugins/north_arrow/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
4343

4444
northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../src/libqgis.la
4545
northarrowplugin_la_LDFLAGS = -avoid-version -module
46-
northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src
46+
northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../src -I../../src/ui
4747

4848
CLEANFILES = $(BUILT_SOURCES)
4949

‎plugins/scale_bar/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
4040

4141
libScaleBarplugin_la_LIBADD = $(QT_LDADD) ../../src/libqgis.la
4242
libScaleBarplugin_la_LDFLAGS = -avoid-version -module
43-
libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src
43+
libScaleBarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../src -I../../src/ui
4444

4545
CLEANFILES = $(BUILT_SOURCES)
4646

‎plugins/spit/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,12 +75,12 @@ BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC)
7575

7676
spitplugin_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../src/libqgis.la
7777
spitplugin_la_LDFLAGS = -avoid-version -module
78-
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src
78+
spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(GEOS_CFLAGS) -I../../src -I../../src/ui
7979

8080

8181
spit_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD)
8282
#spit_LDFLAGS = -avoid-version -module
83-
spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../src
83+
spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../src -I../../src/ui
8484

8585
CLEANFILES = $(BUILT_SOURCES)
8686

0 commit comments

Comments
 (0)
Please sign in to comment.