Install include files from the libraries.

git-svn-id: http://svn.osgeo.org/qgis/trunk@5961 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Oct 15, 2006 · 552f2c9 · 552f2c9
1 parent e1718bb
commit 552f2c9
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 19 deletions.
diff --git a/src/composer/Makefile.am b/src/composer/Makefile.am
@@ -29,15 +29,15 @@ libqgis_composer_MOC = qgscomposer.moc.cpp	\
 		qgscomposerview.moc.cpp				\
 		qgscomposition.moc.cpp				
 
-##libqgis_composer_la_HEADERS = qgscomposer.h\
-##		qgscomposeritem.h					\
-##		qgscomposerlabel.h					\
-##		qgscomposerpicture.h				\
-##		qgscomposermap.h					\
-##		qgscomposerscalebar.h				\
-##		qgscomposervectorlegend.h			\
-##		qgscomposerview.h					\
-##		qgscomposition.h					
+libqgis_composerHEADERS = qgscomposer.h\
+		qgscomposeritem.h					\
+		qgscomposerlabel.h					\
+		qgscomposerpicture.h				\
+		qgscomposermap.h					\
+		qgscomposerscalebar.h				\
+		qgscomposervectorlegend.h			\
+		qgscomposerview.h					\
+		qgscomposition.h					
 
 libqgis_composer_la_SOURCES =  qgscomposer.cpp\
 		qgscomposeritem.cpp					\
@@ -61,3 +61,7 @@ libqgis_composer_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/ \
 BUILT_SOURCES = $(libqgis_composer_MOC)
 
 CLEANFILES = $(BUILT_SOURCES) 
+
+pkginclude_dir = $(includedir)/qgis
+pkginclude_HEADERS = $(libqgis_composerHEADERS)
+
diff --git a/src/core/Makefile.am b/src/core/Makefile.am
@@ -48,7 +48,6 @@ libqgis_coreHEADERS =				\
 		qgsclipper.h				\
 		qgscolortable.h				\
 		qgscontexthelp.h			\
-		qgscsexception.h			\
 		qgscustomsymbol.h			\
 		qgsdatamanager.h			\
 		qgsdataprovider.h			\
@@ -86,8 +85,7 @@ libqgis_coreHEADERS =				\
 		qgsrenderitem.h				\
 		qgsscalecalculator.h		\
 		qgssearchstring.h			\
-        qgssearchtreenode.h			\
-		qgssinglesymrenderer.h		\
+		qgssearchtreenode.h			\
 		qgssymbol.h					\
 		qgssymbologyutils.h			\
 		qgsvectordataprovider.h		
@@ -169,7 +167,7 @@ libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(
 ##         additional files that need to be installed go here
 ## ----------------------------------------------------------------------
 ##
-pkginclude_HEADERS = $(qgisHEADERS) 
+pkginclude_HEADERS = $(libqgis_coreHEADERS) 
 
 pkginclude_dir = $(includedir)/qgis
 

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
@@ -124,7 +124,6 @@ libqgis_guiHEADERS =							\
 		qgspointstylewidget.h				\
 		qgsproject.h					\
 		qgsprojectproperties.h			\
-		qgsrangerenderitem.h				\
 		qgsrasterlayerproperties.h		\
 		qgsrubberband.h						\
 		qgsrunprocess.h						\
@@ -305,7 +304,7 @@ libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS)
 ##         additional files that need to be installed go here
 ## ----------------------------------------------------------------------
 ##
-pkginclude_HEADERS = $(qgisHEADERS) 
+pkginclude_HEADERS = $(libqgis_guiHEADERS) 
 
 pkginclude_dir = $(includedir)/qgis
 

diff --git a/src/legend/Makefile.am b/src/legend/Makefile.am
@@ -34,6 +34,18 @@ libqgis_legend_la_SOURCES =	qgslegendgroup.cpp \
 				qgslegendsymbologyitem.cpp \
 				qgslegendvectorsymbologyitem.cpp
 
+libqgis_legendHEADERS = \
+		qgslegend.h \
+		qgslegenditem.h \
+		qgslegendlayer.h \
+		qgslegendlayerfile.h \
+		qgslegendlayerfilegroup.h \
+		qgslegendpropertygroup.h \
+		qgslegendpropertyitem.h \
+		qgslegendsymbologygroup.h \
+		qgslegendsymbologyitem.h \
+		qgslegendvectorsymbologyitem.h
+
 libqgis_legend_la_LIBFLAGS = $(QT_LDADD)
 
 libqgis_legend_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
@@ -45,3 +57,7 @@ libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/ \
 BUILT_SOURCES = $(qgis_MOC)
 
 CLEANFILES = $(BUILT_SOURCES)
+
+pkginclude_dir = $(includedir)/qgis
+pkginclude_HEADERS = $(libqgis_legendHEADERS)
+
diff --git a/src/raster/Makefile.am b/src/raster/Makefile.am
@@ -8,15 +8,22 @@ endif
 
 %.moc.cpp: %.h
 	$(MOC) -o $@ $<
+
 lib_LTLIBRARIES = libqgis_raster.la
+
 libqgis_raster_la_MOC =	\
 		qgsrasterlayer.moc.cpp
-libqgis_raster_la_SOURCES = qgsrasterbandstats.h \
-	qgsrasterpyramid.h \
+
+libqgis_raster_la_SOURCES = \
 	qgsrasterlayer.cpp \
-	qgsrasterlayer.h \
-	qgsrasterviewport.h \
 	$(libqgis_raster_la_MOC) 
+
+libqgis_rasterHEADERS = \
+  qgsrasterbandstats.h \
+	qgsrasterpyramid.h \
+	qgsrasterlayer.h \
+	qgsrasterviewport.h
+
 BUILT_SOURCES = $(libqgis_raster_la_MOC) $(libqgis_raster_la_SOURCES)
 ##libqgis_raster_la_LDFLAGS = -no-undefined
 libqgis_raster_la_CPPFLAGS = -I$(OMSRCDIR)
@@ -28,3 +35,7 @@ EXTRA_DIST = \
 	qgsrasterpyramid.h 
 
 CLEANFILES = $(libqgis_raster_la_MOC)
+
+pkginclude_dir = $(includedir)/qgis
+pkginclude_HEADERS = $(libqgis_rasterHEADERS)
+
diff --git a/src/widgets/projectionselector/Makefile.am b/src/widgets/projectionselector/Makefile.am
@@ -32,6 +32,7 @@ selector_UIC = qgsprojectionselectorbase.ui
 
 selector_UI = ui_qgsprojectionselectorbase.h 
 
+selectorHEADERS = qgsprojectionselector.h
 
 libqgsprojectionselector_la_SOURCES =  qgsprojectionselector.cpp \
 			         $(selector_UI) \
@@ -48,3 +49,7 @@ libqgsprojectionselector_la_LDFLAGS = -avoid-version
 libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) -I../../core/
 
 EXTRA_DIST = $(selector_UIC)
+
+pkginclude_dir = $(includedir)/qgis
+pkginclude_HEADERS = $(selectorHEADERS)
+