Skip to content
Permalink
Browse files
** Removed more unused code in the GPS plugin, changed the GPS plugin…
… source

   to follow the coding standards better


git-svn-id: http://svn.osgeo.org/qgis/trunk@2163 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
larsl committed Oct 22, 2004
1 parent ce78512 commit a8098bd359eeafb7847945fca8b4ee050417e135
@@ -3,6 +3,10 @@ ChangeLog,v 1.200 2004/10/21 17:27:35 mcoletti Exp
------------------------------------------------------------------------------
Version 0.6 'Simon' .... development version

2004-10-22 [larsl] 0.5.0devel12
** Removed more unused code in the GPS plugin, changed the GPS plugin source
to follow the coding standards better

2004-10-22 [larsl] 0.5.0devel11
** Some changes in the GPS plugin:
* Changed the tooltip of the action from "GPS Importer" to "GPS Tools"
@@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=5
MICRO_VERSION=0
EXTRA_VERSION=11
EXTRA_VERSION=12
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else
@@ -14,11 +14,8 @@ PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\"

plugindir = ${pkglibdir}

#for plugin so
plugin_LTLIBRARIES = gpsimporterplugin.la

#for standalon executable
#bin_PROGRAMS = gpsimporter

%.moc.cpp: %.h
$(MOC) -o $@ $<
@@ -29,40 +26,35 @@ plugin_LTLIBRARIES = gpsimporterplugin.la
%.cpp: %.ui
$(UIC) -o $@ -impl $*.h $<

##
## For plugin lib
##

gpsimporterplugin_la_SOURCES = plugin.cpp \
waypointtoshape.cpp \
waypointtoshape.h \
utils.c \
shpopen.c \
dbfopen.c \
shapefile.h \
gpsimporterplugin_la_SOURCES = \
qgsgpsplugin.cpp \
qgsbabelformat.h \
qgsbabelformat.cpp \
plugingui.cpp \
qgsgpsplugingui.cpp \
qgsgpsdevicedialog.cpp \
$(plugin_UI)\
$(plugin_MOC)

plugin_MOC = plugin.moc.cpp \
plugingui.moc.cpp \
pluginguibase.moc.cpp \
plugin_MOC = \
qgsgpsplugin.moc.cpp \
qgsgpsplugingui.moc.cpp \
qgsgpspluginguibase.moc.cpp \
qgsgpsdevicedialogbase.moc.cpp \
qgsgpsdevicedialog.moc.cpp

plugin_UI = pluginguibase.h \
pluginguibase.cpp \
plugin_UI = \
qgsgpspluginguibase.h \
qgsgpspluginguibase.cpp \
qgsgpsdevicedialogbase.h \
qgsgpsdevicedialogbase.cpp

plugin_UIC = pluginguibase.ui \
qgsgpsdevicedialogbase.ui
plugin_UIC = \
qgsgpspluginguibase.ui \
qgsgpsdevicedialogbase.ui

# UI dependencies
pluginguibase.cpp: pluginguibase.h pluginguibase.ui
qgsgpspluginguibase.cpp: qgsgpspluginguibase.h qgsgpspluginguibase.ui
qgsgpsdevicedialogbase.cpp: qgsgpsdevicedialogbase.h qgsgpsdevicedialogbase.ui

BUILT_SOURCES = $(plugin_MOC) $(plugin_UI)
@@ -72,41 +64,16 @@ gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../../src
gpsimporterplugin_la_LDFLAGS = -avoid-version -module

##
## For standalone executable
##

#gpsimporter_SOURCES = main.cpp \
# waypointtoshape.cpp \
# waypointtoshape.h \
# utils.c \
# shpopen.c \
# dbfopen.c \
# shapefile.h \
# plugingui.cpp \
# pluginguibase.cpp \
# $(standalone_MOC)

#gpsimporter_LDADD = $(QT_LDADD) $(GDAL_LDADD)
#gpsimporter_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS)
#gpsimporter_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../src

standalone_MOC = plugingui.moc.cpp \
pluginguibase.moc.cpp

standalone_UI = pluginguibase.h \
pluginguibase.cpp

##
## Anything that must go in the tarball gets added here
##

EXTRA_DIST = $(plugin_UIC) icon.xpm \
pluginguibase.h \
pluginguibase.ui.h \
qgsgpspluginguibase.h \
qgsgpspluginguibase.ui.h \
qgsgpsdevicedialogbase.h \
qgsgpsdevicedialogbase.ui.h \
plugingui.h \
plugin.h \
qgsgpsdevicedialog.h \
utils.h
qgsgpsplugingui.h \
qgsgpsplugin.h \
qgsgpsdevicedialog.h

0 comments on commit a8098bd

Please sign in to comment.