Skip to content

Commit 552f2c9

Browse files
author
wonder
committed
Install include files from the libraries.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5961 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent e1718bb commit 552f2c9

File tree

6 files changed

+52
-19
lines changed

6 files changed

+52
-19
lines changed

src/composer/Makefile.am

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ libqgis_composer_MOC = qgscomposer.moc.cpp \
2929
qgscomposerview.moc.cpp \
3030
qgscomposition.moc.cpp
3131

32-
##libqgis_composer_la_HEADERS = qgscomposer.h\
33-
## qgscomposeritem.h \
34-
## qgscomposerlabel.h \
35-
## qgscomposerpicture.h \
36-
## qgscomposermap.h \
37-
## qgscomposerscalebar.h \
38-
## qgscomposervectorlegend.h \
39-
## qgscomposerview.h \
40-
## qgscomposition.h
32+
libqgis_composerHEADERS = qgscomposer.h\
33+
qgscomposeritem.h \
34+
qgscomposerlabel.h \
35+
qgscomposerpicture.h \
36+
qgscomposermap.h \
37+
qgscomposerscalebar.h \
38+
qgscomposervectorlegend.h \
39+
qgscomposerview.h \
40+
qgscomposition.h
4141

4242
libqgis_composer_la_SOURCES = qgscomposer.cpp\
4343
qgscomposeritem.cpp \
@@ -61,3 +61,7 @@ libqgis_composer_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/ \
6161
BUILT_SOURCES = $(libqgis_composer_MOC)
6262

6363
CLEANFILES = $(BUILT_SOURCES)
64+
65+
pkginclude_dir = $(includedir)/qgis
66+
pkginclude_HEADERS = $(libqgis_composerHEADERS)
67+

src/core/Makefile.am

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ libqgis_coreHEADERS = \
4848
qgsclipper.h \
4949
qgscolortable.h \
5050
qgscontexthelp.h \
51-
qgscsexception.h \
5251
qgscustomsymbol.h \
5352
qgsdatamanager.h \
5453
qgsdataprovider.h \
@@ -86,8 +85,7 @@ libqgis_coreHEADERS = \
8685
qgsrenderitem.h \
8786
qgsscalecalculator.h \
8887
qgssearchstring.h \
89-
qgssearchtreenode.h \
90-
qgssinglesymrenderer.h \
88+
qgssearchtreenode.h \
9189
qgssymbol.h \
9290
qgssymbologyutils.h \
9391
qgsvectordataprovider.h
@@ -169,7 +167,7 @@ libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(
169167
## additional files that need to be installed go here
170168
## ----------------------------------------------------------------------
171169
##
172-
pkginclude_HEADERS = $(qgisHEADERS)
170+
pkginclude_HEADERS = $(libqgis_coreHEADERS)
173171

174172
pkginclude_dir = $(includedir)/qgis
175173

src/gui/Makefile.am

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ libqgis_guiHEADERS = \
124124
qgspointstylewidget.h \
125125
qgsproject.h \
126126
qgsprojectproperties.h \
127-
qgsrangerenderitem.h \
128127
qgsrasterlayerproperties.h \
129128
qgsrubberband.h \
130129
qgsrunprocess.h \
@@ -305,7 +304,7 @@ libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS)
305304
## additional files that need to be installed go here
306305
## ----------------------------------------------------------------------
307306
##
308-
pkginclude_HEADERS = $(qgisHEADERS)
307+
pkginclude_HEADERS = $(libqgis_guiHEADERS)
309308

310309
pkginclude_dir = $(includedir)/qgis
311310

src/legend/Makefile.am

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ libqgis_legend_la_SOURCES = qgslegendgroup.cpp \
3434
qgslegendsymbologyitem.cpp \
3535
qgslegendvectorsymbologyitem.cpp
3636

37+
libqgis_legendHEADERS = \
38+
qgslegend.h \
39+
qgslegenditem.h \
40+
qgslegendlayer.h \
41+
qgslegendlayerfile.h \
42+
qgslegendlayerfilegroup.h \
43+
qgslegendpropertygroup.h \
44+
qgslegendpropertyitem.h \
45+
qgslegendsymbologygroup.h \
46+
qgslegendsymbologyitem.h \
47+
qgslegendvectorsymbologyitem.h
48+
3749
libqgis_legend_la_LIBFLAGS = $(QT_LDADD)
3850

3951
libqgis_legend_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
@@ -45,3 +57,7 @@ libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/ \
4557
BUILT_SOURCES = $(qgis_MOC)
4658

4759
CLEANFILES = $(BUILT_SOURCES)
60+
61+
pkginclude_dir = $(includedir)/qgis
62+
pkginclude_HEADERS = $(libqgis_legendHEADERS)
63+

src/raster/Makefile.am

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,22 @@ endif
88

99
%.moc.cpp: %.h
1010
$(MOC) -o $@ $<
11+
1112
lib_LTLIBRARIES = libqgis_raster.la
13+
1214
libqgis_raster_la_MOC = \
1315
qgsrasterlayer.moc.cpp
14-
libqgis_raster_la_SOURCES = qgsrasterbandstats.h \
15-
qgsrasterpyramid.h \
16+
17+
libqgis_raster_la_SOURCES = \
1618
qgsrasterlayer.cpp \
17-
qgsrasterlayer.h \
18-
qgsrasterviewport.h \
1919
$(libqgis_raster_la_MOC)
20+
21+
libqgis_rasterHEADERS = \
22+
qgsrasterbandstats.h \
23+
qgsrasterpyramid.h \
24+
qgsrasterlayer.h \
25+
qgsrasterviewport.h
26+
2027
BUILT_SOURCES = $(libqgis_raster_la_MOC) $(libqgis_raster_la_SOURCES)
2128
##libqgis_raster_la_LDFLAGS = -no-undefined
2229
libqgis_raster_la_CPPFLAGS = -I$(OMSRCDIR)
@@ -28,3 +35,7 @@ EXTRA_DIST = \
2835
qgsrasterpyramid.h
2936

3037
CLEANFILES = $(libqgis_raster_la_MOC)
38+
39+
pkginclude_dir = $(includedir)/qgis
40+
pkginclude_HEADERS = $(libqgis_rasterHEADERS)
41+

src/widgets/projectionselector/Makefile.am

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ selector_UIC = qgsprojectionselectorbase.ui
3232

3333
selector_UI = ui_qgsprojectionselectorbase.h
3434

35+
selectorHEADERS = qgsprojectionselector.h
3536

3637
libqgsprojectionselector_la_SOURCES = qgsprojectionselector.cpp \
3738
$(selector_UI) \
@@ -48,3 +49,7 @@ libqgsprojectionselector_la_LDFLAGS = -avoid-version
4849
libqgsprojectionselector_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) -I../../core/
4950

5051
EXTRA_DIST = $(selector_UIC)
52+
53+
pkginclude_dir = $(includedir)/qgis
54+
pkginclude_HEADERS = $(selectorHEADERS)
55+

0 commit comments

Comments
 (0)