Skip to content
Permalink
Browse files
Corrected the automake stuff in the wfs provider. Note that wfs does …
…not get built without hacking plugins/Makefile.am and providers/Makefile.am to not disturb the build process of the 'stable' qgis version

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@5757 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
mhugent committed Sep 3, 2006
1 parent 07a3d8a commit 37cff7e7c61cec654929518f2764db366197f718
Showing with 15 additions and 9 deletions.
  1. +6 −2 src/core/qgsproviderregistry.cpp
  2. +3 −1 src/plugins/wfs/Makefile.am
  3. +6 −6 src/providers/wfs/Makefile.am
@@ -114,11 +114,15 @@ QgsProviderRegistry::QgsProviderRegistry(QString pluginPath)
// get the description and the key for the provider plugin
isprovider_t *isProvider = (isprovider_t *) myLib->resolve("isProvider");

if (isProvider)
//MH: Added a further test to detect non-provider plugins linked to provider plugins.
//Only pure provider plugins have 'type' not defined
isprovider_t *hasType = (isprovider_t *) myLib->resolve("type");

if (!hasType && isProvider)
{
// check to see if this is a provider plugin
if (isProvider())
{
{
// looks like a provider. get the key and description
description_t *pDesc = (description_t *) myLib->resolve("description");
providerkey_t *pKey = (providerkey_t *) myLib->resolve("providerKey");
@@ -59,7 +59,9 @@ BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
wfsplugin_la_LIBADD = $(QT_LDADD) \
$(GDAL_LDADD) \
../../core/libqgis_core.la \
../../gui/libqgis_gui.la
../../gui/libqgis_gui.la \
../../providers/wfs/libwfsprovider.la

wfsplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \
$(EXTRA_CXXFLAGS) \
@@ -3,17 +3,17 @@ INCLUDES = -I../../core/ -I../../gui/ -I../../ui
%.moc.cpp: %.h
$(MOC) -o $@ $<

wfsprovider_MOC = qgshttptransaction.moc.cpp
libwfsprovider_MOC = qgshttptransaction.moc.cpp

plugindir = ${pkglibdir}
plugin_LTLIBRARIES = wfsprovider.la
plugin_LTLIBRARIES = libwfsprovider.la

wfsprovider_la_SOURCES = qgswfsprovider.cpp
libwfsprovider_la_SOURCES = qgswfsprovider.cpp qgshttptransaction.cpp $(libwfsprovider_MOC)

BUILT_SOURCES = $(wfsprovider_MOC)

wfsprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB) $(GEOS_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la
wfsprovider_la_LDFLAGS = -avoid-version -module
wfsprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS)
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)

CLEANFILES = $(BUILT_SOURCES)

0 comments on commit 37cff7e

Please sign in to comment.