Skip to content

Commit 0c0a5d3

Browse files
author
timlinux
committedJan 8, 2006
lib refactoring
git-svn-id: http://svn.osgeo.org/qgis/trunk@4505 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
ltr-3_40Before-merge-new_vector_api
1 parent 46fe360 commit 0c0a5d3

File tree

1 file changed

+23
-125
lines changed

1 file changed

+23
-125
lines changed
 

‎src/Makefile.am

Lines changed: 23 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if HAVE_QTMAC
1717
MAC = mac
1818
endif
1919

20-
SUBDIRS = ui legend raster composer widgets $(MAC)
20+
SUBDIRS = core ui legend raster composer widgets $(MAC)
2121

2222
if !HAVE_QTMAC
2323
PREFIX=-DPREFIX=\"$(prefix)\"
@@ -42,7 +42,7 @@ else
4242
bin_PROGRAMS = qgis
4343
endif
4444

45-
lib_LTLIBRARIES = libqgis.la
45+
lib_LTLIBRARIES = libqgis_gui.la
4646

4747

4848
##
@@ -53,135 +53,86 @@ lib_LTLIBRARIES = libqgis.la
5353

5454
qgis_SOURCES = main.cpp
5555

56-
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
56+
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
5757
if HAVE_QTMAC
5858
qgis_LDFLAGS = -framework ApplicationServices
5959
else
6060
qgis_LDFLAGS = -rdynamic
6161
endif
62-
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/
62+
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/
63+
6364

6465
##
6566
## ----------------------------------------------------------------------
66-
## libqgis stuff starts here
67+
## libqgis_gui-gui stuff starts here
6768
## ----------------------------------------------------------------------
6869
##
6970

70-
libqgisHEADERS = \
71+
libqgis_guiHEADERS = \
7172
qgisapp.h \
7273
qgis.h \
7374
qgisiface.h \
74-
qgisinterface.h \
75+
qgisinterface.h \
7576
qgsabout.h \
76-
qgsacetatelines.h \
77-
qgsacetateobject.h \
78-
qgsacetaterectangle.h \
7977
qgsaddattrdialog.h \
8078
qgsadvancedattrsearch.h \
81-
qgsapplication.h \
8279
qgsattributeactiondialog.h \
83-
qgsattributeaction.h \
8480
qgsattributedialog.h \
8581
qgsattributetabledisplay.h \
8682
qgsattributetable.h \
87-
qgsbookmarkitem.h \
8883
qgsbookmarks.h \
89-
qgsclipboard.h \
90-
qgsclipper.h \
91-
qgscolortable.h \
9284
qgscontcoldialog.h \
93-
qgscontexthelp.h \
9485
qgscontinuouscolrenderer.h \
95-
qgscoordinatetransform.h \
9686
qgscsexception.h \
9787
qgscustomprojectiondialog.h \
98-
qgscustomsymbol.h \
99-
qgsdatamanager.h \
100-
qgsdataprovider.h \
101-
qgsdatasource.h \
10288
qgsdatasourceuri.h \
10389
qgsdelattrdialog.h \
104-
qgsdistancearea.h \
10590
qgsencodingfiledialog.h \
106-
qgsexception.h \
107-
qgsfeatureattribute.h \
10891
qgsfeature.h \
109-
qgsfield.h \
110-
qgsfile.h \
11192
qgsfillstylewidget.h \
112-
qgsgeometry.h \
113-
qgsgeometryvertexindex.h \
11493
qgsgeomtypedialog.h \
11594
qgsgraduatedsymrenderer.h \
11695
qgsgrasydialog.h \
11796
qgshelpviewer.h \
11897
qgsidentifyresults.h \
119-
qgslabelattributes.h \
12098
qgslabeldialog.h \
12199
qgslabel.h \
122100
qgslayerprojectionselector.h \
123-
qgsline.h \
124101
qgslinestyledialog.h \
125-
qgslinesymbol.h \
126102
qgsludialog.h \
127103
qgsmapcanvas.h \
128104
qgsmaplayer.h \
129105
qgsmaplayerinterface.h \
130106
qgsmaplayerregistry.h \
131107
qgsmapoverviewcanvas.h \
132108
qgsmapserverexport.h \
133-
qgsmaptopixel.h \
134-
qgsmarkercatalogue.h \
135109
qgsmarkerdialog.h \
136-
qgsmarkersymbol.h \
137110
qgsmeasure.h \
138111
qgsmessageviewer.h \
139112
qgsnewhttpconnection.h \
140-
qgsnumericsortlistviewitem.h \
141113
qgsoptions.h \
142114
qgspastetransformations.h \
143115
qgspatterndialog.h \
144-
qgspluginitem.h \
145116
qgspluginmanager.h \
146117
qgspluginmetadata.h \
147-
qgspluginregistry.h \
148-
qgspoint.h \
149118
qgspointstylewidget.h \
150-
qgspolygonsymbol.h \
151119
qgsproject.h \
152120
qgsprojectproperties.h \
153-
qgsprojectproperty.h \
154-
qgsprovidercountcalcevent.h \
155-
qgsproviderextentcalcevent.h \
156-
qgsprovidermetadata.h \
157-
qgsproviderregistry.h \
158121
qgsrangerenderitem.h \
159-
qgsrasterdataprovider.h \
160122
qgsrasterlayerproperties.h \
161-
qgsrect.h \
162-
qgsrenderer.h \
163-
qgsrenderitem.h \
164123
qgsrunprocess.h \
165-
qgsscalecalculator.h \
166-
qgssearchstring.h \
167-
qgssearchtreenode.h \
168124
qgsserversourceselect.h \
169-
qgssinglesymrenderer.h \
170125
qgssisydialog.h \
171126
qgsspatialrefsys.h \
172-
qgssvgcache.h \
173-
qgssymbol.h \
174-
qgssymbologyutils.h \
175127
qgsuniquevalrenderer.h \
176128
qgsuvaldialog.h \
177-
qgsvectordataprovider.h \
178129
qgsvectorfilewriter.h \
179130
qgsvectorlayerproperties.h
180131

181132
## files generated from MOC
182-
libqgis_la_MOC = \
133+
libqgis_gui_la_MOC = \
183134
qgisapp.moc.cpp \
184-
qgisinterface.moc.cpp \
135+
qgisinterface.moc.cpp \
185136
qgsabout.moc.cpp \
186137
qgsaddattrdialog.moc.cpp \
187138
qgsadvancedattrsearch.moc.cpp \
@@ -191,10 +142,7 @@ libqgis_la_MOC = \
191142
qgsattributetable.moc.cpp \
192143
qgsbookmarks.moc.cpp \
193144
qgscontcoldialog.moc.cpp \
194-
qgscontexthelp.moc.cpp \
195-
qgscoordinatetransform.moc.cpp \
196145
qgscustomprojectiondialog.moc.cpp \
197-
qgsdataprovider.moc.cpp \
198146
qgsdelattrdialog.moc.cpp \
199147
qgsencodingfiledialog.moc.cpp \
200148
qgsfillstylewidget.moc.cpp \
@@ -222,7 +170,6 @@ libqgis_la_MOC = \
222170
qgspluginmanager.moc.cpp \
223171
qgspointstylewidget.moc.cpp \
224172
qgsprojectproperties.moc.cpp \
225-
qgsrasterdataprovider.moc.cpp \
226173
qgsrasterlayerproperties.moc.cpp \
227174
qgsrunprocess.moc.cpp \
228175
qgsserversourceselect.moc.cpp \
@@ -231,112 +178,61 @@ libqgis_la_MOC = \
231178
qgsvectorlayer.moc.cpp \
232179
qgsvectorlayerproperties.moc.cpp
233180

234-
libqgis_la_SOURCES = \
181+
libqgis_gui_la_SOURCES = \
235182
qgisapp.cpp \
236183
qgisiface.cpp \
237-
qgisinterface.cpp \
184+
qgisinterface.cpp \
238185
qgsabout.cpp \
239-
qgsacetatelines.cpp \
240-
qgsacetateobject.cpp \
241-
qgsacetaterectangle.cpp \
242186
qgsaddattrdialog.cpp \
243187
qgsadvancedattrsearch.cpp \
244-
qgsapplication.cpp \
245-
qgsattributeaction.cpp \
246188
qgsattributeactiondialog.cpp \
247189
qgsattributedialog.cpp \
248190
qgsattributetable.cpp \
249191
qgsattributetabledisplay.cpp \
250-
qgsbookmarkitem.cpp \
251192
qgsbookmarks.cpp \
252-
qgsclipboard.cpp \
253-
qgsclipper.cpp \
254-
qgscolortable.cpp \
255193
qgscontcoldialog.cpp \
256-
qgscontexthelp.cpp \
257194
qgscontinuouscolrenderer.cpp \
258-
qgscoordinatetransform.cpp \
259195
qgscustomprojectiondialog.cpp \
260-
qgscustomsymbol.cpp \
261-
qgsdatamanager.cpp \
262-
qgsdatasource.cpp \
263196
qgsdelattrdialog.cpp \
264-
qgsdistancearea.cpp \
265197
qgsencodingfiledialog.cpp \
266-
qgsexception.cpp \
267-
qgsfeatureattribute.cpp \
268198
qgsfeature.cpp \
269-
qgsfield.cpp \
270-
qgsfile.cpp \
271199
qgsfillstylewidget.cpp \
272-
qgsgeometry.cpp \
273-
qgsgeometryvertexindex.cpp \
274200
qgsgeomtypedialog.cpp \
275201
qgsgraduatedsymrenderer.cpp \
276202
qgsgrasydialog.cpp \
277203
qgshelpviewer.cpp \
278204
qgsidentifyresults.cpp \
279-
qgslabelattributes.cpp \
280205
qgslabel.cpp \
281206
qgslabeldialog.cpp \
282207
qgslayerprojectionselector.cpp \
283-
qgsline.cpp \
284208
qgslinestyledialog.cpp \
285209
qgslinestylewidget.cpp \
286-
qgslinesymbol.cpp \
287210
qgsludialog.cpp \
288211
qgsmapcanvas.cpp \
289212
qgsmaplayer.cpp \
290213
qgsmaplayerregistry.cpp \
291214
qgsmapoverviewcanvas.cpp \
292215
qgsmapserverexport.cpp \
293-
qgsmaptopixel.cpp \
294-
qgsmarkercatalogue.cpp \
295216
qgsmarkerdialog.cpp \
296-
qgsmarkersymbol.cpp \
297217
qgsmeasure.cpp \
298218
qgsmessageviewer.cpp \
299219
qgsnewhttpconnection.cpp \
300-
qgsnumericsortlistviewitem.cpp \
301220
qgsoptions.cpp \
302221
qgspastetransformations.cpp \
303222
qgspatterndialog.cpp \
304-
qgspluginitem.cpp \
305223
qgspluginmanager.cpp \
306224
qgspluginmetadata.cpp \
307-
qgspluginregistry.cpp \
308-
qgspoint.cpp \
309225
qgspointstylewidget.cpp \
310-
qgspolygonsymbol.cpp \
311226
qgsproject.cpp \
312227
qgsprojectproperties.cpp \
313-
qgsprojectproperty.cpp \
314-
qgsprovidercountcalcevent.cpp \
315-
qgsproviderextentcalcevent.cpp \
316-
qgsprovidermetadata.cpp \
317-
qgsproviderregistry.cpp \
318-
qgsrangerenderitem.cpp \
319-
qgsrasterdataprovider.cpp \
320228
qgsrasterlayerproperties.cpp \
321-
qgsrect.cpp \
322-
qgsrenderer.cpp \
323-
qgsrenderitem.cpp \
324229
qgsrunprocess.cpp \
325-
qgsscalecalculator.cpp \
326-
qgssearchstring.cpp \
327-
qgssearchstringlexer.ll \
328-
qgssearchstringparser.yy \
329-
qgssearchtreenode.cpp \
330230
qgsserversourceselect.cpp \
331231
qgssinglesymrenderer.cpp \
332232
qgssisydialog.cpp \
333233
qgsspatialrefsys.cpp \
334-
qgssvgcache.cpp \
335-
qgssymbol.cpp \
336-
qgssymbologyutils.cpp \
337234
qgsuniquevalrenderer.cpp \
338235
qgsuvaldialog.cpp \
339-
qgsvectordataprovider.cpp \
340236
qgsvectorfilewriter.cpp \
341237
qgsvectorlayer.cpp \
342238
qgsvectorlayerproperties.cpp
@@ -357,24 +253,26 @@ postgresMOC = qgsdbsourceselect.moc.cpp \
357253
postgresLIBHEADERS = qgspgutil.h
358254
postgresLIBSOURCES = qgspgutil.cpp
359255

360-
libqgis_la_SOURCES += $(postgresSOURCES) $(postgresLIBSOURCES) $(postgresMOC)
256+
libqgis_gui_la_SOURCES += $(postgresSOURCES) $(postgresLIBSOURCES) $(postgresMOC)
361257
endif
362258

363259
AM_YFLAGS = -d
364-
qgis_YACC = qgssearchstringparser.h
365-
366260

367-
nodist_libqgis_la_SOURCES = $(libqgis_la_MOC)
261+
nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC)
368262

369-
BUILT_SOURCES = $(libqgis_la_MOC) $(qgis_YACC) $(postgresMOC)
263+
BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC) $(postgresMOC)
370264

371265

372-
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
373-
libqgis_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
266+
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
267+
libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
374268

375-
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/
269+
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/
376270

377-
## for installing headers in $(includedir)/qgis
271+
##
272+
## ----------------------------------------------------------------------
273+
## additional files that need to be installed go here
274+
## ----------------------------------------------------------------------
275+
##
378276
pkginclude_HEADERS = $(qgisHEADERS)
379277

380278
pkginclude_dir = $(includedir)/qgis

0 commit comments

Comments
 (0)
Please sign in to comment.