Navigation Menu

Skip to content

Commit

Permalink
In Makefile.am added missing headers and EXTRA_DIST files needed for …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
gsherman committed Dec 30, 2006
1 parent f3ffc22 commit 97c3eb3
Show file tree
Hide file tree
Showing 22 changed files with 31 additions and 23 deletions.
2 changes: 0 additions & 2 deletions configure.in
Expand Up @@ -508,7 +508,6 @@ AC_CONFIG_FILES([
src/Makefile
src/composer/Makefile
src/core/Makefile
src/designer/Makefile
src/helpviewer/Makefile
src/gui/Makefile
src/legend/Makefile
Expand All @@ -527,7 +526,6 @@ AC_CONFIG_FILES([
src/plugins/grass/themes/default/Makefile
src/plugins/grass/themes/Makefile
src/plugins/grid_maker/Makefile
src/plugins/maplayer/Makefile
src/plugins/north_arrow/Makefile
src/plugins/scale_bar/Makefile
src/plugins/spit/Makefile
Expand Down
3 changes: 0 additions & 3 deletions doc/Makefile.am
Expand Up @@ -12,11 +12,8 @@ docdatadir = $(datadir)/$(PACKAGE)/doc

docdata_DATA = \
favicon.ico \
images \
index.html \
install_guide \
install.pdf \
plugins \
qgisdoc.css \
userguide.pdf

Expand Down
2 changes: 1 addition & 1 deletion doc/images/Makefile.am
Expand Up @@ -14,4 +14,4 @@ docdata_DATA = qgis_new_80pct.png

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

EXTRA_DIST = $(docdata_DATA)
#EXTRA_DIST = $(docdata_DATA)
2 changes: 1 addition & 1 deletion images/themes/default/Makefile.am
Expand Up @@ -12,6 +12,6 @@

imagedir = ${pkgdatadir}/themes/default

image_DATA = *.png
image_DATA = *.png *.xpm

EXTRA_DIST = $(image_DATA)
2 changes: 2 additions & 0 deletions resources/context_help/831088384_en_US
@@ -1 +1,3 @@
<h3>Attribute Table</h3>
The Attribute Table dialog displays the rows and columns from the selected
layer. From this dialog you can view, edit, and search attributes.
2 changes: 1 addition & 1 deletion src/core/qgis.cpp
Expand Up @@ -16,7 +16,7 @@ const char* QGis::qgisSvnVersion = QGSSVNVERSION;
const int QGis::qgisVersionInt =800;

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

const char* QGis::qgisVectorGeometryType[] =
{
Expand Down
5 changes: 4 additions & 1 deletion src/gui/Makefile.am
Expand Up @@ -65,6 +65,7 @@ qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS

libqgis_guiHEADERS = \
qgisapp.h \
qgisgui.h \
qgisiface.h \
qgisinterface.h \
qgsabout.h \
Expand Down Expand Up @@ -95,6 +96,7 @@ libqgis_guiHEADERS = \
qgslabel.h \
qgslayerprojectionselector.h \
qgslinestyledialog.h \
qgslinestylewidget.h \
qgsludialog.h \
qgsmapcanvas.h \
qgsmapcanvasitem.h \
Expand Down Expand Up @@ -136,6 +138,7 @@ libqgis_guiHEADERS = \
qgsuniquevaluerenderer.h \
qgsuniquevaluedialog.h \
qgsvectorfilewriter.h \
qgsvectorlayer.h \
qgsvectorlayerproperties.h \
qgsvertexmarker.h

Expand Down Expand Up @@ -313,7 +316,7 @@ pkginclude_dir = $(includedir)/qgis

CLEANFILES = $(BUILT_SOURCES)

EXTRA_DIST=
EXTRA_DIST = $(libqgis_gui_la_MOC)

if HAVE_POSTGRESQL

Expand Down
2 changes: 1 addition & 1 deletion src/helpviewer/Makefile.am
Expand Up @@ -46,7 +46,7 @@ qgis_help_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS)

CLEANFILES = $(BUILT_SOURCES)

EXTRA_DIST = $(qgis_help_UIC) icon.xpm
EXTRA_DIST = $(qgis_help_UIC)

# Qt/Mac app needs to be inside a bundle to function correctly
MACBINDIR = $(bindir)/qgis_help.app/Contents/MacOS
Expand Down
3 changes: 3 additions & 0 deletions src/legend/Makefile.am
Expand Up @@ -36,6 +36,7 @@ libqgis_legend_la_SOURCES = qgslegendgroup.cpp \

libqgis_legendHEADERS = \
qgslegend.h \
qgslegendgroup.h \
qgslegenditem.h \
qgslegendlayer.h \
qgslegendlayerfile.h \
Expand All @@ -58,6 +59,8 @@ BUILT_SOURCES = $(qgis_MOC)

CLEANFILES = $(BUILT_SOURCES)

#EXTRA_DIST = $(libqgis_legendHEADERS)

pkginclude_dir = $(includedir)/qgis
pkginclude_HEADERS = $(libqgis_legendHEADERS)

2 changes: 1 addition & 1 deletion src/plugins/Makefile.am
Expand Up @@ -31,7 +31,7 @@ SUBDIRS = $(GEOPROCESSING) \

EXTRA_DIST = \
plugin_builder.pl \
plugin_template/icon.xpm \
plugin_template/plugin.png \
plugin_template/Makefile.am \
plugin_template/plugin.cpp \
plugin_template/pluginguibase.ui \
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/copyright_label/Makefile.am
Expand Up @@ -41,7 +41,7 @@ plugin_UIC = pluginguibase.ui

plugin_RES = copyright_plugin.qrc.cpp

plugin_QRC = copyright_plugin.qrc
#plugin_QRC = copyright_plugin.qrc

# UI dependencies
pluginguibase.cpp: pluginguibase.h pluginguibase.ui
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/delimited_text/Makefile.am
Expand Up @@ -32,7 +32,7 @@ plugin_UI = ui_qgsdelimitedtextpluginguibase.h

plugin_UIC = qgsdelimitedtextpluginguibase.ui

plugin_QRC = delimited_text.qrc
#plugin_QRC = delimited_text.qrc

plugin_RES = delimited_text.qrc.cpp

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/georeferencer/Makefile.am
Expand Up @@ -82,7 +82,7 @@ BUILT_SOURCES = $(plugin_UI) $(plugin_MOC) $(plugin_RES)

CLEANFILES = $(BUILT_SOURCES)

EXTRA_DIST = $(plugin_UIC) zoom_in.xpm zoom_out.xpm pan.xpm add_point.xpm
EXTRA_DIST = $(plugin_UIC) add_point.xpm


endif
2 changes: 1 addition & 1 deletion src/plugins/gps_importer/Makefile.am
Expand Up @@ -33,6 +33,7 @@ gpsimporterplugin_la_SOURCES = \
qgsgpsdevice.h \
qgsgpsdevice.cpp \
qgsgpsplugingui.cpp \
qgsgpsplugingui.h
qgsgpsdevicedialog.cpp \
$(plugin_UI)\
$(plugin_MOC) \
Expand Down Expand Up @@ -74,7 +75,6 @@ CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(plugin_UIC) icon.xpm \
ui_qgsgpspluginguibase.h \
ui_qgsgpsdevicedialogbase.h \
ui_qgsgpsplugingui.h \
qgsgpsplugin.h \
qgsgpsdevicedialog.h

Expand Down
1 change: 0 additions & 1 deletion src/plugins/grass/Makefile.am
Expand Up @@ -58,7 +58,6 @@ plugin_UI = ui_qgsgrassselectbase.h \
ui_qgsgrassregionbase.h

plugin_UIC = qgsgrassselectbase.ui \
qgsgrassselectbase.ui.h \
qgsgrasseditbase.ui \
qgsgrassmapcalcbase.ui \
qgsgrassmodulebase.ui \
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grid_maker/Makefile.am
Expand Up @@ -61,7 +61,7 @@ plugin_UIC = pluginguibase.ui

plugin_RES = gridmaker_plugin.qrc.cpp

plugin_QRC = gridmaker_plugin.qrc
#plugin_QRC = gridmaker_plugin.qrc

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

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/north_arrow/Makefile.am
Expand Up @@ -44,7 +44,7 @@ plugin_UIC = pluginguibase.ui

plugin_RES = northarrow_plugin.qrc.cpp

plugin_QRC = northarrow_plugin.qrc
#plugin_QRC = northarrow_plugin.qrc


BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/scale_bar/Makefile.am
Expand Up @@ -41,7 +41,7 @@ plugin_UIC = pluginguibase.ui

plugin_RES = scalebar_plugin.qrc.cpp

plugin_QRC = scalebar_plugin.qrc
#plugin_QRC = scalebar_plugin.qrc

# UI dependencies
pluginguibase.cpp: pluginguibase.h pluginguibase.ui
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/spit/Makefile.am
Expand Up @@ -34,7 +34,7 @@ spit_MOC = qgsspit.moc.cpp \

spit_RES = spit.qrc.cpp

spit_QRC = spit.qrc
#spit_QRC = spit.qrc

spitplugin_la_MOC = $(spit_MOC) qgsspitplugin.moc.cpp

Expand Down
7 changes: 6 additions & 1 deletion src/plugins/wfs/Makefile.am
Expand Up @@ -44,15 +44,18 @@ ui_%.h: %.ui

wfsplugin_la_SOURCES = qgswfsplugin.cpp \
qgswfssourceselect.cpp \
qgswfsplugin.h \
qgswfssourceselect.h \
$(plugin_UI)\
$(plugin_MOC)


plugin_MOC = qgswfsplugin.moc.cpp \
qgswfssourceselect.moc.cpp

plugin_UI = ui_qgswfssourceselectbase.h

plugin_UIC = qgswfssourceselectbase.u
plugin_UIC = qgswfssourceselectbase.ui

BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)

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

wfsplugin_la_LDFLAGS = -avoid-version -module

EXTRA_DIST = $(wfsplugin_la_HEADERS) $(PLUGIN_UI) $(PLUGIN_UIC) mIconAddWfsLayer.xpm
4 changes: 2 additions & 2 deletions src/providers/wfs/Makefile.am
Expand Up @@ -6,12 +6,12 @@ INCLUDES = -I../../core/ -I../../gui/ -I../../ui
plugindir = ${pkglibdir}
plugin_LTLIBRARIES = libwfsprovider.la

libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC)
libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC) qgswfsprovider.h

BUILT_SOURCES = $(wfsprovider_MOC)

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

CLEANFILES = $(BUILT_SOURCES)
CLEANFILES = $(BUILT_SOURCES)
1 change: 1 addition & 0 deletions src/ui/Makefile.am
Expand Up @@ -157,3 +157,4 @@ qgis_ui_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFL

CLEANFILES = $(BUILT_SOURCES)

EXTRA_DIST = $(qgis_ui_UIHEADERS) $(postgresUIHEADERS)

0 comments on commit 97c3eb3

Please sign in to comment.