Skip to content

Commit

Permalink
lib refactoring
Browse files Browse the repository at this point in the history 
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4505 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Jan 8, 2006
1 parent e9a20b8 commit efaef38
Showing 1 changed file with 23 additions and 125 deletions.
148 changes: 23 additions & 125 deletions src/Makefile.am
View file
Expand Up @@ -17,7 +17,7 @@ if HAVE_QTMAC
MAC = mac
endif

SUBDIRS = ui legend raster composer widgets $(MAC)
SUBDIRS = core ui legend raster composer widgets $(MAC)

if !HAVE_QTMAC
PREFIX=-DPREFIX=\"$(prefix)\"
Expand All @@ -42,7 +42,7 @@ else
bin_PROGRAMS = qgis
endif

lib_LTLIBRARIES = libqgis.la
lib_LTLIBRARIES = libqgis_gui.la


##
Expand All @@ -53,135 +53,86 @@ lib_LTLIBRARIES = libqgis.la

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
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_gui.la core/libqgis_core.la
if HAVE_QTMAC
qgis_LDFLAGS = -framework ApplicationServices
else
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/
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/ -I./core/


##
## ----------------------------------------------------------------------
## libqgis stuff starts here
## libqgis_gui-gui stuff starts here
## ----------------------------------------------------------------------
##

libqgisHEADERS = \
libqgis_guiHEADERS = \
qgisapp.h \
qgis.h \
qgisiface.h \
qgisinterface.h \
qgisinterface.h \
qgsabout.h \
qgsacetatelines.h \
qgsacetateobject.h \
qgsacetaterectangle.h \
qgsaddattrdialog.h \
qgsadvancedattrsearch.h \
qgsapplication.h \
qgsattributeactiondialog.h \
qgsattributeaction.h \
qgsattributedialog.h \
qgsattributetabledisplay.h \
qgsattributetable.h \
qgsbookmarkitem.h \
qgsbookmarks.h \
qgsclipboard.h \
qgsclipper.h \
qgscolortable.h \
qgscontcoldialog.h \
qgscontexthelp.h \
qgscontinuouscolrenderer.h \
qgscoordinatetransform.h \
qgscsexception.h \
qgscustomprojectiondialog.h \
qgscustomsymbol.h \
qgsdatamanager.h \
qgsdataprovider.h \
qgsdatasource.h \
qgsdatasourceuri.h \
qgsdelattrdialog.h \
qgsdistancearea.h \
qgsencodingfiledialog.h \
qgsexception.h \
qgsfeatureattribute.h \
qgsfeature.h \
qgsfield.h \
qgsfile.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 \
qgsmessageviewer.h \
qgsnewhttpconnection.h \
qgsnumericsortlistviewitem.h \
qgsoptions.h \
qgspastetransformations.h \
qgspatterndialog.h \
qgspluginitem.h \
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 \
qgssymbol.h \
qgssymbologyutils.h \
qgsuniquevalrenderer.h \
qgsuvaldialog.h \
qgsvectordataprovider.h \
qgsvectorfilewriter.h \
qgsvectorlayerproperties.h

## files generated from MOC
libqgis_la_MOC = \
libqgis_gui_la_MOC = \
qgisapp.moc.cpp \
qgisinterface.moc.cpp \
qgisinterface.moc.cpp \
qgsabout.moc.cpp \
qgsaddattrdialog.moc.cpp \
qgsadvancedattrsearch.moc.cpp \
Expand All @@ -191,10 +142,7 @@ libqgis_la_MOC = \
qgsattributetable.moc.cpp \
qgsbookmarks.moc.cpp \
qgscontcoldialog.moc.cpp \
qgscontexthelp.moc.cpp \
qgscoordinatetransform.moc.cpp \
qgscustomprojectiondialog.moc.cpp \
qgsdataprovider.moc.cpp \
qgsdelattrdialog.moc.cpp \
qgsencodingfiledialog.moc.cpp \
qgsfillstylewidget.moc.cpp \
Expand Down Expand Up @@ -222,7 +170,6 @@ libqgis_la_MOC = \
qgspluginmanager.moc.cpp \
qgspointstylewidget.moc.cpp \
qgsprojectproperties.moc.cpp \
qgsrasterdataprovider.moc.cpp \
qgsrasterlayerproperties.moc.cpp \
qgsrunprocess.moc.cpp \
qgsserversourceselect.moc.cpp \
Expand All @@ -231,112 +178,61 @@ libqgis_la_MOC = \
qgsvectorlayer.moc.cpp \
qgsvectorlayerproperties.moc.cpp

libqgis_la_SOURCES = \
libqgis_gui_la_SOURCES = \
qgisapp.cpp \
qgisiface.cpp \
qgisinterface.cpp \
qgisinterface.cpp \
qgsabout.cpp \
qgsacetatelines.cpp \
qgsacetateobject.cpp \
qgsacetaterectangle.cpp \
qgsaddattrdialog.cpp \
qgsadvancedattrsearch.cpp \
qgsapplication.cpp \
qgsattributeaction.cpp \
qgsattributeactiondialog.cpp \
qgsattributedialog.cpp \
qgsattributetable.cpp \
qgsattributetabledisplay.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 \
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 \
qgsmessageviewer.cpp \
qgsnewhttpconnection.cpp \
qgsnumericsortlistviewitem.cpp \
qgsoptions.cpp \
qgspastetransformations.cpp \
qgspatterndialog.cpp \
qgspluginitem.cpp \
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 \
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
Expand All @@ -357,24 +253,26 @@ postgresMOC = qgsdbsourceselect.moc.cpp \
postgresLIBHEADERS = qgspgutil.h
postgresLIBSOURCES = qgspgutil.cpp

libqgis_la_SOURCES += $(postgresSOURCES) $(postgresLIBSOURCES) $(postgresMOC)
libqgis_gui_la_SOURCES += $(postgresSOURCES) $(postgresLIBSOURCES) $(postgresMOC)
endif

AM_YFLAGS = -d
qgis_YACC = qgssearchstringparser.h


nodist_libqgis_la_SOURCES = $(libqgis_la_MOC)
nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC)

BUILT_SOURCES = $(libqgis_la_MOC) $(qgis_YACC) $(postgresMOC)
BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC) $(postgresMOC)


libqgis_la_LIBADD = raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
libqgis_gui_la_LIBADD = core/libqgis_core.la raster/libqgis_raster.la legend/libqgis_legend.la composer/libqgis_composer.la widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
libqgis_gui_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/
libqgis_gui_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/ -I ./core/

## for installing headers in $(includedir)/qgis
##
## ----------------------------------------------------------------------
## additional files that need to be installed go here
## ----------------------------------------------------------------------
##
pkginclude_HEADERS = $(qgisHEADERS)

pkginclude_dir = $(includedir)/qgis
Expand Down

0 comments on commit efaef38

Please sign in to comment.