Skip to content

Commit 97c3eb3

Browse files
author
gsherman
committed
In Makefile.am added missing headers and EXTRA_DIST files needed for make release
Removed unused Makefile generation from configure.in Changed version to 'Titan' git-svn-id: http://svn.osgeo.org/qgis/trunk@6350 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent f3ffc22 commit 97c3eb3

File tree

22 files changed

+31
-23
lines changed

22 files changed

+31
-23
lines changed

configure.in

-2
Original file line numberDiff line numberDiff line change
@@ -508,7 +508,6 @@ AC_CONFIG_FILES([
508508
src/Makefile
509509
src/composer/Makefile
510510
src/core/Makefile
511-
src/designer/Makefile
512511
src/helpviewer/Makefile
513512
src/gui/Makefile
514513
src/legend/Makefile
@@ -527,7 +526,6 @@ AC_CONFIG_FILES([
527526
src/plugins/grass/themes/default/Makefile
528527
src/plugins/grass/themes/Makefile
529528
src/plugins/grid_maker/Makefile
530-
src/plugins/maplayer/Makefile
531529
src/plugins/north_arrow/Makefile
532530
src/plugins/scale_bar/Makefile
533531
src/plugins/spit/Makefile

doc/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,8 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
1212

1313
docdata_DATA = \
1414
favicon.ico \
15-
images \
1615
index.html \
17-
install_guide \
1816
install.pdf \
19-
plugins \
2017
qgisdoc.css \
2118
userguide.pdf
2219

doc/images/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,4 @@ docdata_DATA = qgis_new_80pct.png
1414

1515
# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#'
1616

17-
EXTRA_DIST = $(docdata_DATA)
17+
#EXTRA_DIST = $(docdata_DATA)

images/themes/default/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212

1313
imagedir = ${pkgdatadir}/themes/default
1414

15-
image_DATA = *.png
15+
image_DATA = *.png *.xpm
1616

1717
EXTRA_DIST = $(image_DATA)
+2
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
<h3>Attribute Table</h3>
2+
The Attribute Table dialog displays the rows and columns from the selected
3+
layer. From this dialog you can view, edit, and search attributes.

src/core/qgis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const char* QGis::qgisSvnVersion = QGSSVNVERSION;
1616
const int QGis::qgisVersionInt =800;
1717

1818
// Release name
19-
const char* QGis::qgisReleaseName = "Titan - Release Candidate 1";
19+
const char* QGis::qgisReleaseName = "Titan";
2020

2121
const char* QGis::qgisVectorGeometryType[] =
2222
{

src/gui/Makefile.am

+4-1
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS
6565

6666
libqgis_guiHEADERS = \
6767
qgisapp.h \
68+
qgisgui.h \
6869
qgisiface.h \
6970
qgisinterface.h \
7071
qgsabout.h \
@@ -95,6 +96,7 @@ libqgis_guiHEADERS = \
9596
qgslabel.h \
9697
qgslayerprojectionselector.h \
9798
qgslinestyledialog.h \
99+
qgslinestylewidget.h \
98100
qgsludialog.h \
99101
qgsmapcanvas.h \
100102
qgsmapcanvasitem.h \
@@ -136,6 +138,7 @@ libqgis_guiHEADERS = \
136138
qgsuniquevaluerenderer.h \
137139
qgsuniquevaluedialog.h \
138140
qgsvectorfilewriter.h \
141+
qgsvectorlayer.h \
139142
qgsvectorlayerproperties.h \
140143
qgsvertexmarker.h
141144

@@ -313,7 +316,7 @@ pkginclude_dir = $(includedir)/qgis
313316

314317
CLEANFILES = $(BUILT_SOURCES)
315318

316-
EXTRA_DIST=
319+
EXTRA_DIST = $(libqgis_gui_la_MOC)
317320

318321
if HAVE_POSTGRESQL
319322

src/helpviewer/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ qgis_help_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)
4646

4747
CLEANFILES = $(BUILT_SOURCES)
4848

49-
EXTRA_DIST = $(qgis_help_UIC) icon.xpm
49+
EXTRA_DIST = $(qgis_help_UIC)
5050

5151
# Qt/Mac app needs to be inside a bundle to function correctly
5252
MACBINDIR = $(bindir)/qgis_help.app/Contents/MacOS

src/legend/Makefile.am

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ libqgis_legend_la_SOURCES = qgslegendgroup.cpp \
3636

3737
libqgis_legendHEADERS = \
3838
qgslegend.h \
39+
qgslegendgroup.h \
3940
qgslegenditem.h \
4041
qgslegendlayer.h \
4142
qgslegendlayerfile.h \
@@ -58,6 +59,8 @@ BUILT_SOURCES = $(qgis_MOC)
5859

5960
CLEANFILES = $(BUILT_SOURCES)
6061

62+
#EXTRA_DIST = $(libqgis_legendHEADERS)
63+
6164
pkginclude_dir = $(includedir)/qgis
6265
pkginclude_HEADERS = $(libqgis_legendHEADERS)
6366

src/plugins/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SUBDIRS = $(GEOPROCESSING) \
3131

3232
EXTRA_DIST = \
3333
plugin_builder.pl \
34-
plugin_template/icon.xpm \
34+
plugin_template/plugin.png \
3535
plugin_template/Makefile.am \
3636
plugin_template/plugin.cpp \
3737
plugin_template/pluginguibase.ui \

src/plugins/copyright_label/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ plugin_UIC = pluginguibase.ui
4141

4242
plugin_RES = copyright_plugin.qrc.cpp
4343

44-
plugin_QRC = copyright_plugin.qrc
44+
#plugin_QRC = copyright_plugin.qrc
4545

4646
# UI dependencies
4747
pluginguibase.cpp: pluginguibase.h pluginguibase.ui

src/plugins/delimited_text/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ plugin_UI = ui_qgsdelimitedtextpluginguibase.h
3232

3333
plugin_UIC = qgsdelimitedtextpluginguibase.ui
3434

35-
plugin_QRC = delimited_text.qrc
35+
#plugin_QRC = delimited_text.qrc
3636

3737
plugin_RES = delimited_text.qrc.cpp
3838

src/plugins/georeferencer/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ BUILT_SOURCES = $(plugin_UI) $(plugin_MOC) $(plugin_RES)
8282

8383
CLEANFILES = $(BUILT_SOURCES)
8484

85-
EXTRA_DIST = $(plugin_UIC) zoom_in.xpm zoom_out.xpm pan.xpm add_point.xpm
85+
EXTRA_DIST = $(plugin_UIC) add_point.xpm
8686

8787

8888
endif

src/plugins/gps_importer/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ gpsimporterplugin_la_SOURCES = \
3333
qgsgpsdevice.h \
3434
qgsgpsdevice.cpp \
3535
qgsgpsplugingui.cpp \
36+
qgsgpsplugingui.h
3637
qgsgpsdevicedialog.cpp \
3738
$(plugin_UI)\
3839
$(plugin_MOC) \
@@ -74,7 +75,6 @@ CLEANFILES = $(BUILT_SOURCES)
7475
EXTRA_DIST = $(plugin_UIC) icon.xpm \
7576
ui_qgsgpspluginguibase.h \
7677
ui_qgsgpsdevicedialogbase.h \
77-
ui_qgsgpsplugingui.h \
7878
qgsgpsplugin.h \
7979
qgsgpsdevicedialog.h
8080

src/plugins/grass/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ plugin_UI = ui_qgsgrassselectbase.h \
5858
ui_qgsgrassregionbase.h
5959

6060
plugin_UIC = qgsgrassselectbase.ui \
61-
qgsgrassselectbase.ui.h \
6261
qgsgrasseditbase.ui \
6362
qgsgrassmapcalcbase.ui \
6463
qgsgrassmodulebase.ui \

src/plugins/grid_maker/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ plugin_UIC = pluginguibase.ui
6161

6262
plugin_RES = gridmaker_plugin.qrc.cpp
6363

64-
plugin_QRC = gridmaker_plugin.qrc
64+
#plugin_QRC = gridmaker_plugin.qrc
6565

6666
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
6767

src/plugins/north_arrow/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ plugin_UIC = pluginguibase.ui
4444

4545
plugin_RES = northarrow_plugin.qrc.cpp
4646

47-
plugin_QRC = northarrow_plugin.qrc
47+
#plugin_QRC = northarrow_plugin.qrc
4848

4949

5050
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)

src/plugins/scale_bar/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ plugin_UIC = pluginguibase.ui
4141

4242
plugin_RES = scalebar_plugin.qrc.cpp
4343

44-
plugin_QRC = scalebar_plugin.qrc
44+
#plugin_QRC = scalebar_plugin.qrc
4545

4646
# UI dependencies
4747
pluginguibase.cpp: pluginguibase.h pluginguibase.ui

src/plugins/spit/Makefile.am

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spit_MOC = qgsspit.moc.cpp \
3434

3535
spit_RES = spit.qrc.cpp
3636

37-
spit_QRC = spit.qrc
37+
#spit_QRC = spit.qrc
3838

3939
spitplugin_la_MOC = $(spit_MOC) qgsspitplugin.moc.cpp
4040

src/plugins/wfs/Makefile.am

+6-1
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,18 @@ ui_%.h: %.ui
4444

4545
wfsplugin_la_SOURCES = qgswfsplugin.cpp \
4646
qgswfssourceselect.cpp \
47+
qgswfsplugin.h \
48+
qgswfssourceselect.h \
4749
$(plugin_UI)\
4850
$(plugin_MOC)
4951

52+
5053
plugin_MOC = qgswfsplugin.moc.cpp \
5154
qgswfssourceselect.moc.cpp
5255

5356
plugin_UI = ui_qgswfssourceselectbase.h
5457

55-
plugin_UIC = qgswfssourceselectbase.u
58+
plugin_UIC = qgswfssourceselectbase.ui
5659

5760
BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
5861

@@ -79,3 +82,5 @@ wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \
7982
-I..
8083

8184
wfsplugin_la_LDFLAGS = -avoid-version -module
85+
86+
EXTRA_DIST = $(wfsplugin_la_HEADERS) $(PLUGIN_UI) $(PLUGIN_UIC) mIconAddWfsLayer.xpm

src/providers/wfs/Makefile.am

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ INCLUDES = -I../../core/ -I../../gui/ -I../../ui
66
plugindir = ${pkglibdir}
77
plugin_LTLIBRARIES = libwfsprovider.la
88

9-
libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC)
9+
libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC) qgswfsprovider.h
1010

1111
BUILT_SOURCES = $(wfsprovider_MOC)
1212

1313
libwfsprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB) $(GEOS_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
1414
libwfsprovider_la_LDFLAGS = -avoid-version -module
1515
libwfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GEOS_CFLAGS)/geos
1616

17-
CLEANFILES = $(BUILT_SOURCES)
17+
CLEANFILES = $(BUILT_SOURCES)

src/ui/Makefile.am

+1
Original file line numberDiff line numberDiff line change
@@ -157,3 +157,4 @@ qgis_ui_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFL
157157

158158
CLEANFILES = $(BUILT_SOURCES)
159159

160+
EXTRA_DIST = $(qgis_ui_UIHEADERS) $(postgresUIHEADERS)

0 commit comments

Comments
 (0)