Major reorganisation of src/Makefile.am

- got rid of unused vars
- added comments
- sorted sources lists alphabetically
- nested pg directives together so they are not scattered over the file
- various other tweaks

The qgis app target is now extremely basic and the lib target much more neatly laid out. 
This paves the way now for splitting the qgislib target into two:

- libqgiscore (for non gui classes)
- libqgis (contains gui classes)

By non gui I mean 'not derived from qwidget or showing any gui elements such as message boxes'.



git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4445 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
timlinux 2006-01-01 12:57:03 +00:00
parent ae41525582
commit 94d0e3e2e5

View File

@ -8,6 +8,11 @@
# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
##
## ----------------------------------------------------------------------
## Initial setup
## ----------------------------------------------------------------------
##
if HAVE_QTMAC
MAC = mac
endif
@ -23,7 +28,11 @@ WIDGETPATH=../widgets
%.moc.cpp: %.h
$(MOC) -o $@ $<
## main app
##
## ----------------------------------------------------------------------
## Define Targets
## ----------------------------------------------------------------------
##
if HAVE_QTMAC
## Qt/Mac binary must be in MacOS directory within bundle, not in bin subdirectory
## (configure ensures that prefix ends in qgis.app/Contents/MacOS)
@ -33,50 +42,16 @@ else
bin_PROGRAMS = qgis
endif
## ancillary library for plug-ins
## Changed by Tim so lib builds first then app
lib_LTLIBRARIES = libqgis.la
##
## ----------------------------------------------------------------------
## QGIS Desktop Application
## ----------------------------------------------------------------------
##
qgis_SOURCES = main.cpp
AM_YFLAGS = -d
qgis_YACC = qgssearchstringparser.h
postgresHEADERS = qgsdbsourceselect.h \
qgsnewconnection.h \
qgspgquerybuilder.h
postgresSOURCES = qgsdbsourceselect.cpp \
qgsnewconnection.cpp \
qgspgquerybuilder.cpp
postgresUIH =
postgresLIBHEADERS = qgspgutil.h
postgresLIBSOURCES = qgspgutil.cpp
postgresUIHEADERS = ui_qgsdbsourceselectbase.h \
ui_qgsnewconnectionbase.h \
ui_qgspgquerybuilderbase.h
if HAVE_POSTGRESQL
postgresMOC = $(postgresHEADERS:.h=.moc.cpp)
qgis_SOURCES = $(postgresSOURCES)
endif
## nodist_qgis_SOURCES = $(qgis_MOC) $(qgis_UISOURCES) $(qgis_UIMOC) \
nodist_qgis_SOURCES = $(qgis_MOC) \
$(postgresMOC) $(postgresUISOURCES) $(postgresUIMOC)
## BUILT_SOURCES = $(qgis_MOC) $(qgis_UIMOC) $(qgis_UIHEADERS) $(qgis_UISOURCES) $(qgis_YACC) \
BUILT_SOURCES = $(qgis_MOC) $(qgis_YACC) \
$(postgresMOC) $(postgresUIMOC)
qgis_SOURCES = main.cpp
qgis_LDADD = raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 libqgis.la
if HAVE_QTMAC
@ -86,70 +61,39 @@ qgis_LDFLAGS = -rdynamic
endif
qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I./ui/ -I../widgets/projectionselector/ -I./legend/ -I./raster/ -I./composer/
##
## ----------------------------------------------------------------------
## libqgis stuff starts here
## ----------------------------------------------------------------------
##
libqgisHEADERS = \
qgisapp.h \
qgsacetatelines.h \
qgsacetateobject.h \
qgsacetaterectangle.h \
qgsattributeaction.h \
qgsclipper.h \
qgscolortable.h \
qgscontinuouscolrenderer.h \
qgscoordinatetransform.h \
qgscustomprojectiondialog.h \
qgsexception.h \
qgsfeature.h \
qgsfeatureattribute.h \
qgsfield.h \
qgsfillstylewidget.h \
qgsgeometry.h \
qgsgeometryvertexindex.h \
qgsgraduatedsymrenderer.h \
qgslabel.h \
qgslinestylewidget.h \
qgsmapcanvas.h \
qgsmapoverviewcanvas.h \
qgsmaplayer.h \
qgsmaplayerregistry.h \
qgsmaptopixel.h \
qgsmarkercatalogue.h \
qgsmarkersymbol.h \
qgsnumericsortlistviewitem.h \
qgspoint.h \
qgspointstylewidget.h \
qgsprojectproperty.h \
qgsprovidercountcalcevent.h \
qgsproviderextentcalcevent.h \
qgsproviderregistry.h \
qgsrangerenderitem.h \
qgsrect.h \
qgsrenderer.h \
qgsrenderitem.h \
qgsrunprocess.h \
qgsscalecalculator.h \
qgssinglesymrenderer.h \
qgsspatialrefsys.h \
qgssymbol.h \
qgsuniquevalrenderer.h \
qgsvectordataprovider.h \
qgsvectorfilewriter.h \
qgis.h \
qgisiface.h \
qgisinterface.h \
qgsabout.h \
qgsacetatelines.h \
qgsacetateobject.h \
qgsacetaterectangle.h \
qgsaddattrdialog.h \
qgsadvancedattrsearch.h \
qgsattributeactiondialog.h \
qgsattributeaction.h \
qgsattributedialog.h \
qgsattributetabledisplay.h \
qgsattributetable.h \
qgsbookmarks.h \
qgsbookmarkitem.h \
qgsbookmarks.h \
qgsclipboard.h \
qgscontexthelp.h \
qgsclipper.h \
qgscolortable.h \
qgscontcoldialog.h \
qgsencodingfiledialog.h \
qgsmaptopixel.h \
qgscontexthelp.h \
qgscontinuouscolrenderer.h \
qgscoordinatetransform.h \
qgscsexception.h \
qgscustomprojectiondialog.h \
qgscustomsymbol.h \
qgsdatamanager.h \
qgsdataprovider.h \
@ -157,25 +101,41 @@ libqgisHEADERS = \
qgsdatasourceuri.h \
qgsdelattrdialog.h \
qgsdistancearea.h \
qgsvectorlayerproperties.h \
qgsencodingfiledialog.h \
qgsexception.h \
qgsfeatureattribute.h \
qgsfeature.h \
qgsfield.h \
qgsfile.h \
qgscsexception.h \
qgsfillstylewidget.h \
qgsgeometry.h \
qgsgeometryvertexindex.h \
qgsgeomtypedialog.h \
qgsgraduatedsymrenderer.h \
qgsgrasydialog.h \
qgshelpviewer.h \
qgsidentifyresults.h \
qgslabelattributes.h \
qgslabeldialog.h \
qgslabel.h \
qgslayerprojectionselector.h \
qgsline.h \
qgslinestyledialog.h \
qgslinesymbol.h \
qgsludialog.h \
qgsmapcanvas.h \
qgsmaplayer.h \
qgsmaplayerinterface.h \
qgsmaplayerregistry.h \
qgsmapoverviewcanvas.h \
qgsmapserverexport.h \
qgsmaptopixel.h \
qgsmarkercatalogue.h \
qgsmarkerdialog.h \
qgsmarkersymbol.h \
qgsmeasure.h \
qgsnewhttpconnection.h \
qgsnumericsortlistviewitem.h \
qgsoptions.h \
qgspastetransformations.h \
qgspatterndialog.h \
@ -183,56 +143,43 @@ libqgisHEADERS = \
qgspluginmanager.h \
qgspluginmetadata.h \
qgspluginregistry.h \
qgspoint.h \
qgspointstylewidget.h \
qgspolygonsymbol.h \
qgsproject.h \
qgsprojectproperties.h \
qgsprojectproperty.h \
qgsprovidercountcalcevent.h \
qgsproviderextentcalcevent.h \
qgsprovidermetadata.h \
qgsproviderregistry.h \
qgsrangerenderitem.h \
qgsrasterdataprovider.h \
qgsrasterlayerproperties.h \
qgsrect.h \
qgsrenderer.h \
qgsrenderitem.h \
qgsrunprocess.h \
qgsscalecalculator.h \
qgssearchstring.h \
qgssearchtreenode.h \
qgsserversourceselect.h \
qgssinglesymrenderer.h \
qgssisydialog.h \
qgsspatialrefsys.h \
qgssvgcache.h \
qgsmarkercatalogue.h \
qgssymbol.h \
qgssymbologyutils.h \
qgsuniquevalrenderer.h \
qgsuvaldialog.h \
qgslayerprojectionselector.h \
qgsvectordataprovider.h \
qgsvectorfilewriter.h \
qgsvectorlayerproperties.h \
$(WIDGETPATH)/projectionselector/qgsprojectionselector.h
## all the ui files generate a corresponding header file
## libqgis_la_UIHEADERS = $(libqgis_la_UIC:.ui=.uic.h)
#libqgis_la_UIHEADERS = $(libqgis_la_UIC:.ui=ui_%.h)
if !NO_UIC_IMPLEMENTATIONS
## similarly all the ui files generate a corresponding implementation file
## libqgis_la_UISOURCES = $(libqgis_la_UIC:.ui=.uic.cpp)
endif
## these are optional ancillary user-defined qtdesigner-based headers
libqgis_la_UIH = \
qgisappbase.ui.h \
qgscustomprojectiondialogbase.ui.h
## these generated files need MOC files, too
## libqgis_la_UIMOC = $(libqgis_la_UIC:.ui=.moc.uic.cpp)
## non-uic files generated from MOC
## files generated from MOC
libqgis_la_MOC = \
qgisapp.moc.cpp \
qgscoordinatetransform.moc.cpp \
qgscustomprojectiondialog.moc.cpp \
qgsdataprovider.moc.cpp \
qgsfillstylewidget.moc.cpp \
qgslinestylewidget.moc.cpp \
qgsmapcanvas.moc.cpp \
qgsmaplayer.moc.cpp \
qgsmaplayerregistry.moc.cpp \
qgsmapoverviewcanvas.moc.cpp \
qgspointstylewidget.moc.cpp \
qgsrunprocess.moc.cpp \
qgsvectorlayer.moc.cpp \
qgisinterface.moc.cpp \
qgsabout.moc.cpp \
qgsaddattrdialog.moc.cpp \
@ -244,9 +191,12 @@ libqgis_la_MOC = \
qgsbookmarks.moc.cpp \
qgscontcoldialog.moc.cpp \
qgscontexthelp.moc.cpp \
qgscoordinatetransform.moc.cpp \
qgscustomprojectiondialog.moc.cpp \
qgsdataprovider.moc.cpp \
qgsdelattrdialog.moc.cpp \
qgsvectorlayerproperties.moc.cpp \
qgsencodingfiledialog.moc.cpp \
qgsfillstylewidget.moc.cpp \
qgsgeomtypedialog.moc.cpp \
qgsgrasydialog.moc.cpp \
qgshelpviewer.moc.cpp \
@ -254,8 +204,13 @@ libqgis_la_MOC = \
qgslabeldialog.moc.cpp \
qgslayerprojectionselector.moc.cpp \
qgslinestyledialog.moc.cpp \
qgslinestylewidget.moc.cpp \
qgsludialog.moc.cpp \
qgsmapcanvas.moc.cpp \
qgsmaplayerinterface.moc.cpp \
qgsmaplayer.moc.cpp \
qgsmaplayerregistry.moc.cpp \
qgsmapoverviewcanvas.moc.cpp \
qgsmapserverexport.moc.cpp \
qgsmarkerdialog.moc.cpp \
qgsmeasure.moc.cpp \
@ -264,99 +219,83 @@ libqgis_la_MOC = \
qgspastetransformations.moc.cpp \
qgspatterndialog.moc.cpp \
qgspluginmanager.moc.cpp \
qgspointstylewidget.moc.cpp \
qgsprojectproperties.moc.cpp \
qgsrasterdataprovider.moc.cpp \
qgsrasterlayerproperties.moc.cpp \
qgsrunprocess.moc.cpp \
qgsserversourceselect.moc.cpp \
qgssisydialog.moc.cpp \
qgsuvaldialog.moc.cpp \
qgsvectorlayer.moc.cpp \
qgsvectorlayerproperties.moc.cpp \
$(WIDGETPATH)/projectionselector/qgsprojectionselector.moc.cpp
libqgis_la_SOURCES = \
qgisapp.cpp \
qgsacetatelines.cpp \
qgsacetateobject.cpp \
qgsacetaterectangle.cpp \
qgsattributeaction.cpp \
qgsclipper.cpp \
qgscolortable.cpp \
qgscontinuouscolrenderer.cpp \
qgscoordinatetransform.cpp \
qgscustomprojectiondialog.cpp \
qgsdatamanager.cpp \
qgsexception.cpp \
qgsfeature.cpp \
qgsfeatureattribute.cpp \
qgsfield.cpp \
qgsfillstylewidget.cpp \
qgsgeometry.cpp \
qgsgeometryvertexindex.cpp \
qgsgraduatedsymrenderer.cpp \
qgslabel.cpp \
qgslinestylewidget.cpp \
qgsmapcanvas.cpp \
qgsmapoverviewcanvas.cpp \
qgsmaplayer.cpp \
qgsmaplayerregistry.cpp \
qgsmaptopixel.cpp \
qgsmarkercatalogue.cpp \
qgsmarkersymbol.cpp \
qgsnumericsortlistviewitem.cpp \
qgspoint.cpp \
qgspointstylewidget.cpp \
qgsprojectproperty.cpp \
qgsprovidercountcalcevent.cpp \
qgsproviderextentcalcevent.cpp \
qgsproviderregistry.cpp \
qgsrangerenderitem.cpp \
qgsrect.cpp \
qgsrenderer.cpp \
qgsrenderitem.cpp \
qgsrunprocess.cpp \
qgsscalecalculator.cpp \
qgssinglesymrenderer.cpp \
qgsspatialrefsys.cpp \
qgssymbol.cpp \
qgsuniquevalrenderer.cpp \
qgsvectordataprovider.cpp \
qgsvectorfilewriter.cpp \
qgsvectorlayer.cpp \
qgisiface.cpp \
qgisinterface.cpp \
qgsabout.cpp \
qgsacetatelines.cpp \
qgsacetateobject.cpp \
qgsacetaterectangle.cpp \
qgsaddattrdialog.cpp \
qgsadvancedattrsearch.cpp \
qgsattributeaction.cpp \
qgsattributeactiondialog.cpp \
qgsattributedialog.cpp \
qgsattributetable.cpp \
qgsattributetabledisplay.cpp \
qgsbookmarks.cpp \
qgsbookmarkitem.cpp \
qgsbookmarks.cpp \
qgsclipboard.cpp \
qgsclipper.cpp \
qgscolortable.cpp \
qgscontcoldialog.cpp \
qgscontexthelp.cpp \
qgscontinuouscolrenderer.cpp \
qgscoordinatetransform.cpp \
qgscustomprojectiondialog.cpp \
qgscustomsymbol.cpp \
qgsdatamanager.cpp \
qgsdatasource.cpp \
qgsdelattrdialog.cpp \
qgsdistancearea.cpp \
qgsvectorlayerproperties.cpp \
qgsencodingfiledialog.cpp \
qgsexception.cpp \
qgsfeatureattribute.cpp \
qgsfeature.cpp \
qgsfield.cpp \
qgsfile.cpp \
qgsfillstylewidget.cpp \
qgsgeometry.cpp \
qgsgeometryvertexindex.cpp \
qgsgeomtypedialog.cpp \
qgsgraduatedsymrenderer.cpp \
qgsgrasydialog.cpp \
qgshelpviewer.cpp \
qgsidentifyresults.cpp \
qgslabelattributes.cpp \
qgslabel.cpp \
qgslabeldialog.cpp \
qgslayerprojectionselector.cpp \
qgsline.cpp \
qgslinestyledialog.cpp \
qgslinestylewidget.cpp \
qgslinesymbol.cpp \
qgsludialog.cpp \
qgsmapcanvas.cpp \
qgsmaplayer.cpp \
qgsmaplayerregistry.cpp \
qgsmapoverviewcanvas.cpp \
qgsmapserverexport.cpp \
qgsmaptopixel.cpp \
qgsmarkercatalogue.cpp \
qgsmarkerdialog.cpp \
qgsmarkersymbol.cpp \
qgsmeasure.cpp \
qgsnewhttpconnection.cpp \
qgsnumericsortlistviewitem.cpp \
qgsoptions.cpp \
qgspastetransformations.cpp \
qgspatterndialog.cpp \
@ -364,32 +303,69 @@ libqgis_la_SOURCES = \
qgspluginmanager.cpp \
qgspluginmetadata.cpp \
qgspluginregistry.cpp \
qgspoint.cpp \
qgspointstylewidget.cpp \
qgspolygonsymbol.cpp \
qgsproject.cpp \
qgsprojectproperties.cpp \
qgsprojectproperty.cpp \
qgsprovidercountcalcevent.cpp \
qgsproviderextentcalcevent.cpp \
qgsprovidermetadata.cpp \
qgsproviderregistry.cpp \
qgsrangerenderitem.cpp \
qgsrasterdataprovider.cpp \
qgsrasterlayerproperties.cpp \
qgsrect.cpp \
qgsrenderer.cpp \
qgsrenderitem.cpp \
qgsrunprocess.cpp \
qgsscalecalculator.cpp \
qgssearchstring.cpp \
qgssearchtreenode.cpp \
qgssearchstringlexer.ll \
qgssearchstringparser.yy \
qgssearchtreenode.cpp \
qgsserversourceselect.cpp \
qgssinglesymrenderer.cpp \
qgssisydialog.cpp \
qgsspatialrefsys.cpp \
qgssvgcache.cpp \
qgssymbol.cpp \
qgssymbologyutils.cpp \
qgsuniquevalrenderer.cpp \
qgsuvaldialog.cpp \
qgsvectordataprovider.cpp \
qgsvectorfilewriter.cpp \
qgsvectorlayer.cpp \
qgsvectorlayerproperties.cpp \
$(WIDGETPATH)/projectionselector/qgsprojectionselector.cpp
if HAVE_POSTGRESQL
libqgis_la_SOURCES += $(postgresLIBSOURCES)
postgresHEADERS = qgsdbsourceselect.h \
qgsnewconnection.h \
qgspgquerybuilder.h
postgresSOURCES = qgsdbsourceselect.cpp \
qgsnewconnection.cpp \
qgspgquerybuilder.cpp
postgresMOC = qgsdbsourceselect.moc.cpp \
qgsnewconnection.moc.cpp \
qgspgquerybuilder.moc.cpp
postgresLIBHEADERS = qgspgutil.h
postgresLIBSOURCES = qgspgutil.cpp
libqgis_la_SOURCES += $(postgresSOURCES) $(postgresLIBSOURCES) $(postgresMOC)
endif
AM_YFLAGS = -d
qgis_YACC = qgssearchstringparser.h
nodist_libqgis_la_SOURCES = $(libqgis_la_MOC) $(libqgis_la_UISOURCES) $(libqgis_la_UIMOC)
## BUILT_SOURCES += $(libqgis_la_MOC) $(libqgis_la_UIMOC) $(libqgis_la_UIHEADERS) $(libqgis_la_UISOURCES)
BUILT_SOURCES += $(libqgis_la_MOC) $(libqgis_la_UIHEADERS)
nodist_libqgis_la_SOURCES = $(libqgis_la_MOC)
BUILT_SOURCES = $(libqgis_la_MOC) $(qgis_YACC)
libqgis_la_LIBADD = raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
@ -398,30 +374,23 @@ libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
libqgis_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/
## for installing headers in $(includedir)/qgis
pkginclude_HEADERS = $(qgisHEADERS) \
$(qgis_UIH) \
$(postgresHEADERS) \
$(postgresUIH) \
$(postgresLIBHEADERS) \
$(libqgisHEADERS) \
$(libqgis_la_UIH)
nodist_pkginclude_HEADERS = $(qgis_UIHEADERS) \
$(libqgis_la_UIHEADERS)
pkginclude_HEADERS = $(qgisHEADERS)
pkginclude_dir = $(includedir)/qgis
CLEANFILES = $(BUILT_SOURCES)
EXTRA_DIST = $(postgresSOURCES) \
$(postgresUIC) \
$(postgresLIBSOURCES) \
$(qgis_UIC) \
$(libqgis_la_UIC) \
xpm/*.png \
xpm/*.xpm \
xpm/16x16/mapserver.xpm \
xpm/16x16/camera.png
EXTRA_DIST=
if HAVE_POSTGRESQL
EXTRA_DIST += $(postgresSOURCES) \
$(postgresLIBSOURCES)
pkginclude_HEADERS += $(postgresHEADERS) \
$(postgresLIBHEADERS) \
$(libqgisHEADERS)
endif
noinst_HEADERS = qgsdatasourceuri.h