Fix build errors caused by my last commit (moving of ui* into ui/)

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4416 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Dec 30, 2005 · 5831742 · 5831742
1 parent 5b51310
commit 5831742
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -250,8 +250,7 @@ qgis_LDFLAGS = -framework ApplicationServices
 else
 qgis_LDFLAGS = -rdynamic
 endif
-qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../widgets/projectionselector/ -I./legend/ -I./raster/ -I./ui/
-
+qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I./ui/ -I../widgets/projectionselector/ -I./legend/ -I./raster/ 
 
 libqgisHEADERS =							\
 		qgisapp.h							\
@@ -429,7 +428,7 @@ BUILT_SOURCES += $(libqgis_la_MOC) $(libqgis_la_UIHEADERS)
 libqgis_la_LIBADD = raster/libqgsraster.la legend/libqgis_legend.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
 libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
-libqgis_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../widgets/projectionselector/ -I./legend/ -I./raster/ -I./ui/
+libqgis_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I./ui/ -I../widgets/projectionselector/ -I./legend/ -I./raster/ 
 
 ## for installing headers in $(includedir)/qgis
 pkginclude_HEADERS = $(qgisHEADERS) \

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.. \
+libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I.. -I../ui/ \
 				$(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 = $(libqgsraster_la_MOC) $(libqgsraster_la_SOURCES)
 libqgsraster_la_LDFLAGS = -no-undefined
 libqgsraster_la_CPPFLAGS = -I$(OMSRCDIR)
 libqgsraster_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD)
-libqgsraster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../ -I../legend/
+libqgsraster_la_CXXFLAGS = $(PREFIX) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../widgets/projectionselector/ -I../ -I../legend/ -I../ui/
 
 EXTRA_DIST = \
 	qgsrasterbandstats.h \