Some fixes to get lib to compile

git-svn-id: http://svn.osgeo.org/qgis/trunk@4609 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Jan 8, 2006 · 13a44e6 · 13a44e6
1 parent b228a67
commit 13a44e6
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -76,14 +76,17 @@ libqgis_guiHEADERS =							\
 		qgsabout.h				\
 		qgsaddattrdialog.h				\
 		qgsadvancedattrsearch.h				\
+		qgsattributeaction.h		\
 		qgsattributeactiondialog.h			\
 		qgsattributedialog.h				\
 		qgsattributetabledisplay.h			\
 		qgsattributetable.h				\
 		qgsbookmarks.h			\
+		qgsclipboard.h				\
 		qgscontcoldialog.h				\
 		qgscontinuouscolrenderer.h			\
 		qgscsexception.h				\
+		qgscoordinatetransform.h	\
 		qgscustomprojectiondialog.h			\
 		qgsdatasourceuri.h				\
 		qgsdelattrdialog.h				\
@@ -185,12 +188,15 @@ libqgis_gui_la_SOURCES =						\
 		qgsabout.cpp		\
 		qgsaddattrdialog.cpp		\
 		qgsadvancedattrsearch.cpp	\
+	   	qgsattributeaction.cpp				\
 		qgsattributeactiondialog.cpp	\
 		qgsattributedialog.cpp		\
 		qgsattributetable.cpp		\
 		qgsattributetabledisplay.cpp	\
 		qgsbookmarks.cpp	\
+		qgsclipboard.cpp		\
 		qgscontcoldialog.cpp		\
+		qgscoordinatetransform.cpp			\
 		qgscontinuouscolrenderer.cpp		\
 		qgscustomprojectiondialog.cpp			\
 		qgsdelattrdialog.cpp		\

diff --git a/src/core/Makefile.am b/src/core/Makefile.am
@@ -47,13 +47,10 @@ libqgis_coreHEADERS =				\
 		qgsacetateobject.h			\
 		qgsacetaterectangle.h		\
 		qgsapplication.h			\
-		qgsattributeaction.h		\
 		qgsbookmarkitem.h			\
-		qgsclipboard.h				\
 		qgsclipper.h				\
 		qgscolortable.h				\
 		qgscontexthelp.h			\
-		qgscoordinatetransform.h	\
 		qgscsexception.h			\
 		qgscustomsymbol.h			\
 		qgsdatamanager.h			\
@@ -109,13 +106,10 @@ libqgis_core_la_SOURCES =\
 		qgsacetateobject.cpp				\
 		qgsacetaterectangle.cpp				\
 		qgsapplication.cpp	\
-	   	qgsattributeaction.cpp				\
 		qgsbookmarkitem.cpp	\
-		qgsclipboard.cpp		\
 		qgsclipper.cpp						\
 		qgscolortable.cpp					\
 		qgscontexthelp.cpp		\
-		qgscoordinatetransform.cpp			\
 		qgscustomsymbol.cpp		\
 		qgsdatamanager.cpp				\
 		qgsdatasource.cpp		\
@@ -171,7 +165,7 @@ BUILT_SOURCES = $(libqgis_core_la_MOC) $(qgis_YACC)  $(postgresMOC)
 libqgis_core_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
 libqgis_core_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
-libqgis_core_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/ -I../composer/
+libqgis_core_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/ -I../composer/ -I../
 
 ##
 ## ----------------------------------------------------------------------

diff --git a/src/core/qgsattributeaction.cpp → src/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp → src/qgsattributeaction.cpp
diff --git a/src/core/qgsattributeaction.h → src/qgsattributeaction.h b/src/core/qgsattributeaction.h → src/qgsattributeaction.h
diff --git a/src/core/qgsclipboard.cpp → src/qgsclipboard.cpp b/src/core/qgsclipboard.cpp → src/qgsclipboard.cpp
diff --git a/src/core/qgsclipboard.h → src/qgsclipboard.h b/src/core/qgsclipboard.h → src/qgsclipboard.h
diff --git a/src/core/qgscoordinatetransform.cpp → src/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp → src/qgscoordinatetransform.cpp
diff --git a/src/core/qgscoordinatetransform.h → src/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h → src/qgscoordinatetransform.h