diff --git a/Makefile.am b/Makefile.am deleted file mode 100644 index de3ae929ca5..00000000000 --- a/Makefile.am +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -EXTRA_DIST = \ - AUTHORS \ - SPONSORS \ - BUGS \ - ChangeLog \ - COPYING \ - create_qm_files.sh \ - INSTALL \ - $(man1_MANS) \ - NEWS \ - qgis.spec \ - qgsconfig.h.in \ - README \ - TODO \ - update_ts_files.sh - -man1_MANS = qgis.man - -docdatadir = $(datadir)/$(PACKAGE)/doc - -docdata_DATA = AUTHORS SPONSORS - -if WITH_UNITTESTS -TESTS = tests -endif - - -if HAVE_QT4 -SUBDIRS = src doc tools i18n resources images $(TESTS) -endif - -pkginclude_HEADERS = qgsconfig.h - -UIcheck: - @UIS=`find . -name *.ui` && \ - if [ `grep "UI version" $$UIS | sed -e '/3.1/d' -e '/3.3/d' | wc -l` -ne 0 ]; then \ - echo -e "\nWrong UI version:"; \ - grep "UI version" $$UIS | sed -e '/3.1/d' -e '/3.3/d' -e 's/:.*version="\([0-9\.]*\)".*/ is version \1/g'; \ - echo; \ - exit 1; \ - fi - -release: UIcheck distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(AMTAR)$(TAR) chozf $(distdir).tar.gz $(distdir) - rm -f $(distdir)/qgis.spec - sed '/^Source:/s/\.tar\.gz$$/\.tar\.bz2/' qgis.spec \ - > $(distdir)/qgis.spec - BZIP2=$(BZIP2_ENV) $(AMTAR)$(TAR) --bzip2 -chof $(distdir).tar.bz2 $(distdir) - -rm -rf $(distdir) - -BUILT_SOURCES = qgssvnversion.h - -.PHONY : qgssvnversion.h -qgssvnversion.h: - @if [ "$(HAVE_SVNVERSION)" == "yes" ]; then \ - QGSSVNDEF="#define QGSSVNVERSION \"`svnversion .`\""; \ - else \ - QGSSVNDEF="#define QGSSVNVERSION \"unknown\""; \ - fi; \ - if [ "`grep QGSSVNVERSION qgssvnversion.h 2>/dev/null`" != "$$QGSSVNDEF" ]; then \ - echo $$QGSSVNDEF > qgssvnversion.h; \ - fi diff --git a/acinclude.m4 b/acinclude.m4 deleted file mode 100644 index f78058502e3..00000000000 --- a/acinclude.m4 +++ /dev/null @@ -1,830 +0,0 @@ -dnl ------------------------------------------------------------------------ -dnl Detect if this is a 64bit environment -dnl -dnl it sets: -dnl _lib -dnl ------------------------------------------------------------------------ -AC_DEFUN([AQ_CHECK_LIB64], -[ -if test "`echo ${libdir} | sed -e 's#.*lib64.*#64#'`" = "64" ; then - _lib="lib64" -else - _lib="lib" -fi -]) - -dnl ------------------------------------------------------------------------ -dnl Detect GDAL/OGR -dnl -dnl use AQ_CHECK_GDAL to detect GDAL and OGR -dnl it sets: -dnl GDAL_CFLAGS -dnl GDAL_LDADD -dnl ------------------------------------------------------------------------ - -# Check for GDAL and OGR compiler and linker flags - -AC_DEFUN([AQ_CHECK_GDAL], -[ -AC_ARG_WITH([gdal], - AC_HELP_STRING([--with-gdal=path], - [Full path to 'gdal-config' script, e.g. '--with-gdal=/usr/local/bin/gdal-config']), - [ac_gdal_config_path=$withval]) - -if test x"$ac_gdal_config_path" = x ; then - ac_gdal_config_path=`which gdal-config` -fi - -ac_gdal_config_path=`dirname $ac_gdal_config_path 2> /dev/null` -AC_PATH_PROG(GDAL_CONFIG, gdal-config, no, $ac_gdal_config_path) - -if test x${GDAL_CONFIG} = xno ; then - AC_MSG_ERROR([gdal-config not found! Supply it with --with-gdal=PATH]) -else - AC_MSG_CHECKING([for OGR in GDAL]) - if test x`$GDAL_CONFIG --ogr-enabled` = "xno" ; then - AC_MSG_ERROR([GDAL must be compiled with OGR support and currently is not.]) - fi - AC_MSG_RESULT(yes) - AC_MSG_CHECKING([GDAL_CFLAGS]) - GDAL_CFLAGS=`$GDAL_CONFIG --cflags` - AC_MSG_RESULT($GDAL_CFLAGS) - - AC_MSG_CHECKING([GDAL_LDADD]) - GDAL_LDADD=`$GDAL_CONFIG --libs` - AC_MSG_RESULT($GDAL_LDADD) - - ac_gdalogr_version=`$GDAL_CONFIG --version` - ac_gdalogr="yes" -fi - -AC_SUBST(GDAL_CFLAGS) -AC_SUBST(GDAL_LDADD) -]) - -dnl ------------------------------------------------------------------------ -dnl Detect GEOS -dnl -dnl use AQ_CHECK_GEOS to detect GEOS -dnl it sets: -dnl GEOS_CFLAGS -dnl GEOS_LDADD -dnl ------------------------------------------------------------------------ - -# Check for GEOS - -AC_DEFUN([AQ_CHECK_GEOS], -[ -AC_ARG_WITH([geos], - AC_HELP_STRING([--with-geos=path], - [Full path to 'geos-config' script, e.g. '--with-geos=/usr/local/bin/geos-config']), - [ac_geos_config_path=$withval]) - -if test x"$ac_geos_config_path" = x ; then - ac_geos_config_path=`which geos-config` -fi - -ac_geos_config_path=`dirname $ac_geos_config_path 2> /dev/null` -AC_PATH_PROG(GEOS_CONFIG, geos-config, no, $ac_geos_config_path) - -if test x${GEOS_CONFIG} = xno ; then - AC_MSG_ERROR([geos-config not found! Supply it with --with-geos=PATH]) -else - ac_geos_version=`${GEOS_CONFIG} --version` - if test `echo ${ac_geos_version} | sed -e 's#2\.[0-9].*#OK#'` != OK ; then - AC_MSG_ERROR([Geos Version 2.x.x is needed, but you have $ac_geos_version!]) - else - AC_MSG_CHECKING([GEOS_CFLAGS]) - GEOS_CFLAGS=`$GEOS_CONFIG --cflags` - AC_MSG_RESULT($GEOS_CFLAGS) - - AC_MSG_CHECKING([GEOS_LDADD]) - GEOS_LDADD=`$GEOS_CONFIG --libs` - AC_MSG_RESULT($GEOS_LDADD) - - ac_geos="yes" - fi -fi - -AC_SUBST(GEOS_CFLAGS) -AC_SUBST(GEOS_LDADD) -]) - -dnl ------------------------------------------------------------------------ -dnl Detect QT -dnl -dnl use AQ_CHECK_QT to detect QT -dnl it sets: -dnl QT_CXXFLAGS -dnl QT_LDADD -dnl QT_GUILINK -dnl QASSISTANTCLIENT_LDADD -dnl ------------------------------------------------------------------------ - -# Check for Qt compiler flags, linker flags, and binary packages - -AC_DEFUN([AQ_CHECK_QT], -[ -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PATH_X]) - -AC_MSG_CHECKING([QTDIR]) -AC_ARG_WITH([qtdir], [ --with-qtdir=DIR Qt installation directory [default=/usr/local]], QTDIR=$withval) -# Check that QTDIR is defined or that --with-qtdir given -if test x$QTDIR = x ; then - QT_SEARCH=" /usr/lib/qt31 /usr/lib64/qt31 /usr/local/qt31 /usr/lib/qt3 /usr/lib64/qt3 /usr/local/qt3 /usr/lib/qt2 /usr/lib64/qt2 /usr/local/qt2 /usr/lib/qt /usr/lib64/qt /usr/local/qt /usr /usr/local" - for i in $QT_SEARCH; do - if test x$QTDIR = x; then - if test -f $i/include/qt/qglobal.h -o -f $i/include/qglobal.h -o -f $i/include/qt3/qglobal.h; then - QTDIR=$i - fi - fi - done -fi -if test x$QTDIR = x ; then - AC_MSG_ERROR([*** QTDIR must be defined, or --with-qtdir option given]) -fi -AC_MSG_RESULT([$QTDIR]) - -# Change backslashes in QTDIR to forward slashes to prevent escaping -# problems later on in the build process, mainly for Cygwin build -# environment using MSVC as the compiler -# (include/Qt is used on Qt4) -# TODO: Use sed instead of perl -QTDIR=`echo $QTDIR | perl -p -e 's/\\\\/\\//g'` - -# Check for QT includedir - -# Test for the Windows version first because if if QTDIR is mounted via -# smbfs to an actual Windows installation, the /include/Qt is found -# case-insensitively -if test -f $QTDIR/include/Qt/qglobal.h -a -f $QTDIR/src/corelib/global/qglobal.h; then - # Windows: $QTDIR/include/Qt/qglobal.h includes $QTDIR/src/corelib/global/qglobal.h - QTINC=$QTDIR/include - QTVERTEST=$QTDIR/src/corelib/global/ -elif test -f $QTDIR/include/qt/qglobal.h; then - QTINC=$QTDIR/include/qt - QTVERTEST=$QTDIR/include/qt -elif test -f $QTDIR/include/qt4/Qt/qglobal.h; then - QTINC=$QTDIR/include/qt4 - QTVERTEST=$QTDIR/include/qt4/Qt -elif test -f $QTDIR/include/Qt/qglobal.h; then - QTINC=$QTDIR/include - QTVERTEST=$QTDIR/include/Qt -elif test -f $QTDIR/lib/QtCore.framework/Headers/qglobal.h; then - QTINC=$QTDIR/lib/QtCore.framework/Headers - QTVERTEST=$QTDIR/lib/QtCore.framework/Headers -else - QTINC=$QTDIR/include - QTVERTEST=$QTDIR/include -fi - -# Figure out which version of Qt we are using -AC_MSG_CHECKING([Qt version in $QTVERTEST]) -QT_VER=`grep 'define.*QT_VERSION_STR\W' $QTVERTEST/qglobal.h | perl -p -e 's/\D//g'` -case "${QT_VER}" in - 42*) - QT_MAJOR="${QT_VER:0:1}" - QT_MINOR="${QT_VER:1:1}" - case "${host}" in - *-darwin*) - QT4_3SUPPORTINC=$QTDIR/lib/Qt3Support.framework/Headers - QT4_COREINC=$QTDIR/lib/QtCore.framework/Headers - QT4_GUIINC=$QTDIR/lib/QtGui.framework/Headers - QT4_NETWORKINC=$QTDIR/lib/QtNetwork.framework/Headers - QT4_OPENGLINC=$QTDIR/lib/QtOpenGL.framework/Headers - QT4_SQLINC=$QTDIR/lib/QtSql.framework/Headers - QT4_XMLINC=$QTDIR/lib/QtXml.framework/Headers - QT4_SVGINC=$QTDIR/lib/QtSvg.framework/Headers - if test $QT_MINOR -lt "2"; then - QT4_TESTINC=$QTDIR/include/QtTest - QT4_DESIGNERINC=$QTDIR/include/QtDesigner - else - QT4_TESTINC=$QTDIR/lib/QtTest.framework/Headers - QT4_DESIGNERINC=$QTDIR/lib/QtDesigner.framework/Headers - fi - ;; - *) - QT4_3SUPPORTINC=$QTINC/Qt3Support - QT4_COREINC=$QTINC/QtCore - QT4_GUIINC=$QTINC/QtGui - QT4_NETWORKINC=$QTINC/QtNetwork - QT4_OPENGLINC=$QTINC/QtOpenGL - QT4_SQLINC=$QTINC/QtSql - QT4_XMLINC=$QTINC/QtXml - QT4_SVGINC=$QTINC/QtSvg - QT4_TESTINC=$QTINC/QtTest - QT4_DESIGNERINC=$QTINC/QtDesigner - ;; - esac - QT4_DEFAULTINC=$QTDIR/mkspecs/default - ;; - *) - AC_MSG_ERROR([*** Qt version 4.2 or higher is required]) - ;; -esac -AC_MSG_RESULT([$QT_VER ($QT_MAJOR)]) - -if test $QT_MAJOR = "4" ; then - # Hard code things for the moment - - # Check that moc is in path - if test $cross_compiling = "yes" ; then # MinGW - AC_CHECK_PROG(MOC, moc, moc) - if test x$MOC = x ; then - AC_MSG_ERROR([*** moc must be in path]) - fi - # uic is the Qt user interface compiler - AC_CHECK_PROG(UIC, uic, uic) - if test x$UIC = x ; then - AC_MSG_ERROR([*** uic must be in path]) - fi - # check for rcc - AC_CHECK_PROG(RCC, rcc, rcc) - if test x$RCC = x ; then - AC_MSG_ERROR([*** rcc must be in path]) - fi - else - AC_CHECK_PROG(MOC, moc, $QTDIR/bin/moc, , $QTDIR/bin) - if test x$MOC = x ; then - AC_MSG_ERROR([*** moc must be in path]) - fi - # uic is the Qt user interface compiler - AC_CHECK_PROG(UIC, uic, $QTDIR/bin/uic, , $QTDIR/bin) - if test x$UIC = x ; then - AC_MSG_ERROR([*** uic must be in path]) - fi - # check for rcc - AC_CHECK_PROG(RCC, rcc, $QTDIR/bin/rcc, , $QTDIR/bin) - if test x$RCC = x ; then - AC_MSG_ERROR([*** rcc must be in path]) - fi - fi -fi - -# qembed is the Qt data embedding utility. -# It is located in $QTDIR/tools/qembed, and must be compiled and installed -# manually, we'll let it slide if it isn't present -### AC_CHECK_PROG(QEMBED, qembed, qembed) -# Calculate Qt include path -if test $QT_MAJOR = "4" ; then -QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QTINC -I$QT4_SVGINC -I$QT4_TESTINC -I$QT4_DESIGNERINC" -fi -QT_IS_EMBEDDED="no" -# On unix, figure out if we're doing a static or dynamic link - -case "${host}" in - *-cygwin) - AC_DEFINE_UNQUOTED(WIN32, "", Defined if on Win32 platform) - echo "$QTDIR/lib/qt-mt$QT_VER.lib" - if test -f "$QTDIR/lib/qt-mt$QT_VER.lib" ; then - QT_LIB="qt-mt$QT_VER.lib" - QT_IS_STATIC="no" - QT_IS_MT="yes" - - elif test -f "$QTDIR/lib/qt$QT_VER.lib" ; then - QT_LIB="qt$QT_VER.lib" - QT_IS_STATIC="no" - QT_IS_MT="no" - elif test -f "$QTDIR/lib/qt.lib" ; then - QT_LIB="qt.lib" - QT_IS_STATIC="yes" - QT_IS_MT="no" - elif test -f "$QTDIR/lib/qt-mt.lib" ; then - QT_LIB="qt-mt.lib" - QT_IS_STATIC="yes" - QT_IS_MT="yes" - fi - ;; - *-darwin*) - # determin static or dynamic -- prefer dynamic - QT_IS_DYNAMIC=`ls $QTDIR/lib/libqt*.dylib $QTDIR/lib/QtCore.framework/QtCore 2> /dev/null` - if test "x$QT_IS_DYNAMIC" = x; then - QT_IS_STATIC=`ls $QTDIR/lib/libqt*.a 2> /dev/null` - if test "x$QT_IS_STATIC" = x; then - QT_IS_STATIC="no" - AC_MSG_ERROR([*** Couldn't find any Qt libraries in $QTDIR/lib]) - else - QT_IS_STATIC="yes" - fi - else - QT_IS_STATIC="no" - fi - # set link parameters based on shared/mt libs or static lib - if test "x`ls $QTDIR/lib/libqt.a* 2> /dev/null`" != x ; then - QT_LIB="-lqt" - QT_IS_MT="no" - elif test "x`ls $QTDIR/lib/libqt-mt.*.dylib 2> /dev/null`" != x ; then - QT_LIB="-lqt-mt" - QT_IS_MT="yes" - elif test "x`ls $QTDIR/lib/libqt.*.dylib 2> /dev/null`" != x ; then - QT_LIB="-lqt" - QT_IS_MT="no" - elif test "x`ls $QTDIR/lib/libqte.* 2> /dev/null`" != x ; then - QT_LIB="-lqte" - QT_IS_MT="no" - QT_IS_EMBEDDED="yes" - elif test "x`ls $QTDIR/lib/libqte-mt.* 2> /dev/null`" != x ; then - QT_LIB="-lqte-mt" - QT_IS_MT="yes" - QT_IS_EMBEDDED="yes" - elif test "x`ls $QTDIR/lib/QtCore.framework/QtCore 2> /dev/null`" != x ; then - QT_LIB="-Xlinker -F$QTDIR/lib -framework Qt3Support -framework QtCore -framework QtGui -framework QtNetwork -framework QtXml -framework QtSvg" - if test $QT_MINOR -lt "2"; then - QT_LIB="$QT_LIB -L$QTDIR/lib -lQtDesigner -lQtTest" - else - QT_LIB="$QT_LIB -framework QtDesigner -framework QtTest" - fi - QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_SVGINC -I$QT4_XMLINC -I$QT4_DESIGNERINC -I$QT4_TESTINC -I$QTDIR/include" - QT_IS_MT="yes" - fi - ;; - *) - # determin static or dynamic -- prefer dynamic - QT_IS_DYNAMIC=`ls $QTDIR/${_lib}/libqt*.so $QTDIR/${_lib}/libQtCore.so /usr/lib/libQtCore.so 2> /dev/null` - if test "x$QT_IS_DYNAMIC" = x; then - QT_IS_STATIC=`ls $QTDIR/${_lib}/libqt*.a $QTDIR/${_lib}/libQtCore.a 2> /dev/null` - if test "x$QT_IS_STATIC" = x; then - QT_IS_STATIC="no" - AC_MSG_ERROR([*** Couldn't find any Qt libraries in $QTDIR/${_lib}]) - else - QT_IS_STATIC="yes" - fi - else - QT_IS_STATIC="no" - fi - if test "x`ls $QTDIR/${_lib}/libQtCore.* /usr/lib/libQtCore.* 2> /dev/null`" != x ; then -AC_MSG_RESULT([libQtCore found]) - QT_LIB="-lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtSvg" -QT_CXXFLAGS="-DQT3_SUPPORT -I$QT4_DEFAULTINC -I$QT4_3SUPPORTINC -I$QT4_COREINC -I$QT4_DESIGNERINC -I$QT4_GUIINC -I$QT4_NETWORKINC -I$QT4_OPENGLINC -I$QT4_SQLINC -I$QT4_XMLINC -I$QTINC -I$QT4_SVGINC -I$QT4_TESTINC -I$QT4_DESIGNERINC" - QT_IS_MT="yes" - fi - ;; -esac - -AC_MSG_CHECKING([if Qt is static]) -AC_MSG_RESULT([$QT_IS_STATIC]) -AC_MSG_CHECKING([if Qt is multithreaded]) -AC_MSG_RESULT([$QT_IS_MT]) -AC_MSG_CHECKING([if Qt is embedded]) -AC_MSG_RESULT([$QT_IS_EMBEDDED]) - -QT_GUILINK="" -QASSISTANTCLIENT_LDADD="-lqassistantclient" -case "${host}" in - *-mingw*) - QT_LIBS="-lQtCore4 -lQt3Support4 -lQtGui4 -lQtNetwork4 -lQtXml4 -lQtSvg4 -lQtTest4 -lQtDesigner4" - ;; - *irix*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" - fi - ;; - - *linux*) - QT_LIBS="$QT_LIB -lQtCore -lQt3Support -lQtGui -lQtNetwork -lQtXml -lQtSvg -lQtTest -lQtDesigner" - if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" - fi - ;; - - *netbsd*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lpthread" - else - QT_LIBS="$QT_LIBS -lpthread" - fi - ;; - - *freebsd*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lpthread" - else - QT_LIBS="$QT_LIBS -lpthread" - fi - ;; - - *netbsd*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg -lpthread" - else - QT_LIBS="$QT_LIBS -lpthread" - fi - ;; - - *darwin*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg" - fi - ;; - - *osf*) - # Digital Unix (aka DGUX aka Tru64) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE" - fi - ;; - - *solaris*) - QT_LIBS="$QT_LIB" - if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -lresolv -lsocket -lnsl" - fi - ;; - - *win*) - # linker flag to suppress console when linking a GUI app on Win32 - QT_GUILINK="/subsystem:windows" - if test $QT_MAJOR = "4" ; then - if test $QT_IS_MT = yes ; then - QT_LIBS="/nodefaultlib:libcmt" - else - QT_LIBS="/nodefaultlib:libc" - fi - fi - - if test $QT_IS_STATIC = yes ; then - QT_LIBS="$QT_LIBS $QT_LIB kernel32.lib user32.lib gdi32.lib comdlg32.lib ole32.lib shell32.lib imm32.lib advapi32.lib wsock32.lib winspool.lib winmm.lib netapi32.lib" - else - QT_LIBS="$QT_LIBS $QT_LIB" - fi - QASSISTANTCLIENT_LDADD="qassistantclient.lib" - ;; -esac - -if test x"$QT_IS_EMBEDDED" = "xyes" ; then - QT_CXXFLAGS="-DQWS $QT_CXXFLAGS" -fi - -if test x"$QT_IS_MT" = "xyes" ; then - QT_CXXFLAGS="$QT_CXXFLAGS -D_REENTRANT -DQT_THREAD_SUPPORT" -fi - -case "${host}" in - *-mingw*) - QT_LDADD="-L$QTDIR/${_lib} $QT_LIBS" - ;; - *) - QT_LDADD="-L$QTDIR/${_lib} $QT_LIBS" - ;; -esac - -if test x$QT_IS_STATIC = xyes ; then - OLDLIBS="$LIBS" - LIBS="$QT_LDADD" - AC_CHECK_LIB(Xft, XftFontOpen, QT_LDADD="$QT_LDADD -lXft") - LIBS="$LIBS" -fi - -AC_MSG_CHECKING([QT_CXXFLAGS]) -AC_MSG_RESULT([$QT_CXXFLAGS]) -AC_MSG_CHECKING([QT_LDADD]) -AC_MSG_RESULT([$QT_LDADD]) - -AC_SUBST(QT_CXXFLAGS) -AC_SUBST(QT_LDADD) -AC_SUBST(QT_GUILINK) -AC_SUBST(QASSISTANTCLIENT_LDADD) -AC_SUBST(QTDIR) -]) - - -dnl ------------------------------------------------------------------------ -dnl -dnl improved Qt4 check -dnl - uses pkgconfig by default -dnl - can be overridden by -with-qtdir=.... -dnl -dnl ------------------------------------------------------------------------ - -AC_DEFUN([AQ_CHECK_QT4],[ - - AC_ARG_WITH([qtdir], AC_HELP_STRING([--with-qtdir=DIR],[Qt4 installation directory]), - QTDIR="$withval", QTDIR="") - AC_ARG_WITH([qt-pkg-config], AC_HELP_STRING([--with-qt-pkg-config], - [Detect Qt4 directory using pkg-config instead of using --with-qtdir. Works only with Qt4 version for X11.]), - QT_PKG_CONFIG="y", QT_PKG_CONFIG="n") - - if test "$QT_PKG_CONFIG" = "y" ; then - - dnl --------------------------------------------------------------------------- - dnl we will use PKGCONFIG, check that all needed Qt4 components are there - dnl --------------------------------------------------------------------------- - - QT_MIN_VER=4.1.0 - -dnl PKG_CHECK_MODULES(QT, QtCore QtGui Qt3Support QtNetwork QtXml QtSvg QtTest >= $QT_MIN_VER) - - dnl check for Qt binaries needed for compilation: moc,uic,rcc - dnl (we could also check for moc and uic versions) - - AC_CHECK_PROG(MOC, moc, moc) - if test x$MOC = x ; then - AC_MSG_ERROR([*** moc must be in path]) - fi - AC_CHECK_PROG(UIC, uic, uic) - if test x$UIC = x ; then - AC_MSG_ERROR([*** uic must be in path]) - fi - AC_CHECK_PROG(RCC, rcc, rcc) - if test x$RCC = x ; then - AC_MSG_ERROR([*** rcc must be in path]) - fi - - dnl workaround for case when QtTest doesn't report QtTest subdirectory - dnl in include path (this is not a very nice check) -dnl PKG_CHECK_MODULES(QT_TEST, QtTest >= $QT_MIN_VER) - QT_TEST_CFLAGS=`echo $QT_TEST_CFLAGS | sed 's/[ \t]*$//'` # remove trailing spaces - QTTEST_HAS_SUBDIR=`echo $QT_TEST_CFLAGS | grep '/QtTest' | wc -l` - if test "$QTTEST_HAS_SUBDIR" -eq "0" ; then - QT_CFLAGS="$QT_CFLAGS $QT_TEST_CFLAGS/QtTest" - fi - - dnl set and display variables - - QT_CXXFLAGS="-DQT3_SUPPORT $QT_CFLAGS" - AC_MSG_CHECKING([QT_CXXFLAGS]) - AC_MSG_RESULT([$QT_CXXFLAGS]) - AC_SUBST([$QT_CXXFLAGS]) - - QT_LDADD="$QT_LIBS" - AC_MSG_CHECKING([QT_LDADD]) - AC_MSG_RESULT([$QT_LDADD]) - AC_SUBST([$QT_LDADD]) - - QTDIR="no_qtdir" - AC_SUBST([$QTDIR]) - - QT_MAJOR=4 - - else - - dnl --------------------------------------------------------------------------- - dnl let's use old code for detection - dnl it needs cleanups since there is still Qt3 detection stuff - dnl --------------------------------------------------------------------------- - AQ_CHECK_QT - - dnl --------------------------------------------------------------------------- - dnl Qt/Mac check (install everything into application bundle) - dnl --------------------------------------------------------------------------- - if test x$QTDIR != x -a -f "$QTDIR/mkspecs/default/Info.plist.app"; then - have_qtmac=yes - bundle_suffix=$PACKAGE.app/Contents/MacOS - if test `expr "$prefix" : ".*$bundle_suffix$"` -eq 0; then - prefix="$prefix/$bundle_suffix" - fi - fi - - fi - - dnl do we still need this? [MD] - dnl Assume for the moment that Qt4 installations will still compile against uic3 - dnl AM_CONDITIONAL([NO_UIC_IMPLEMENTATIONS], [test "$QT_MAJOR" = "4"]) - AM_CONDITIONAL([NO_UIC_IMPLEMENTATIONS], [test "$QT_MAJOR" = "0"]) - AM_CONDITIONAL([HAVE_QT4], [test "$QT_MAJOR" = "4"]) - - AM_CONDITIONAL([HAVE_QTMAC], [test "$have_qtmac" = "yes"]) -]) - - -# Configure path for the GNU Scientific Library -# Christopher R. Gabriel , April 2000 - - -AC_DEFUN([AM_PATH_GSL], -[ -AC_ARG_WITH(gsl-prefix,[ --with-gsl-prefix=PFX Prefix where GSL is installed (optional)], - gsl_prefix="$withval", gsl_prefix="") -AC_ARG_WITH(gsl-exec-prefix,[ --with-gsl-exec-prefix=PFX Exec prefix where GSL is installed (optional)], - gsl_exec_prefix="$withval", gsl_exec_prefix="") -AC_ARG_ENABLE(gsltest, [ --disable-gsltest Do not try to compile and run a test GSL program], - , enable_gsltest=yes) - - if test "x${GSL_CONFIG+set}" != xset ; then - if test "x$gsl_prefix" != x ; then - GSL_CONFIG="$gsl_prefix/bin/gsl-config" - fi - if test "x$gsl_exec_prefix" != x ; then - GSL_CONFIG="$gsl_exec_prefix/bin/gsl-config" - fi - fi - - AC_PATH_PROG(GSL_CONFIG, gsl-config, no) - min_gsl_version=ifelse([$1], ,0.2.5,$1) - AC_MSG_CHECKING(for GSL - version >= $min_gsl_version) - no_gsl="" - if test "$GSL_CONFIG" = "no" ; then - no_gsl=yes - else - GSL_CFLAGS=`$GSL_CONFIG --cflags` - GSL_LIBS=`$GSL_CONFIG --libs` - - gsl_major_version=`$GSL_CONFIG --version | \ - sed 's/^\([[0-9]]*\).*/\1/'` - if test "x${gsl_major_version}" = "x" ; then - gsl_major_version=0 - fi - - gsl_minor_version=`$GSL_CONFIG --version | \ - sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\2/'` - if test "x${gsl_minor_version}" = "x" ; then - gsl_minor_version=0 - fi - - gsl_micro_version=`$GSL_CONFIG --version | \ - sed 's/^\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\)\.\{0,1\}\([[0-9]]*\).*/\3/'` - if test "x${gsl_micro_version}" = "x" ; then - gsl_micro_version=0 - fi - - if test "x$enable_gsltest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GSL_CFLAGS" - LIBS="$LIBS $GSL_LIBS" - - rm -f conf.gsltest - AC_TRY_RUN([ -#include -#include -#include - -char* my_strdup (const char *str); - -char* -my_strdup (const char *str) -{ - char *new_str; - - if (str) - { - new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); - strcpy (new_str, str); - } - else - new_str = NULL; - - return new_str; -} - -int main (void) -{ - int major = 0, minor = 0, micro = 0; - int n; - char *tmp_version; - - system ("touch conf.gsltest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = my_strdup("$min_gsl_version"); - - n = sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) ; - - if (n != 2 && n != 3) { - printf("%s, bad version string\n", "$min_gsl_version"); - exit(1); - } - - if (($gsl_major_version > major) || - (($gsl_major_version == major) && ($gsl_minor_version > minor)) || - (($gsl_major_version == major) && ($gsl_minor_version == minor) && ($gsl_micro_version >= micro))) - { - exit(0); - } - else - { - printf("\n*** 'gsl-config --version' returned %d.%d.%d, but the minimum version\n", $gsl_major_version, $gsl_minor_version, $gsl_micro_version); - printf("*** of GSL required is %d.%d.%d. If gsl-config is correct, then it is\n", major, minor, micro); - printf("*** best to upgrade to the required version.\n"); - printf("*** If gsl-config was wrong, set the environment variable GSL_CONFIG\n"); - printf("*** to point to the correct copy of gsl-config, and remove the file\n"); - printf("*** config.cache before re-running configure\n"); - exit(1); - } -} - -],, no_gsl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gsl" = x ; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$GSL_CONFIG" = "no" ; then - echo "*** The gsl-config script installed by GSL could not be found" - echo "*** If GSL was installed in PREFIX, make sure PREFIX/bin is in" - echo "*** your path, or set the GSL_CONFIG environment variable to the" - echo "*** full path to gsl-config." - else - if test -f conf.gsltest ; then - : - else - echo "*** Could not run GSL test program, checking why..." - CFLAGS="$CFLAGS $GSL_CFLAGS" - LIBS="$LIBS $GSL_LIBS" - AC_TRY_LINK([ -#include -], [ return 0; ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GSL or finding the wrong" - echo "*** version of GSL. If it is not finding GSL, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GSL was incorrectly installed" - echo "*** or that you have moved GSL since it was installed. In the latter case, you" - echo "*** may want to edit the gsl-config script: $GSL_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi -# GSL_CFLAGS="" -# GSL_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GSL_CFLAGS) - AC_SUBST(GSL_LIBS) - rm -f conf.gsltest -]) - -dnl Python -dnl Available from the GNU Autoconf Macro Archive at: -dnl http://www.gnu.org/software/ac-archive/htmldoc/ax_python.html -dnl -AC_DEFUN([AX_PYTHON], -[ -AC_ARG_WITH([python], -AC_HELP_STRING([--with-python], -[Include Python scripting support ])) - -if test x"$with_python" = "x"; then -AC_MSG_RESULT( Not using python ) - ac_use_python=no -else -AC_MSG_CHECKING(for python build information) - for python in python2.4 python2.3 python2.2 python2.1 python; do - AC_CHECK_PROGS(PYTHON_BIN, [$python]) - ax_python_bin=$PYTHON_BIN - if test x$ax_python_bin != x; then - AC_CHECK_LIB($ax_python_bin, main, ax_python_lib=$ax_python_bin, ax_python_lib=no) - if test `echo ${host} | grep '.*-darwin.*'`; then - python_prefix=/System/Library/Frameworks/Python.framework/*/ - fi - AC_CHECK_HEADER([$ax_python_bin/Python.h], - [[ax_python_header=`locate $python_prefix$ax_python_bin/Python.h | head -1 | sed -e s,/Python.h,,`]], - ax_python_header=no) - if test $ax_python_lib != no; then - if test $ax_python_header != no; then - break; - fi - fi - fi - done - if test x$ax_python_bin = x; then - ax_python_bin=no - fi - if test x$ax_python_header = x; then - ax_python_header=no - fi - if test x$ax_python_lib = x; then - ax_python_lib=no - fi - - AC_MSG_RESULT([ results of the Python check:]) - AC_MSG_RESULT([ Binary: $ax_python_bin]) - AC_MSG_RESULT([ Library: $ax_python_lib]) - AC_MSG_RESULT([ Include Dir: $ax_python_header]) - AC_MSG_RESULT([ Have python: $ac_use_python]) - - if test x$ax_python_header != xno; then - PYTHON_INCLUDE_DIR=-I$ax_python_header - AC_SUBST(PYTHON_INCLUDE_DIR) - fi - if test x$ax_python_lib != xno; then - PYTHON_LIB=-l$ax_python_lib - AC_SUBST(PYTHON_LIB) - fi - if test x$ax_python_header != xno; then - dnl & x$ax_python_lib != xno; then - ac_use_python=yes - HAVE_PYTHON=-DHAVE_PYTHON - fi -fi - -AM_CONDITIONAL([USE_PYTHON], [test "$ac_use_python" = "yes"]) -]) -dnl diff --git a/autogen.sh b/autogen.sh deleted file mode 100755 index e68796fc7a7..00000000000 --- a/autogen.sh +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh -echo "This source tree uses CMake rather than autoconf/automake" -echo "Please see http://wiki.qgis.org/qgiswiki/Building_with_CMake" -echo "for information on building QGIS with CMake." -exit - -# Automakeversion -AM_1=1 -AM_2=7 -AM_3=2 - -# Autoconfversion -AC_1=2 -AC_2=57 - -# Libtoolversion -LT_1=1 -LT_2=4 - -# Libtoolname -LIBTOOL=libtool -LIBTOOLIZE=libtoolize -if [ "`uname`" = "Darwin" ]; then - LIBTOOL=glibtool - LIBTOOLIZE=glibtoolize -fi - -# Check automake version -AM_VERSION=`automake --version | sed -n -e 's#^.* \([0-9]*\)\.\([0-9]*\)[^0-9]*\([0-9]*\).*$#\1 \2 \3#p'` -AM_V1=`echo $AM_VERSION | awk '{print $1}'` -AM_V2=`echo $AM_VERSION | awk '{print $2}'` -AM_V3=`echo $AM_VERSION | awk '{if ($NF > 2) print $3; else print "0";}'` - -if [ $AM_1 -gt $AM_V1 ]; then - AM_ERROR=1 -else - if [ $AM_1 -eq $AM_V1 ]; then - if [ $AM_2 -gt $AM_V2 ]; then - AM_ERROR=1 - else - if [ $AM_2 -eq $AM_V2 ]; then - if [ $AM_3 -gt $AM_V3 ]; then - AM_ERROR=1 - fi - fi - fi - fi -fi - -if [ "$AM_ERROR" = "1" ]; then - echo -e '\E[31;m' - echo -n "Your automake version `automake --version | sed -n -e 's#[^0-9]* \([0-9]*\.[0-9]*\.*[0-9]*\).*#\1#p'`" - echo " is older than the suggested one, $AM_1.$AM_2.$AM_3" - echo "Go on at your own risk. :-)" - echo - tput sgr0 -fi - -# Check autoconf version -AC_VERSION=`autoconf --version | sed -n -e 's#[^0-9]* \([0-9]*\)\.\([0-9]*\).*$#\1 \2#p'` -AC_V1=`echo $AC_VERSION | awk '{print $1}'` -AC_V2=`echo $AC_VERSION | awk '{print $2}'` - -if [ $AC_1 -gt $AC_V1 ]; then - AC_ERROR=1 -else - if [ $AC_1 -eq $AC_V1 ]; then - if [ $AC_2 -gt $AC_V2 ]; then - AC_ERROR=1 - fi - fi -fi - -if [ "$AC_ERROR" = "1" ]; then - echo -e '\E[31;m' - echo -n "Your autoconf version `autoconf --version | sed -n -e 's#[^0-9]* \([0-9]*\.[0-9]*\).*#\1#p'`" - echo " is older than the suggested one, $AC_1.$AC_2" - echo "Go on at your own risk. :-)" - echo - tput sgr0 -fi - -# Check libtool version -LT_VERSION=`$LIBTOOL --version | sed -n -e 's#[^0-9]* \([0-9]*\)\.\([0-9]*\).*$#\1 \2#p'` -LT_V1=`echo $LT_VERSION | awk '{print $1}'` -LT_V2=`echo $LT_VERSION | awk '{print $2}'` - -if [ $LT_1 -gt $LT_V1 ]; then - LT_ERROR=1 -else - if [ $LT_1 -eq $LT_V1 ]; then - if [ $LT_2 -gt $LT_V2 ]; then - LT_ERROR=1 - fi - fi -fi - -if [ "$LT_ERROR" = "1" ]; then - echo -e '\E[31;m' - echo -n "Your libtool version `$LIBTOOL --version | sed -n -e 's#[^0-9]* \([0-9]*\.[0-9]*\).*#\1#p'`" - echo " is older than the suggested one, $LT_1.$LT_2" - echo "Go on at your own risk. :-)" - echo - tput sgr0 -fi - -echo Configuring build environment for QGIS -aclocal \ - && $LIBTOOLIZE --force --copy \ - && autoheader --force -W all \ - && automake --add-missing --foreign --copy \ - && autoconf --force \ - && echo Now running configure to configure QGIS \ - && ./configure $@ diff --git a/configure b/configure deleted file mode 100755 index a8dc99f5dd8..00000000000 --- a/configure +++ /dev/null @@ -1,53 +0,0 @@ -#!/bin/sh -# Script to check for existence of cmake and then provide -# some moderately helpful advice on building QGIS with CMake. -# This script doesn't actually build anything. -NOCMAKE=0 -case $OSTYPE in - darwin*) - CMAKE=`which cmake|awk '{print $1 $2}'` - if [ "$CMAKE" = "nocmake" ] - then - NOCMAKE=1 - fi - ;; - - *) - CMAKE=`which cmake` - if [ "$CMAKE" = "" ] - then - NOCMAKE=1 - fi - ;; -esac -#echo "CMAKE IS $CMAKE" - - if [ "$NOCMAKE" = "1" ] -then -echo "QGIS now requires CMake to configure and build. - -You either don't have CMake installed or it is not in your path. -First install CMake (you can download it from http://www.cmake.org) and -then run this script again or see: -http://wiki.qgis.org/qgiswiki/Building_with_CMake for more information." -else - echo "Congratulations -- CMake is already installed on your system. - " -echo "To build QGIS: - mkdir build - cd build - cmake .. - make - make install - " - -echo "If you want to install QGIS in a place other than /usr/local use: - cmake -D CMAKE_INSTALL_PREFIX=/you/install/dir .. - " - -echo "For full control over all the build options, from your build directory use: - ccmake .." - -echo " -See http://wiki.qgis.org/qgiswiki/Building_with_CMake for more information." -fi diff --git a/configure.in b/configure.in deleted file mode 100644 index 0f1c4a2a2db..00000000000 --- a/configure.in +++ /dev/null @@ -1,582 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. -dnl $Id$ - - - -AC_INIT - -dnl AC_CONFIG_SRCDIR([libtool]) - -dnl header sentinals for qgsconfig.h -AH_TOP( -[#ifndef QGSCONFIG_H - #define QGSCONFIG_H -]) -AH_BOTTOM( -[#endif] -) - -AC_PREREQ(2.52) -AC_CONFIG_HEADERS(qgsconfig.h) - -dnl --------------------------------------------------------------------------- -dnl version number -dnl Note the convention here is to name development versions with a base -dnl name of the last release, the word "devel", and an EXTRA_VERSION -dnl number. This means that development work on 0.8 will be versioned as -dnl 0.7devel1, 0.7devel2, etc. -dnl --------------------------------------------------------------------------- -MAJOR_VERSION=0 -MINOR_VERSION=8 -MICRO_VERSION=0 -EXTRA_VERSION=0 -if test $EXTRA_VERSION -eq 0; then - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION} -else - VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}-Preview-${EXTRA_VERSION} -fi - -dnl --------------------------------------------------------------------------- -dnl library interfase version number -dnl change when lib interface changes -dnl see http://www.gnu.org/software/libtool/manual.html#TOC32 -dnl --------------------------------------------------------------------------- -INTERFACE_VERSION=1:0:0 - - -AM_INIT_AUTOMAKE(qgis, ${VERSION}) - -AC_SUBST(MAJOR_VERSION) -AC_SUBST(MINOR_VERSION) -AC_SUBST(MICRO_VERSION) -AC_SUBST(EXTRA_VERSION) -AC_SUBST(INTERFACE_VERSION) - -AC_PREFIX_PROGRAM(gcc) - -AC_PROG_CXX - -AC_LANG([C++]) - -AC_PROG_LN_S -AC_PROG_MAKE_SET -AC_PROG_INSTALL - -AC_LIBTOOL_DLOPEN -AC_PROG_LIBTOOL - - -dnl --------------------------------------------------------------------------- -dnl Check for Endian stuff to manage big endian anomalies -dnl --------------------------------------------------------------------------- - -AC_C_BIGENDIAN -AC_CHECK_HEADERS([endian.h]) -AC_CHECK_HEADERS([machine/endian.h]) - - -dnl --------------------------------------------------------------------------- -dnl check lib64 environment -dnl --------------------------------------------------------------------------- -AQ_CHECK_LIB64 - -dnl --------------------------------------------------------------------------- -dnl svnversion check -dnl --------------------------------------------------------------------------- -AC_CHECK_PROG(HAVE_SVNVERSION, [svnversion], [yes], [no]) - -dnl --------------------------------------------------------------------------- -dnl Qt check -dnl --------------------------------------------------------------------------- -AQ_CHECK_QT4 - -dnl --------------------------------------------------------------------------- -dnl Python -dnl --------------------------------------------------------------------------- -AX_PYTHON - -dnl --------------------------------------------------------------------------- -dnl GDAL/OGR -dnl --------------------------------------------------------------------------- -AQ_CHECK_GDAL - -dnl --------------------------------------------------------------------------- -dnl GEOS -dnl --------------------------------------------------------------------------- -AQ_CHECK_GEOS -if test x"$ac_geos" = "xno"; then - AC_MSG_ERROR("GEOS is required and was not found") -fi - -dnl --------------------------------------------------------------------------- -dnl PROJ -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(projdir, - AC_HELP_STRING([--with-projdir=DIR], - [ Proj4 installation directory, e.g. '--with-projdir=/usr/local']), - [ - if test x"$with_projlibdir" = "x" ; then - AC_MSG_CHECKING([for Proj4 library in $with_projdir/lib]) - PROJ_LIB="-L$with_projdir/lib -lproj" - if test -d "$with_projdir/lib" ; then - projlibdir="$with_projdir/lib" - fi - else - AC_MSG_CHECKING([for Proj4 library in $with_projlibdir]) - PROJ_LIB="-L$with_projlibdir -lproj" - if test -d "$with_projlibdir" ; then - projlibdir="$with_projlibdir" - fi - fi - - if test x"$projlibdir" = "x" ; then - AC_MSG_ERROR([*** directory $projlibdir does not exist.]) - else - LDFLAGS="$LDFLAGS $PROJ_LIB" - CPPFLAGS="$CPPFLAGS -I$with_projdir/include" - AC_MSG_RESULT(["$with_projdir exists"]) - - AC_CHECK_HEADERS(proj_api.h, - [PROJ_INC="-I$with_projdir/include"], - [AC_MSG_ERROR([*** Proj4 headers not found.])]) - - AC_CHECK_LIB(proj,pj_is_latlong, - [have_proj_lib=yes], - [AC_MSG_ERROR([*** Proj4 library not found.])]) - fi - ], - - [ - AC_CHECK_HEADERS(proj_api.h,[PROJ_INC=""], - [AC_MSG_ERROR([*** Proj4 headers not found.])]) - ] - AC_CHECK_LIB(proj,pj_is_latlong, - [ - have_proj_lib=yes - PROJ_LIB="-lproj" - ], - [ - AC_MSG_ERROR([Proj4 is required and was not found.]) - ]) - ) - -dnl A dummy section that's here just to produce some text for the -dnl configure --help output. The actual use of projlibdir is in -dnl the AC_ARG_WITH(projdir) macro - -AC_ARG_WITH(projlibdir,AC_HELP_STRING([--with-projlibdir=DIR], - [ Proj4 library directory, optional, use when library is in a different directory to that derived by appending /lib to --with-projdir ]),[],[]) - -AC_SUBST(PROJ_INC) -AC_SUBST(PROJ_LIB) - -dnl --------------------------------------------------------------------------- -dnl SQLITE -dnl --------------------------------------------------------------------------- - -AC_ARG_WITH(sqlite3dir, - AC_HELP_STRING([--with-sqlite3dir=DIR], - [ sqlite3 installation directory, e.g. '--with-sqlite3=/usr/local']), - [ - AC_MSG_CHECKING([for Sqlite3 library in $with_sqlite3dir]) - if test -d "$with_sqlite3dir/lib"; then - LDFLAGS="$LDFLAGS -L$with_sqlite3dir/lib" - CPPFLAGS="$CPPFLAGS -I$with_sqlite3dir/include" - AC_MSG_RESULT(["$with_sqlite3dir exists"]) - AC_CHECK_HEADERS(sqlite3.h, - [SQLITE3_INC="-I$with_sqlite3dir/include"], - [ - AC_MSG_ERROR([*** Sqlite3 headers not found.]) - ]) - AC_CHECK_LIB(sqlite3,sqlite3_open, - [ - have_sqlite3_lib=yes - SQLITE3_LIB="-L$with_sqlite3dir/lib -lsqlite3" - ], - [ - AC_MSG_ERROR([*** Sqlite3 library not found.]) - ]) - else - AC_MSG_ERROR([*** directory $with_sqlite3dir does not exist.]) - fi - ], - [ - AC_CHECK_HEADERS(sqlite3.h,[SQLITE3_INC=""], - [ - AC_MSG_ERROR([*** Sqlite3 headers not found.]) - ]) - AC_CHECK_LIB(sqlite3,sqlite3_open, - [ - have_sqlite3_lib=yes - SQLITE3_LIB="-lsqlite3" - ], - [ - AC_MSG_ERROR([*** Sqlite3 library not found.]) - ]) - - - ] - ) - -AC_SUBST(SQLITE3_INC) -AC_SUBST(SQLITE3_LIB) - - - -dnl --------------------------------------------------------------------------- -dnl PostgreSQL -dnl --------------------------------------------------------------------------- -AC_ARG_WITH(postgresql, - AC_HELP_STRING([--with-postgresql=path], - [PostgreSQL (PostGIS) Support (full path to pg_config)])) - -AC_MSG_CHECKING([for PostgreSQL]) - -# pg_config cannot be used with cross compiler -# we expect that libs and header files are in standard dirs -case "${host}" in - *-mingw*) - if test x"$with_postgresql" = "xyes" -o x"$with_postgresql" = "x" ; then - AC_MSG_RESULT([yes]) - PG_LIB="-lpq" - PG_INC="" - AC_DEFINE([HAVE_POSTGRESQL],1, - [Define to 1 if PostgreSQL is available]) - ac_postgresql="yes" - fi - ;; - - *) - if test x"$with_postgresql" = "xyes" -o x"$with_postgresql" = "x" ; then - AC_MSG_RESULT([yes]) - AC_PATH_PROG([PG_CONFIG], [pg_config], [no]) - elif test x"$with_postgresql" = "xno" ; then - AC_MSG_RESULT([no]) - PG_CONFIG=no - else - AC_MSG_RESULT([yes]) - PG_CONFIG="$with_postgresql/pg_config" - fi - - if test x"$PG_CONFIG" != "xno" ; then - PG_LIB="-L`$PG_CONFIG --libdir` -lpq" - PG_INC="-I`$PG_CONFIG --includedir`" - AC_MSG_CHECKING([for postgreSQL libs]) - AC_MSG_RESULT([$PG_LIB]) - AC_DEFINE([HAVE_POSTGRESQL],1, - [Define to 1 if PostgreSQL is available]) - ac_postgresql="yes" - ac_postgresql_version=`$PG_CONFIG --version | sed -e 's#PostgreSQL ##'` - postgresql_version_string="(Version $ac_postgresql_version)" - else - ac_postgresql="no" - fi - ;; -esac - -AC_SUBST(PG_INC) -AC_SUBST(PG_LIB) - -AM_CONDITIONAL([HAVE_POSTGRESQL], [test "$ac_postgresql" = "yes"]) - - -dnl --------------------------------------------------------------------------- -dnl checking if gdal and/or postgresql are available -dnl --------------------------------------------------------------------------- -if test x"$ac_postgresql" = "xno" -a x"$ac_gdalogr" = "xno"; then - AC_MSG_ERROR("QGIS without GDAL(with OGR support) and PostgreSQL makes no sense!") -fi - - -dnl --------------------------------------------------------------------------- -dnl support for lex/yacc tools - for search strings parser -dnl --------------------------------------------------------------------------- - -AC_PROG_YACC -AM_PROG_LEX - -# test whether they have been really found -# (by default if not found autoconf will use a stub) - -if test x"$LEX" != "xflex" -a x"$LEX" != "xlex" ; then - AC_MSG_ERROR("Lex/Flex is not available!") -fi - -if test x"$YACC" != "xbison" -a x"$YACC" != "xyacc" -a x"$YACC" != "xbison -y" ; then - AC_MSG_ERROR("Yacc/Bison is not available!") -fi - -dnl --------------------------------------------------------------------------- -dnl SPIT plugin -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(spit, - AC_HELP_STRING([--disable-spit], - [disable Shapefile to PostgreSQL (PostGIS) import plugin (built by default with PostgreSQL support)]), - [ac_spit=$enableval], [ac_spit=yes]) - -AC_MSG_CHECKING([for SPIT]) -if test x"$ac_spit" = "xyes"; then - if test x"$ac_postgresql" = "xyes" -a x"$ac_gdalogr" = "xyes"; then - AC_MSG_RESULT([yes]) - else - ac_spit="no" - if test x"$ac_postgresql" = "xno" ; then - AC_MSG_RESULT([no (PostgreSQL not available)]) - else - AC_MSG_RESULT([no (GDAL with OGR support not available)]) - fi - fi -else - AC_MSG_RESULT([no]) -fi - -AM_CONDITIONAL([HAVE_SPIT], [test "$ac_spit" = "yes"]) - - -dnl --------------------------------------------------------------------------- -dnl GRASS package -dnl --------------------------------------------------------------------------- -AC_CHECK_LIB(util, openpty) - -AC_ARG_WITH(grass, - AC_HELP_STRING([--with-grass=DIR],[GRASS Support (full path to GRASS binary package, e.g. --with-grass=/usr1/grass57/dist.i686-pc-linux-gnu)])) - - AC_MSG_CHECKING([for GRASS]) - -if test -n "$with_grass" -a x"$with_grass" != "xno"; then - # I don't know how to add library path to AC_CHECK_LIB() - if test ! -f "$GISLIB"; then - GISLIB=`ls $with_grass/${_lib}/libgrass_gis.dylib 2> /dev/null` - fi - if test ! -f "$GISLIB"; then - GISLIB=`ls $with_grass/${_lib}/libgrass_gis.so 2> /dev/null` - fi - if test ! -f "$GISLIB"; then - GISLIB=`ls $with_grass/${_lib}/libgrass_gis.a 2> /dev/null` - fi - if test ! -f "$GISLIB"; then - GISLIB=`ls $with_grass/${_lib}/grass_gis.dll 2> /dev/null` - fi - - if test ! -f "$GISLIB"; then - AC_MSG_ERROR( [GRASS library not found in $with_grass/${_lib}] ) - fi - GRASS_LIB="-L$with_grass/${_lib} -lgrass_vect -lgrass_dig2 -lgrass_dbmiclient -lgrass_dbmibase -lgrass_shape -lgrass_dgl -lgrass_rtree -lgrass_gis -lgrass_datetime -lgrass_linkm -lgrass_form -lgrass_gproj" - - if test "$ac_cv_lib_util_openpty" = yes; then - HAVE_OPENPTY=1 - GRASS_LIB="$GRASS_LIB -lutil" - fi - - GISINC=`ls $with_grass/include/grass/gis.h` - if test ! -f "$GISINC"; then - AC_MSG_ERROR( [GRASS headers not found] ) - fi - - GRASS_BASE="$with_grass" - GRASS_INC="$with_grass/include/" - HAVE_GRASS=1 - AC_MSG_RESULT([yes]) - ac_grass="yes" -else - AC_MSG_RESULT([no]) - ac_grass="no" -fi - -AC_SUBST(GRASS_BASE) -AC_SUBST(HAVE_GRASS) -AC_SUBST(HAVE_OPENPTY) -AC_SUBST(GRASS_LIB) -AC_SUBST(GRASS_INC) -AM_CONDITIONAL([HAVE_GRASS], [test "$ac_grass" = "yes"]) - -dnl --------------------------------------------------------------------------- -dnl GPX and GPS plugins -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(gpx, - AC_HELP_STRING([--disable-gpx], - [Disable the GPX provider and the GPS plugin (built by default if libexpat is found)]), - [ac_gpx=$enableval], [ac_gpx=yes]) -AC_MSG_CHECKING([GPX provider and GPS plugin should be installed (default: yes)]) -AC_MSG_RESULT([$ac_gpx]) -have_expat_lib=no -if [ test $ac_gpx = yes ] ; then - AC_CHECK_LIB(expat, XML_ParserCreate, have_expat_lib=yes) -fi -AM_CONDITIONAL([HAVE_EXPAT], [test "$have_expat_lib" = "yes"]) - -dnl --------------------------------------------------------------------------- -dnl unittests -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(unittests, - AC_HELP_STRING([--enable-unittests], - [Enable the compilation of unittests]), - [ac_com=yes], [ac_com=no]) -AC_MSG_CHECKING([Whether to build unit tests]) -AC_MSG_RESULT([$ac_com]) -AM_CONDITIONAL([WITH_UNITTESTS], [test "$ac_com" = "yes"]) - - -dnl --------------------------------------------------------------------------- -dnl Georeferencing plugin -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(georef, - AC_HELP_STRING([--disable-georef], - [Disable the georeferencing plugin (built by default if libgsl is found)]), - [ac_georef=$enableval], [ac_georef=yes]) -ac_gsl=no -AC_MSG_CHECKING([if the georeferencer plugin should be built]) -AC_MSG_RESULT($ac_georef) -if [ test $ac_georef = yes ] ; then - AM_PATH_GSL(1.5.9, [ac_gsl=yes], [ac_gsl=no]) -fi -AM_CONDITIONAL([HAVE_GSL], [test "$ac_gsl" = "yes"]) - - -dnl --------------------------------------------------------------------------- -dnl WFS plugin -dnl --------------------------------------------------------------------------- -AC_MSG_CHECKING([for WFS]) - -if test -n "$with_wfs" -a x"$with_wfs" != "xno"; then - ac_wfs=yes - AC_DEFINE([HAVE_WFS],1, - [Define to 1 if wfs plugin/provider is requested]) - AC_MSG_RESULT([yes]) -else - ac_wfs=no - AC_MSG_RESULT([no]) -fi -AM_CONDITIONAL([HAVE_WFS], [test "$ac_wfs" = "yes"]) - -dnl --------------------------------------------------------------------------- -dnl Debugging -dnl --------------------------------------------------------------------------- -AC_ARG_ENABLE(debug, - AC_HELP_STRING([--enable-debug], - [Enable debuging messages [[default=no]]]), - [ac_debug=$enableval], [ac_debug=no]) - -AC_MSG_CHECKING([if debug statements should be sent to stdout/stderr]) -if test x"$ac_debug" = "xno" ; then - DEBUG_QGIS=-DNO_DEBUG - AC_MSG_RESULT([no]) -else - DEBUG_QGIS=-DQGISDEBUG - AC_MSG_RESULT([yes]) -fi -AC_SUBST(DEBUG_QGIS) - - -#echo ${prefix}/lib -#ac_libdir=${prefix}/lib/$PACKAGE -#AC_MSG_CHECKING([plugin install directory]) -#AC_MSG_RESULT([$libdir]) -#echo Plugins will be installed in $libdir - -AC_CONFIG_FILES([ - Makefile - Makefile.win.rules - create_qm_files.sh - doc/Makefile - doc/images/Makefile - doc/install_guide/Makefile - doc/plugins/delimited_text/Makefile - doc/plugins/geoprocessing/buffer/Makefile - doc/plugins/geoprocessing/Makefile - doc/plugins/Makefile - i18n/Makefile - images/Makefile - images/developers/Makefile - images/icons/Makefile - images/north_arrows/Makefile - images/splash/Makefile - images/svg/biology/Makefile - images/svg/geometric/Makefile - images/svg/gpsicons/Makefile - images/svg/icon/Makefile - images/svg/Makefile - images/svg/north_arrows/Makefile - images/svg/symbol/Makefile - images/svg/sport/Makefile - images/themes/default/Makefile - images/themes/Makefile - images/themes/nkids/Makefile - resources/Makefile - resources/context_help/Makefile - src/Makefile - src/app/Makefile - src/core/Makefile - src/helpviewer/Makefile - src/gui/Makefile - src/mac/Contents/Makefile - src/mac/Contents/Resources/Makefile - src/mac/Makefile - src/plugins/Makefile - src/plugins/copyright_label/Makefile - src/plugins/delimited_text/Makefile - src/plugins/geoprocessing/Makefile - src/plugins/georeferencer/Makefile - src/plugins/gps_importer/Makefile - src/plugins/grass/config/Makefile - src/plugins/grass/Makefile - src/plugins/grass/modules/Makefile - src/plugins/grass/themes/default/Makefile - src/plugins/grass/themes/Makefile - src/plugins/grid_maker/Makefile - src/plugins/north_arrow/Makefile - src/plugins/scale_bar/Makefile - src/plugins/spit/Makefile - src/plugins/wfs/Makefile - src/providers/Makefile - src/providers/delimitedtext/Makefile - src/providers/gpx/Makefile - src/providers/grass/Makefile - src/providers/ogr/Makefile - src/providers/postgres/Makefile - src/providers/wms/Makefile - src/providers/wfs/Makefile - src/ui/Makefile - tools/Makefile - tools/mapserver_export/Makefile - tools/qgis_config/Makefile - qgis.spec - src/plugins/navigation/Makefile -]) - -AC_OUTPUT - -dnl Output the configuration summary -echo "" -echo "==========================================" -echo "$PACKAGE $VERSION" -echo "------------------------------------------" -echo "GDAL/OGR : $ac_gdalogr (Version $ac_gdalogr_version)" -echo "GEOS : $ac_geos (Version $ac_geos_version)" -echo "PostgreSQL : $ac_postgresql $postgresql_version_string" -echo "GRASS : $ac_grass" -echo "SPIT : $ac_spit" -echo "Georeferencer : $ac_gsl" -echo "WFS : $ac_wfs" -echo "GPS/GPX : $have_expat_lib" -echo "PROJ4 : $have_proj_lib" -echo "SQLITE3 : $have_sqlite3_lib" -echo "Python : $ac_use_python" -echo "" -echo "CPPFLAGS : $CPPFLAGS" -echo "CXXFLAGS : $CXXFLAGS" -echo "" -echo "Debug : $ac_debug" -echo "Plugin dir : ${prefix}/lib/$PACKAGE" -echo "" -if test "$have_qtmac" = "yes"; then - echo "The binary will be installed in $prefix" -else - echo "The binary will be installed in $prefix/bin" -fi -echo "" -echo "The build is using Qt in $QTDIR" -echo "Linking with Qt using $QT_LIBS" -echo "------------------------------------------" -echo "Configure finished, type 'make' to build." diff --git a/doCheckInstall.sh b/doCheckInstall.sh deleted file mode 100755 index e1c2301527d..00000000000 --- a/doCheckInstall.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -## -## A simple bash script to perform a checkinstall -## - -# Accept default answers to all questions -# Set name -# Set version -# Set software group -# The package maintainer (.deb) - -checkinstall --exclude ~/.ccache/stats --default --pkgname=qgis --pkgversion=0.7.0pre --pkggroup=GIS --maintainer=tim@linfiniti.com - diff --git a/doc/Makefile.am b/doc/Makefile.am deleted file mode 100644 index 9500b79dc62..00000000000 --- a/doc/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -docdatadir = $(datadir)/$(PACKAGE)/doc - -docdata_DATA = \ - favicon.ico \ - index.html \ - install.pdf \ - qgisdoc.css \ - userguide.pdf - -# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' - -SUBDIRS = images plugins install_guide - -EXTRA_DIST = $(docdata_DATA) diff --git a/doc/images/Makefile.am b/doc/images/Makefile.am deleted file mode 100644 index fd707e9a677..00000000000 --- a/doc/images/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -docdatadir = $(datadir)/$(PACKAGE)/doc/images - -docdata_DATA = qgis_new_80pct.png - -# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' - -EXTRA_DIST = $(docdata_DATA) diff --git a/doc/install_guide/Makefile.am b/doc/install_guide/Makefile.am deleted file mode 100644 index 4a9bd12b83a..00000000000 --- a/doc/install_guide/Makefile.am +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -docdatadir = $(datadir)/$(PACKAGE)/doc/install_guide -# The files needed for the doc install have to be manually added here and -# the next section enabled when doing a make dist or make release -docdata_DATA = #contents.png \ - #index.html \ - #install.css \ - #install.html \ - #internals.pl \ - #labels.pl \ - #next_g.png \ - #next.png \ - #nx_grp_g.png \ - #prev_g.png \ - #prev.png \ - #up_g.png \ - #up.png -# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' - -EXTRA_DIST = $(docdata_DATA) diff --git a/doc/plugins/Makefile.am b/doc/plugins/Makefile.am deleted file mode 100644 index 6595eea59bd..00000000000 --- a/doc/plugins/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -SUBDIRS = geoprocessing delimited_text diff --git a/doc/plugins/delimited_text/Makefile.am b/doc/plugins/delimited_text/Makefile.am deleted file mode 100644 index 37f9c976dcb..00000000000 --- a/doc/plugins/delimited_text/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (C) 2004 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -docdatadir = $(datadir)/$(PACKAGE)/doc/plugins/delimited_text - -docdata_DATA = \ - index.html \ - dialog.png \ - plugin_manager.png \ - toolbar_icon.png \ - ellipsis.png \ - file_selected1.png \ - file_selected2.png \ - file_selected3.png \ - file_selected.png \ - layer_added.png -# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' - -EXTRA_DIST = $(docdata_DATA) diff --git a/doc/plugins/geoprocessing/Makefile.am b/doc/plugins/geoprocessing/Makefile.am deleted file mode 100644 index 1242386eb26..00000000000 --- a/doc/plugins/geoprocessing/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -SUBDIRS = buffer diff --git a/doc/plugins/geoprocessing/buffer/Makefile.am b/doc/plugins/geoprocessing/buffer/Makefile.am deleted file mode 100644 index f2303a4c795..00000000000 --- a/doc/plugins/geoprocessing/buffer/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -docdatadir = $(datadir)/$(PACKAGE)/doc/plugins/geoprocessing/buffer - -docdata_DATA = \ - alaska_pglayer.png \ - buffer.png \ - bufferdialog.png \ - buffericon.png \ - bufferresult.png \ - index.html \ - pluginmanager.png - -# generated by ls -1 | sed -e '/CVS/d' -e '/Makefile/d' -e 's#\(.*\)# \1 \\#' - -EXTRA_DIST = $(docdata_DATA) diff --git a/i18n/Makefile.am b/i18n/Makefile.am deleted file mode 100644 index 8aba12677cd..00000000000 --- a/i18n/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -i18ndir = ${pkgdatadir}/i18n - -# Note: Whenever nodist_i18n_DATA is modified, the array CFBundleLocalizations -# in the file ../src/mac/Contents/Info.plist.in must also be updated to match. -# Remember to leave en in the other list even though it's not in this list :) - -nodist_i18n_DATA = \ - qgis_cs_CZ.qm \ - qgis_de.qm \ - qgis_es.qm \ - qgis_fr.qm \ - qgis_id.qm \ - qgis_it.qm \ - qgis_ja.qm \ - qgis_lv.qm \ - qgis_nl.qm \ - qgis_pl_PL.qm \ - qgis_pt_BR.qm \ - qgis_ro.qm \ - qgis_ru.qm \ - qgis_sk.qm \ - qgis_sv.qm \ - qgis_lv.qm \ - qgis_vi.qm \ - qgis_zh_CN.qm -i18n_SOURCES = \ - qgis_cs_CZ.ts \ - qgis_de.ts \ - qgis_es.ts \ - qgis_fr.ts \ - qgis_id.ts \ - qgis_it.ts \ - qgis_ja.ts \ - qgis_lv.ts \ - qgis_nl.ts \ - qgis_pl_PL.ts \ - qgis_pt_BR.ts \ - qgis_ro.ts \ - qgis_ru.ts \ - qgis_sk.ts \ - qgis_sv.ts \ - qgis_lv.ts \ - qgis_vi.ts \ - qgis_zh_CN.ts -%.qm: %.ts - cd ..; /bin/sh ./create_qm_files.sh - -EXTRA_DIST = $(i18n_SOURCES) diff --git a/images/Makefile.am b/images/Makefile.am deleted file mode 100644 index 7b06de8d307..00000000000 --- a/images/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -SUBDIRS = north_arrows splash icons developers themes svg diff --git a/images/developers/Makefile.am b/images/developers/Makefile.am deleted file mode 100644 index c5b22097a40..00000000000 --- a/images/developers/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -imagedir = ${pkgdatadir}/images/developers/ - -image_DATA = *.jpg - -EXTRA_DIST = $(image_DATA) diff --git a/images/icons/Makefile.am b/images/icons/Makefile.am deleted file mode 100644 index c1927ff1852..00000000000 --- a/images/icons/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -imagedir = ${pkgdatadir}/images/icons - -image_DATA = *.png - -EXTRA_DIST = $(image_DATA) diff --git a/images/north_arrows/Makefile.am b/images/north_arrows/Makefile.am deleted file mode 100644 index ff28fa61dc9..00000000000 --- a/images/north_arrows/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -imagedir = ${pkgdatadir}/images/north_arrows - -image_DATA = *.png - -EXTRA_DIST = $(image_DATA) diff --git a/images/splash/Makefile.am b/images/splash/Makefile.am deleted file mode 100644 index 62f931fc921..00000000000 --- a/images/splash/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -imagedir = ${pkgdatadir}/images/splash - -image_DATA = *.png - -EXTRA_DIST = $(image_DATA) diff --git a/images/svg/Makefile.am b/images/svg/Makefile.am deleted file mode 100644 index 7a87327cc8d..00000000000 --- a/images/svg/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -SUBDIRS = icon symbol geometric biology north_arrows gpsicons sport diff --git a/images/svg/biology/Makefile.am b/images/svg/biology/Makefile.am deleted file mode 100644 index 9860c6c871f..00000000000 --- a/images/svg/biology/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -svgdir = ${pkgdatadir}/svg/biology - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/svg/geometric/Makefile.am b/images/svg/geometric/Makefile.am deleted file mode 100644 index 9fb8274048f..00000000000 --- a/images/svg/geometric/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -svgdir = ${pkgdatadir}/svg/geometric - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/svg/gpsicons/Makefile.am b/images/svg/gpsicons/Makefile.am deleted file mode 100644 index 95788168cf4..00000000000 --- a/images/svg/gpsicons/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -svgdir = ${pkgdatadir}/svg/gpsicons - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/svg/icon/Makefile.am b/images/svg/icon/Makefile.am deleted file mode 100644 index 7c7619ae7ff..00000000000 --- a/images/svg/icon/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -svgdir = ${pkgdatadir}/svg/icon - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/svg/north_arrows/Makefile.am b/images/svg/north_arrows/Makefile.am deleted file mode 100644 index b60b68b76cf..00000000000 --- a/images/svg/north_arrows/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -svgdir = ${pkgdatadir}/svg/north_arrows - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/svg/sport/Makefile.am b/images/svg/sport/Makefile.am deleted file mode 100644 index 11c1165f129..00000000000 --- a/images/svg/sport/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id: Makefile.am 1249 2004-04-23 14:17:01Z jobi $ - -svgdir = ${pkgdatadir}/svg/sport - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/svg/symbol/Makefile.am b/images/svg/symbol/Makefile.am deleted file mode 100644 index 67482c743a6..00000000000 --- a/images/svg/symbol/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -svgdir = ${pkgdatadir}/svg/symbol - -svg_DATA = *.svg - -EXTRA_DIST = $(svg_DATA) diff --git a/images/themes/Makefile.am b/images/themes/Makefile.am deleted file mode 100644 index 8a8c8fc6a93..00000000000 --- a/images/themes/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -SUBDIRS = default nkids diff --git a/images/themes/default/Makefile.am b/images/themes/default/Makefile.am deleted file mode 100644 index 0aae8beb2cb..00000000000 --- a/images/themes/default/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -imagedir = ${pkgdatadir}/themes/default - -image_DATA = *.png *.xpm - -EXTRA_DIST = $(image_DATA) diff --git a/images/themes/nkids/Makefile.am b/images/themes/nkids/Makefile.am deleted file mode 100644 index 3b351619b6f..00000000000 --- a/images/themes/nkids/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2005 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -imagedir = ${pkgdatadir}/themes/nkids - -image_DATA = *.png - -EXTRA_DIST = $(image_DATA) diff --git a/install-sh b/install-sh deleted file mode 100755 index 6ce63b9f76b..00000000000 --- a/install-sh +++ /dev/null @@ -1,294 +0,0 @@ -#!/bin/sh -# -# install - install a program, script, or datafile -# -# This originates from X11R5 (mit/util/scripts/install.sh), which was -# later released in X11R6 (xc/config/util/install.sh) with the -# following copyright and license. -# -# Copyright (C) 1994 X Consortium -# -# Permission is hereby granted, free of charge, to any person obtaining a copy -# of this software and associated documentation files (the "Software"), to -# deal in the Software without restriction, including without limitation the -# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or -# sell copies of the Software, and to permit persons to whom the Software is -# furnished to do so, subject to the following conditions: -# -# The above copyright notice and this permission notice shall be included in -# all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- -# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the X Consortium shall not -# be used in advertising or otherwise to promote the sale, use or other deal- -# ings in this Software without prior written authorization from the X Consor- -# tium. -# -# -# FSF changes to this file are in the public domain. -# -# Calling this script install-sh is preferred over install.sh, to prevent -# `make' implicit rules from creating a file called install from it -# when there is no Makefile. -# -# This script is compatible with the BSD install script, but was written -# from scratch. It can only install one file at a time, a restriction -# shared with many OS's install programs. - - -# set DOITPROG to echo to test this script - -# Don't use :- since 4.3BSD and earlier shells don't like it. -doit="${DOITPROG-}" - - -# put in absolute paths if you don't have them in your path; or use env. vars. - -mvprog="${MVPROG-mv}" -cpprog="${CPPROG-cp}" -chmodprog="${CHMODPROG-chmod}" -chownprog="${CHOWNPROG-chown}" -chgrpprog="${CHGRPPROG-chgrp}" -stripprog="${STRIPPROG-strip}" -rmprog="${RMPROG-rm}" -mkdirprog="${MKDIRPROG-mkdir}" - -transformbasename="" -transform_arg="" -instcmd="$mvprog" -chmodcmd="$chmodprog 0755" -chowncmd="" -chgrpcmd="" -stripcmd="" -rmcmd="$rmprog -f" -mvcmd="$mvprog" -src="" -dst="" -dir_arg="" - -while [ x"$1" != x ]; do - case $1 in - -c) instcmd=$cpprog - shift - continue;; - - -d) dir_arg=true - shift - continue;; - - -m) chmodcmd="$chmodprog $2" - shift - shift - continue;; - - -o) chowncmd="$chownprog $2" - shift - shift - continue;; - - -g) chgrpcmd="$chgrpprog $2" - shift - shift - continue;; - - -s) stripcmd=$stripprog - shift - continue;; - - -t=*) transformarg=`echo $1 | sed 's/-t=//'` - shift - continue;; - - -b=*) transformbasename=`echo $1 | sed 's/-b=//'` - shift - continue;; - - *) if [ x"$src" = x ] - then - src=$1 - else - # this colon is to work around a 386BSD /bin/sh bug - : - dst=$1 - fi - shift - continue;; - esac -done - -if [ x"$src" = x ] -then - echo "$0: no input file specified" >&2 - exit 1 -else - : -fi - -if [ x"$dir_arg" != x ]; then - dst=$src - src="" - - if [ -d "$dst" ]; then - instcmd=: - chmodcmd="" - else - instcmd=$mkdirprog - fi -else - -# Waiting for this to be detected by the "$instcmd $src $dsttmp" command -# might cause directories to be created, which would be especially bad -# if $src (and thus $dsttmp) contains '*'. - - if [ -f "$src" ] || [ -d "$src" ] - then - : - else - echo "$0: $src does not exist" >&2 - exit 1 - fi - - if [ x"$dst" = x ] - then - echo "$0: no destination specified" >&2 - exit 1 - else - : - fi - -# If destination is a directory, append the input filename; if your system -# does not like double slashes in filenames, you may need to add some logic - - if [ -d "$dst" ] - then - dst=$dst/`basename "$src"` - else - : - fi -fi - -## this sed command emulates the dirname command -dstdir=`echo "$dst" | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` - -# Make sure that the destination directory exists. -# this part is taken from Noah Friedman's mkinstalldirs script - -# Skip lots of stat calls in the usual case. -if [ ! -d "$dstdir" ]; then -defaultIFS=' - ' -IFS="${IFS-$defaultIFS}" - -oIFS=$IFS -# Some sh's can't handle IFS=/ for some reason. -IFS='%' -set - `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` -IFS=$oIFS - -pathcomp='' - -while [ $# -ne 0 ] ; do - pathcomp=$pathcomp$1 - shift - - if [ ! -d "$pathcomp" ] ; - then - $mkdirprog "$pathcomp" - else - : - fi - - pathcomp=$pathcomp/ -done -fi - -if [ x"$dir_arg" != x ] -then - $doit $instcmd "$dst" && - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dst"; else : ; fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dst"; else : ; fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dst"; else : ; fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dst"; else : ; fi -else - -# If we're going to rename the final executable, determine the name now. - - if [ x"$transformarg" = x ] - then - dstfile=`basename "$dst"` - else - dstfile=`basename "$dst" $transformbasename | - sed $transformarg`$transformbasename - fi - -# don't allow the sed command to completely eliminate the filename - - if [ x"$dstfile" = x ] - then - dstfile=`basename "$dst"` - else - : - fi - -# Make a couple of temp file names in the proper directory. - - dsttmp=$dstdir/_inst.$$_ - rmtmp=$dstdir/_rm.$$_ - -# Trap to clean up temp files at exit. - - trap 'status=$?; rm -f "$dsttmp" "$rmtmp" && exit $status' 0 - trap '(exit $?); exit' 1 2 13 15 - -# Move or copy the file name to the temp name - - $doit $instcmd "$src" "$dsttmp" && - -# and set any options; do chmod last to preserve setuid bits - -# If any of these fail, we abort the whole thing. If we want to -# ignore errors from any of these, just make sure not to ignore -# errors from the above "$doit $instcmd $src $dsttmp" command. - - if [ x"$chowncmd" != x ]; then $doit $chowncmd "$dsttmp"; else :;fi && - if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd "$dsttmp"; else :;fi && - if [ x"$stripcmd" != x ]; then $doit $stripcmd "$dsttmp"; else :;fi && - if [ x"$chmodcmd" != x ]; then $doit $chmodcmd "$dsttmp"; else :;fi && - -# Now remove or move aside any old file at destination location. We try this -# two ways since rm can't unlink itself on some systems and the destination -# file might be busy for other reasons. In this case, the final cleanup -# might fail but the new file should still install successfully. - -{ - if [ -f "$dstdir/$dstfile" ] - then - $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null || - $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null || - { - echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 - (exit 1); exit - } - else - : - fi -} && - -# Now rename the file to the real destination. - - $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" - -fi && - -# The final little trick to "correctly" pass the exit status to the exit trap. - -{ - (exit 0); exit -} diff --git a/resources/Makefile.am b/resources/Makefile.am deleted file mode 100644 index 8b09c2b5d7d..00000000000 --- a/resources/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ - # Copyright (C) 2004 Tim Sutton (tim at linfiniti.com) - # - # This file is free software; as a special exception the author gives - # unlimited permission to copy and/or distribute it, with or without - # modifications, as long as this notice is preserved. - # - # This program is distributed in the hope that it will be useful, but - # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the - # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - # - # $Id$ - - resourcedir = ${pkgdatadir}/resources - - resource_DATA = srs.db qgis.db qgis_help.db - - SUBDIRS = context_help - - EXTRA_DIST = $(resource_DATA) - diff --git a/resources/context_help/Makefile.am b/resources/context_help/Makefile.am deleted file mode 100644 index 7f6a58484f3..00000000000 --- a/resources/context_help/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id: Makefile.am 2526 2004-12-20 07:13:35Z gsherman $ - -contexthelpdir = ${pkgdatadir}/resources/context_help - -contexthelp_DATA = * - -EXTRA_DIST = $(contexthelp_DATA) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 2b614eea6a7..00000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -if HAVE_QTMAC -MAC = mac -endif -# NOTE - the order of the SUBDIRS is important. Currently the providers -# depend on the existence of libqgis_gui. -# gui *must* be specified immediately before the providers -# subdirectory. -SUBDIRS = core ui gui app providers plugins $(MAC) helpviewer - diff --git a/src/app/Makefile.am b/src/app/Makefile.am deleted file mode 100644 index 91f8efcc07d..00000000000 --- a/src/app/Makefile.am +++ /dev/null @@ -1,330 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# 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 -PREFIX=-DPREFIX=\"$(prefix)\" -PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\" -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -## -## ---------------------------------------------------------------------- -## 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) -macbindir = $(exec_prefix) -macbin_PROGRAMS = qgis -else -bin_PROGRAMS = qgis -endif - - - -## -## ---------------------------------------------------------------------- -## QGIS Desktop Application -## ---------------------------------------------------------------------- -## - -qgis_SOURCES = main.cpp $(qgisSOURCES) $(qgisMOC) - -qgis_LDADD = $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 ../gui/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) -Icomposer -Ilegend -I../ui/ -I../core/include/ -I../gui/ -I../plugins/ - -## -## ---------------------------------------------------------------------- -## QGIS Legend -## ---------------------------------------------------------------------- -## - - -legendMOC = \ - legend/qgslegend.moc.cpp \ - legend/qgslegendlayerfile.moc.cpp - -legendSOURCES = \ - legend/qgslegendgroup.cpp \ - legend/qgslegend.cpp \ - legend/qgslegenditem.cpp \ - legend/qgslegendlayer.cpp \ - legend/qgslegendlayerfile.cpp \ - legend/qgslegendlayerfilegroup.cpp \ - legend/qgslegendpropertygroup.cpp \ - legend/qgslegendpropertyitem.cpp \ - legend/qgslegendsymbologygroup.cpp \ - legend/qgslegendsymbologyitem.cpp \ - legend/qgslegendvectorsymbologyitem.cpp - -legendHEADERS = - - -## -## ---------------------------------------------------------------------- -## QGIS Composer -## ---------------------------------------------------------------------- -## - - - -composerMOC = \ - composer/qgscomposer.moc.cpp \ - composer/qgscomposerlabel.moc.cpp \ - composer/qgscomposerpicture.moc.cpp \ - composer/qgscomposermap.moc.cpp \ - composer/qgscomposerscalebar.moc.cpp \ - composer/qgscomposervectorlegend.moc.cpp \ - composer/qgscomposerview.moc.cpp \ - composer/qgscomposition.moc.cpp - -composerHEADERS = -##composerHEADERS = \ -## composer/qgscomposer.h \ -## composer/qgscomposeritem.h \ -## composer/qgscomposerlabel.h \ -## composer/qgscomposerpicture.h \ -## composer/qgscomposermap.h \ -## composer/qgscomposerscalebar.h \ -## composer/qgscomposervectorlegend.h \ -## composer/qgscomposerview.h \ -## composer/qgscomposition.h - -composerSOURCES = \ - composer/qgscomposer.cpp \ - composer/qgscomposeritem.cpp \ - composer/qgscomposerlabel.cpp \ - composer/qgscomposerpicture.cpp \ - composer/qgscomposermap.cpp \ - composer/qgscomposerscalebar.cpp \ - composer/qgscomposervectorlegend.cpp \ - composer/qgscomposerview.cpp \ - composer/qgscomposition.cpp - - -## -## ---------------------------------------------------------------------- -## QGIS app stuff starts here -## ---------------------------------------------------------------------- -## - -qgisHEADERS = \ - qgisapp.h \ - qgisappinterface.h \ - qgsabout.h \ - qgsaddattrdialog.h \ - qgsattributeactiondialog.h \ - qgsattributedialog.h \ - qgsattributetabledisplay.h \ - qgsattributetable.h \ - qgsbookmarkitem.h \ - qgsbookmarks.h \ - qgsclipboard.h \ - qgscolorbutton.h \ - qgscontinuouscolordialog.h \ - qgscustomprojectiondialog.h \ - qgsdelattrdialog.h \ - qgsencodingfiledialog.h \ - qgsfillstylewidget.h \ - qgsgeomtypedialog.h \ - qgsgraduatedsymboldialog.h \ - qgshelpviewer.h \ - qgsidentifyresults.h \ - qgslabeldialog.h \ - qgslayerprojectionselector.h \ - qgslinestyledialog.h \ - qgsludialog.h \ - qgsmaplayerinterface.h \ - qgsmapserverexport.h \ - qgsmaptoolcapture.h \ - qgsmaptoolidentify.h \ - qgsmaptoolselect.h \ - qgsmaptoolvertexedit.h \ - qgsmarkerdialog.h \ - qgsmeasure.h \ - qgsnewhttpconnection.h \ - qgsnumericsortlistviewitem.h \ - qgsoptions.h \ - qgspastetransformations.h \ - qgspatterndialog.h \ - qgspluginitem.h \ - qgspluginmanager.h \ - qgspluginmetadata.h \ - qgspluginregistry.h \ - qgspointstylewidget.h \ - qgsprojectproperties.h \ - qgsrasterlayerproperties.h \ - qgssearchquerybuilder.h \ - qgsserversourceselect.h \ - qgssinglesymboldialog.h \ - qgsuniquevaluedialog.h \ - qgsvectorlayerproperties.h \ - $(legendHEADERS) \ - $(composerHEADERS) - - -## files generated from MOC -qgisMOC = \ - qgisapp.moc.cpp \ - qgisappinterface.moc.cpp \ - qgsabout.moc.cpp \ - qgsaddattrdialog.moc.cpp \ - qgsattributeactiondialog.moc.cpp \ - qgsattributedialog.moc.cpp \ - qgsattributetabledisplay.moc.cpp \ - qgsattributetable.moc.cpp \ - qgsbookmarks.moc.cpp \ - qgscontinuouscolordialog.moc.cpp \ - qgscustomprojectiondialog.moc.cpp \ - qgsdelattrdialog.moc.cpp \ - qgsencodingfiledialog.moc.cpp \ - qgsfillstylewidget.moc.cpp \ - qgsgeomtypedialog.moc.cpp \ - qgsgraduatedsymboldialog.moc.cpp \ - qgshelpviewer.moc.cpp \ - qgsidentifyresults.moc.cpp \ - qgslabeldialog.moc.cpp \ - qgslayerprojectionselector.moc.cpp \ - qgslinestyledialog.moc.cpp \ - qgslinestylewidget.moc.cpp \ - qgsludialog.moc.cpp \ - qgsmaplayerinterface.moc.cpp \ - qgsmapserverexport.moc.cpp \ - qgsmaptoolidentify.moc.cpp \ - qgsmarkerdialog.moc.cpp \ - qgsmeasure.moc.cpp \ - qgsnewhttpconnection.moc.cpp \ - qgsoptions.moc.cpp \ - qgspastetransformations.moc.cpp \ - qgspatterndialog.moc.cpp \ - qgspluginmanager.moc.cpp \ - qgspointstylewidget.moc.cpp \ - qgsprojectproperties.moc.cpp \ - qgsrasterlayerproperties.moc.cpp \ - qgssearchquerybuilder.moc.cpp \ - qgsserversourceselect.moc.cpp \ - qgssinglesymboldialog.moc.cpp \ - qgsuniquevaluedialog.moc.cpp \ - qgsvectorlayerproperties.moc.cpp \ - $(legendMOC) \ - $(composerMOC) - -qgisSOURCES = \ - qgisapp.cpp \ - qgisappinterface.cpp \ - qgsabout.cpp \ - qgsaddattrdialog.cpp \ - qgsattributeactiondialog.cpp \ - qgsattributedialog.cpp \ - qgsattributetable.cpp \ - qgsattributetabledisplay.cpp \ - qgsbookmarkitem.cpp \ - qgsbookmarks.cpp \ - qgsclipboard.cpp \ - qgscolorbutton.cpp \ - qgscontinuouscolordialog.cpp \ - qgscustomprojectiondialog.cpp \ - qgsdelattrdialog.cpp \ - qgsencodingfiledialog.cpp \ - qgsfillstylewidget.cpp \ - qgsgeomtypedialog.cpp \ - qgsgraduatedsymboldialog.cpp \ - qgshelpviewer.cpp \ - qgsidentifyresults.cpp \ - qgslabeldialog.cpp \ - qgslayerprojectionselector.cpp \ - qgslinestyledialog.cpp \ - qgslinestylewidget.cpp \ - qgsludialog.cpp \ - qgsmapserverexport.cpp \ - qgsmaptoolcapture.cpp \ - qgsmaptoolidentify.cpp \ - qgsmaptoolselect.cpp \ - qgsmaptoolvertexedit.cpp \ - qgsmarkerdialog.cpp \ - qgsmeasure.cpp \ - qgsnewhttpconnection.cpp \ - qgsnumericsortlistviewitem.cpp \ - qgsoptions.cpp \ - qgspastetransformations.cpp \ - qgspatterndialog.cpp \ - qgspluginitem.cpp \ - qgspluginmanager.cpp \ - qgspluginmetadata.cpp \ - qgspluginregistry.cpp \ - qgspointstylewidget.cpp \ - qgsprojectproperties.cpp \ - qgsrasterlayerproperties.cpp \ - qgssearchquerybuilder.cpp \ - qgsserversourceselect.cpp \ - qgssinglesymboldialog.cpp \ - qgsuniquevaluedialog.cpp \ - qgsvectorlayerproperties.cpp \ - $(legendSOURCES) \ - $(composerSOURCES) - -if HAVE_POSTGRESQL -postgresHEADERS = qgsdbsourceselect.h \ - qgsnewconnection.h \ - qgspgquerybuilder.h - -postgresSOURCES = qgsdbsourceselect.cpp \ - qgsnewconnection.cpp \ - qgspgquerybuilder.cpp - -postgresMOC = qgsdbsourceselect.moc.cpp \ - qgsnewconnection.moc.cpp \ - qgspgquerybuilder.moc.cpp - -qgisSOURCES += $(postgresSOURCES) $(postgresMOC) -endif - - -BUILT_SOURCES = $(qgisMOC) $(postgresMOC) - - -## -## ---------------------------------------------------------------------- -## additional files that need to be installed go here -## ---------------------------------------------------------------------- -## - -## don't install headers -##pkginclude_HEADERS = $(qgisHEADERS) -##pkginclude_dir = $(includedir)/qgis - - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST= - -if HAVE_POSTGRESQL - -EXTRA_DIST += $(postgresSOURCES) - -##pkginclude_HEADERS += $(postgresHEADERS) - -endif - diff --git a/src/app/composer/Makefile.am b/src/app/composer/Makefile.am deleted file mode 100644 index 808d250c5f5..00000000000 --- a/src/app/composer/Makefile.am +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright (C) 2005 Tim Sutton tim@linfiniti.com -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id: Makefile.am 4416 2005-12-30 17:30:36Z timlinux $ - -if !HAVE_QTMAC -PREFIX=-DPREFIX=\"$(prefix)\" -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -lib_LTLIBRARIES = libqgis_composer.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -libqgis_composer_MOC = qgscomposer.moc.cpp \ - qgscomposerlabel.moc.cpp \ - qgscomposerpicture.moc.cpp \ - qgscomposermap.moc.cpp \ - qgscomposerscalebar.moc.cpp \ - qgscomposervectorlegend.moc.cpp \ - qgscomposerview.moc.cpp \ - qgscomposition.moc.cpp - -##libqgis_composer_la_HEADERS = qgscomposer.h\ -## qgscomposeritem.h \ -## qgscomposerlabel.h \ -## qgscomposerpicture.h \ -## qgscomposermap.h \ -## qgscomposerscalebar.h \ -## qgscomposervectorlegend.h \ -## qgscomposerview.h \ -## qgscomposition.h - -libqgis_composer_la_SOURCES = qgscomposer.cpp\ - qgscomposeritem.cpp \ - qgscomposerlabel.cpp \ - qgscomposerpicture.cpp \ - qgscomposermap.cpp \ - qgscomposerscalebar.cpp \ - qgscomposervectorlegend.cpp \ - qgscomposerview.cpp \ - qgscomposition.cpp \ - $(libqgis_composer_MOC) - -libqgis_composer_la_LIBFLAGS = $(QT_LDADD) - -libqgis_composer_la_LDFLAGS = -version-info $(INTERFACE_VERSION) -libqgis_composer_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/include/ \ - $(PREFIX) $(CXXFLAGS) $(EXTRA_CXXFLAGS) \ - $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) - - -BUILT_SOURCES = $(libqgis_composer_MOC) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/app/legend/Makefile.am b/src/app/legend/Makefile.am deleted file mode 100644 index fa1afe526a4..00000000000 --- a/src/app/legend/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (C) 2005 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -if !HAVE_QTMAC -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -lib_LTLIBRARIES = libqgis_legend.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -qgis_MOC = qgslegend.moc.cpp \ - qgslegendlayerfile.moc.cpp - -libqgis_legend_la_SOURCES = qgslegendgroup.cpp \ - qgslegend.cpp \ - qgslegend.moc.cpp \ - qgslegenditem.cpp \ - qgslegendlayer.cpp \ - qgslegendlayerfile.cpp \ - qgslegendlayerfile.moc.cpp \ - qgslegendlayerfilegroup.cpp \ - qgslegendpropertygroup.cpp \ - qgslegendpropertyitem.cpp \ - qgslegendsymbologygroup.cpp \ - qgslegendsymbologyitem.cpp \ - qgslegendvectorsymbologyitem.cpp - -libqgis_legend_la_LIBFLAGS = $(QT_LDADD) - -libqgis_legend_la_LDFLAGS = -version-info $(INTERFACE_VERSION) -libqgis_legend_la_CXXFLAGS = $(PKGDATAPATH) -I../gui/ -I../ui/ -I../core/include/ \ - $(CXXFLAGS) $(EXTRA_CXXFLAGS) \ - $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) - - -BUILT_SOURCES = $(qgis_MOC) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index de6f610e43d..a3a37285b0e 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -528,7 +528,9 @@ void QgsRasterLayerProperties::on_buttonBuildPyramids_clicked() pixmapLegend->setScaledContents(true); pixmapLegend->repaint(false); //populate the metadata tab's text browser widget with gdal metadata info - txtbMetadata->setText(rasterLayer->getMetadata()); + QString myStyle = QgsApplication::reportStyleSheet(); + txtbMetadata->setHtml(rasterLayer->getMetadata()); + txtbMetadata->document()->setDefaultStyleSheet(myStyle); } @@ -551,7 +553,9 @@ void QgsRasterLayerProperties::sync() pixmapThumbnail->setPixmap(myQPixmap); //populate the metadata tab's text browser widget with gdal metadata info - txtbMetadata->setText(rasterLayer->getMetadata()); + QString myStyle = QgsApplication::reportStyleSheet(); + txtbMetadata->setHtml(rasterLayer->getMetadata()); + txtbMetadata->document()->setDefaultStyleSheet(myStyle); //tabSymbology->removePage(tabMetadata); //display the raster dimensions and no data value diff --git a/src/core/Makefile.am b/src/core/Makefile.am deleted file mode 100644 index d3fdde46c73..00000000000 --- a/src/core/Makefile.am +++ /dev/null @@ -1,235 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# 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 - - -if !HAVE_QTMAC -PREFIX=-DPREFIX=\"$(prefix)\" -PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\" -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -## -## ---------------------------------------------------------------------- -## Define Targets -## ---------------------------------------------------------------------- -## -lib_LTLIBRARIES = libqgis_core.la - - -## -## ---------------------------------------------------------------------- -## libqgis_core stuff starts here -## ---------------------------------------------------------------------- -## - -libqgis_coreHEADERS = \ - qgis.h \ - qgsapplication.h \ - qgsattributeaction.h \ - qgsclipper.h \ - qgscontexthelp.h \ - qgscoordinatetransform.h \ - qgscsexception.h \ - qgsdataprovider.h \ - qgsdatasourceuri.h \ - qgsdistancearea.h \ - qgsexception.h \ - qgsfeature.h \ - qgsfeatureattribute.h \ - qgsfield.h \ - qgsgeometry.h \ - qgsgeometryvertexindex.h \ - qgshttptransaction.h \ - qgslabel.h \ - qgslabelattributes.h \ - qgsline.h \ - qgslogger.h \ - qgsmaplayer.h \ - qgsmaplayerregistry.h \ - qgsmaprender.h \ - qgsmaptopixel.h \ - qgsmessageoutput.h \ - qgspoint.h \ - qgsproject.h \ - qgsprojectproperty.h \ - qgsprovidercountcalcevent.h \ - qgsproviderextentcalcevent.h\ - qgsprovidermetadata.h \ - qgsproviderregistry.h \ - qgsrasterdataprovider.h \ - qgsrect.h \ - qgsrunprocess.h \ - qgsscalecalculator.h \ - qgssearchstring.h \ - qgssearchtreenode.h \ - qgsspatialrefsys.h \ - qgsvectorfilewriter.h \ - qgsvectorlayer.h \ - qgsvectordataprovider.h \ - \ - raster/qgscolortable.h \ - raster/qgsrasterbandstats.h \ - raster/qgsrasterpyramid.h \ - raster/qgsrasterlayer.h \ - raster/qgsrasterviewport.h \ - \ - renderer/qgscontinuouscolorrenderer.h \ - renderer/qgsgraduatedsymbolrenderer.h \ - renderer/qgsrangerenderitem.h \ - renderer/qgsrenderer.h \ - renderer/qgsrenderitem.h \ - renderer/qgssinglesymbolrenderer.h \ - renderer/qgsuniquevaluerenderer.h \ - \ - symbology/qgssymbol.h \ - symbology/qgssymbologyutils.h \ - symbology/qgslinesymbol.h \ - symbology/qgsmarkercatalogue.h \ - symbology/qgsmarkersymbol.h \ - symbology/qgspolygonsymbol.h - - - -## files generated from MOC -libqgis_core_la_MOC = \ - qgscontexthelp.moc.cpp \ - qgscoordinatetransform.moc.cpp \ - qgsdataprovider.moc.cpp \ - qgshttptransaction.moc.cpp \ - qgsmaplayer.moc.cpp \ - qgsmaplayerregistry.moc.cpp \ - qgsmaprender.moc.cpp \ - qgsmessageoutput.moc.cpp \ - qgsproject.moc.cpp \ - qgsrasterdataprovider.moc.cpp \ - qgsrunprocess.moc.cpp \ - qgsvectorlayer.moc.cpp \ - \ - raster/qgsrasterlayer.moc.cpp - -libqgis_core_la_SOURCES =\ - qgis.cpp \ - qgsapplication.cpp \ - qgsattributeaction.cpp \ - qgsclipper.cpp \ - qgscontexthelp.cpp \ - qgscoordinatetransform.cpp \ - qgsdistancearea.cpp \ - qgsexception.cpp \ - qgsfeature.cpp \ - qgsfeatureattribute.cpp \ - qgsfield.cpp \ - qgsgeometry.cpp \ - qgsgeometryvertexindex.cpp \ - qgshttptransaction.cpp \ - qgslabel.cpp \ - qgslabelattributes.cpp \ - qgsline.cpp \ - qgslogger.cpp \ - qgsmaplayer.cpp \ - qgsmaplayerregistry.cpp \ - qgsmaprender.cpp \ - qgsmaptopixel.cpp \ - qgsmessageoutput.cpp \ - qgspoint.cpp \ - qgsproject.cpp \ - qgsprojectproperty.cpp \ - qgsprovidercountcalcevent.cpp \ - qgsproviderextentcalcevent.cpp \ - qgsprovidermetadata.cpp \ - qgsproviderregistry.cpp \ - qgsrasterdataprovider.cpp \ - qgsrect.cpp \ - qgsrunprocess.cpp \ - qgsscalecalculator.cpp \ - qgssearchstring.cpp \ - qgssearchstringlexer.ll \ - qgssearchstringparser.yy \ - qgssearchtreenode.cpp \ - qgsspatialrefsys.cpp \ - qgsvectorfilewriter.cpp \ - qgsvectorlayer.cpp \ - qgsvectordataprovider.cpp \ - \ - raster/qgscolortable.cpp \ - raster/qgsrasterlayer.cpp \ - \ - renderer/qgscontinuouscolorrenderer.cpp \ - renderer/qgsgraduatedsymbolrenderer.cpp \ - renderer/qgssinglesymbolrenderer.cpp \ - renderer/qgsrangerenderitem.cpp \ - renderer/qgsrenderer.cpp \ - renderer/qgsrenderitem.cpp \ - renderer/qgsuniquevaluerenderer.cpp \ - \ - symbology/qgssymbol.cpp \ - symbology/qgssymbologyutils.cpp \ - symbology/qgslinesymbol.cpp \ - symbology/qgsmarkercatalogue.cpp \ - symbology/qgsmarkersymbol.cpp \ - symbology/qgspolygonsymbol.cpp - - -AM_YFLAGS = -d -libqgis_core_la_YACC = qgssearchstringparser.h - - -nodist_libqgis_core_la_SOURCES = $(libqgis_core_la_MOC) - -BUILT_SOURCES = $(libqgis_core_la_YACC) $(libqgis_core_la_MOC) $(postgresMOC) - - -libqgis_core_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) $(PYTHON_LIB) $(GDAL_LDADD) -lsqlite3 -libqgis_core_la_LDFLAGS = -version-info $(INTERFACE_VERSION) - -libqgis_core_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -Iraster -Irenderer -Isymbology - -# Link headers to include directory -all-local: - rm -rf include/ - mkdir include - includes='$(pkginclude_HEADERS)' ; \ - for file in $$includes ; do \ - base=`basename $$file` ; \ - ln -s ../$$file include/$$base ; \ - done - -clean-local: - rm -rf include/ - - -## -## ---------------------------------------------------------------------- -## additional files that need to be installed go here -## ---------------------------------------------------------------------- -## -pkginclude_HEADERS = $(libqgis_coreHEADERS) - -pkginclude_dir = $(includedir)/qgis - - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST= - - -noinst_HEADERS = qgsdatasourceuri.h diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index 5714bb92078..ef867c2704b 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -224,3 +224,23 @@ void QgsApplication::exitQgis() delete QgsMapLayerRegistry::instance(); delete QgsProviderRegistry::instance(); } + +QString QgsApplication::reportStyleSheet() +{ + QString myStyle = ".glossy,h1,h2,h3{ background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #616161, stop: 0.5 #505050, stop: 0.6 #434343, stop:1 #656565); color: white; padding-left: 4px; border: 1px solid #6c6c6c; }"; + myStyle += "h1 {font-size : 22pt;}"; + myStyle += "h2 {font-size : 18pt;}"; + myStyle += "h3 {font-size : 14pt;}"; + myStyle += ".cellHeader {color:#466aa5; font-size : 12pt;}"; + myStyle += ".largeCell {color:#000000; font-size : 12pt;}"; + myStyle += "table " + "{" + " border-width: 1px 1px 1px 1px;" + " border-spacing: 2px;" + " border-style: solid solid solid solid;" + " border-color: black black black black;" + " border-collapse: separate;" + " background-color: white;" + "}"; + return myStyle; +} diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h index 70b6bb1dcba..5ee9519c3fb 100644 --- a/src/core/qgsapplication.h +++ b/src/core/qgsapplication.h @@ -104,6 +104,15 @@ class CORE_EXPORT QgsApplication: public QApplication //! Returns whether this machine uses big or little endian static endian_t endian(); + /** \brief get a standard css style sheet for reports. + * Typically you will use this method by doing: + * QString myStyle = QgsApplication::reportStyleSheet(); + * textBrowserReport->document()->setDefaultStyleSheet(myStyle); + * @return QString containing the CSS 2.1 compliant stylesheet. + * @note you can use the special Qt extensions too, for example + * the gradient fills for backgrounds. + */ + static QString reportStyleSheet(); private: static QString mPrefixPath; static QString mPluginPath; diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp index a70a6b53856..ccbb32107e9 100644 --- a/src/core/raster/qgsrasterlayer.cpp +++ b/src/core/raster/qgsrasterlayer.cpp @@ -3849,12 +3849,12 @@ cStringList2Q_( char ** stringList ) QString QgsRasterLayer::getMetadata() { - QString myMetadataQString = ""; - myMetadataQString += ""; - myMetadataQString += "
"; + QString myMetadataQString ; + myMetadataQString += ""; + myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; @@ -3927,10 +3927,10 @@ QString QgsRasterLayer::getMetadata() // end my added code - myMetadataQString += ""; - myMetadataQString += ""; @@ -3938,18 +3938,18 @@ QString QgsRasterLayer::getMetadata() //just use the first band GDALRasterBand *myGdalBand = gdalDataset->GetRasterBand(1); - myMetadataQString += ""; - myMetadataQString += ""; myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; } // if (mProviderKey.isEmpty()) - myMetadataQString += ""; - myMetadataQString += ""; // output coordinate system // TODO: this is not related to layer, to be removed? [MD] /* - myMetadataQString += ""; - myMetadataQString += ""; */ @@ -4039,19 +4039,19 @@ QString QgsRasterLayer::getMetadata() } else { - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += "
"; myMetadataQString += tr("Driver:"); myMetadataQString += "
"; + myMetadataQString += "
"; if (mProviderKey.isEmpty()) { myMetadataQString += QString(gdalDataset->GetDriver()->GetDescription()); @@ -3877,10 +3877,10 @@ QString QgsRasterLayer::getMetadata() // my added code (MColetti) - myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Dataset Description"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += QFile::decodeName(gdalDataset->GetDescription()); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Dimensions:"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("X: ") + QString::number(gdalDataset->GetRasterXSize()) + tr(" Y: ") + QString::number(gdalDataset->GetRasterYSize()) + tr(" Bands: ") + QString::number(gdalDataset->GetRasterCount()); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("No Data Value"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += QString::number(noDataValueDouble); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Data Type:"); myMetadataQString += "
"; + myMetadataQString += "
"; switch (myGdalBand->GetRasterDataType()) { case GDT_Byte: @@ -3990,10 +3990,10 @@ QString QgsRasterLayer::getMetadata() } myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Pyramid overviews:"); myMetadataQString += "
"; + myMetadataQString += "
"; if( GDALGetOverviewCount(myGdalBand) > 0 ) { @@ -4011,20 +4011,20 @@ QString QgsRasterLayer::getMetadata() myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Layer Spatial Reference System: "); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += mSRS->proj4String(); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Project Spatial Reference System: "); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += mCoordinateTransform->destSRS().proj4String(); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Origin:"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += QString::number(adfGeoTransform[0]); myMetadataQString += ","; myMetadataQString += QString::number(adfGeoTransform[3]); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Pixel Size:"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += QString::number(adfGeoTransform[1]); myMetadataQString += ","; myMetadataQString += QString::number(adfGeoTransform[5]); @@ -4061,18 +4061,15 @@ QString QgsRasterLayer::getMetadata() // // Add the stats for each band to the output table // - myMetadataQString += "
"; - myMetadataQString += tr("Band Statistics (if gathered):"); - myMetadataQString += "
"; + myMetadataQString += "
"; // Start a nested table in this trow - myMetadataQString += ""; - myMetadataQString += ""; - myMetadataQString += "
"; - myMetadataQString += "" + tr("Property") + ""; - myMetadataQString += ""; - myMetadataQString += "" + tr("Value") + ""; + myMetadataQString += ""; + myMetadataQString += ""; + myMetadataQString += ""; int myBandCountInt = getBandCount(); @@ -4080,17 +4077,17 @@ QString QgsRasterLayer::getMetadata() { QgsDebugMsg("Raster properties : checking if band " + QString::number(myIteratorInt) + " has stats? "); //band name - myMetadataQString += ""; - myMetadataQString += ""; //band number - myMetadataQString += ""; - myMetadataQString += ""; @@ -4099,10 +4096,10 @@ QString QgsRasterLayer::getMetadata() { QgsDebugMsg(".....no"); - myMetadataQString += ""; - myMetadataQString += ""; } @@ -4112,66 +4109,66 @@ QString QgsRasterLayer::getMetadata() QgsRasterBandStats myRasterBandStats = getRasterBandStats(myIteratorInt); //Min Val - myMetadataQString += ""; - myMetadataQString += ""; // Max Val - myMetadataQString += ""; - myMetadataQString += ""; // Range - myMetadataQString += ""; - myMetadataQString += ""; // Mean - myMetadataQString += ""; - myMetadataQString += ""; //sum of squares - myMetadataQString += ""; - myMetadataQString += ""; //standard deviation - myMetadataQString += ""; - myMetadataQString += ""; //sum of all cells - myMetadataQString += ""; - myMetadataQString += ""; //number of cells - myMetadataQString += ""; - myMetadataQString += ""; } @@ -4185,7 +4182,6 @@ QString QgsRasterLayer::getMetadata() // myMetadataQString += "
"; + myMetadataQString += tr("Property") ; + myMetadataQString += ""; + myMetadataQString += tr("Value"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Band"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += getRasterBandName(myIteratorInt); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Band No"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myIteratorInt); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("No Stats"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += tr("No stats collected yet"); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Min Val"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.minValDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Max Val"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.maxValDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Range"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.rangeDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Mean"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.meanDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Sum of squares"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.sumSqrDevDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Standard Deviation"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.stdDevDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Sum of all cells"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.sumDouble, 'f',10); myMetadataQString += "
"; + myMetadataQString += "
"; myMetadataQString += tr("Cell Count"); myMetadataQString += ""; + myMetadataQString += ""; myMetadataQString += QString::number(myRasterBandStats.elementCountInt); myMetadataQString += "
"; - myMetadataQString += ""; return myMetadataQString; } diff --git a/src/designer/Makefile.am b/src/designer/Makefile.am deleted file mode 100644 index dd57ad5efb5..00000000000 --- a/src/designer/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (C) 2005 Tim Sutton -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id: Makefile.am 4490 2006-01-07 01:09:27Z timlinux $ - -## -## ---------------------------------------------------------------------- -## Define Targets -## ---------------------------------------------------------------------- -## -lib_LTLIBRARIES = libqgis_designerwidgets.la -## TODO change this so it installs into ${QTDIR}/plugins/designer -libqgis_designerwidgetsdir = ${pkglibdir}/designer - -## -## ---------------------------------------------------------------------- -## get Qt4 to run moc and rcc where required... -## ---------------------------------------------------------------------- -## - -#run moc on files -%.moc.cpp: %.h - $(MOC) -o $@ $< - -#qt resources -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -libqgis_designerwidgets_la_MOC = qgsprojectionselectorwidget.moc.cpp - -libqgis_designerwidgets_RES = qgisdesignerwidgets.qrc.cpp - -libqgis_designerwidgets_QRC = qgisdesignerwidgets.qrc - - -libqgis_designerwidgets_la_SOURCES = qgsprojectionselectorwidget.cpp \ - $(libqgis_designerwidgets_la_MOC) \ - $(libqgis_designerwidgets_QRC) \ - $(libqgis_designerwidgets_RES) - - -libqgis_designerwidgets_la_LIBADD = $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la -libqgis_designerwidgets_la_LDFLAGS = -avoid-version -module -libqgis_designerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../gui/ -I../legend -I../core/include -I../widgets/projectionselector/ - -## -## ---------------------------------------------------------------------- -## additional files that need to be installed go here -## ---------------------------------------------------------------------- -## -# designer plugin header not needed by designer diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am deleted file mode 100644 index f9cc75f5642..00000000000 --- a/src/gui/Makefile.am +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -## -## ---------------------------------------------------------------------- -## Initial setup -## ---------------------------------------------------------------------- -## - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -## -## ---------------------------------------------------------------------- -## Define Targets -## ---------------------------------------------------------------------- -## -lib_LTLIBRARIES = libqgis_gui.la - - -## -## ---------------------------------------------------------------------- -## libqgis_gui-gui stuff starts here -## ---------------------------------------------------------------------- -## - -libqgis_guiHEADERS = \ - qgisgui.h \ - qgisinterface.h \ - qgscursors.h \ - qgsmapcanvas.h \ - qgsmapcanvasitem.h \ - qgsmapcanvasmap.h \ - qgsmapoverviewcanvas.h \ - qgsmaptool.h \ - qgsmaptoolpan.h \ - qgsmaptoolzoom.h \ - qgsmessageviewer.h \ - qgsprojectionselector.h \ - qgsrubberband.h \ - qgsvertexmarker.h - - -## files generated from MOC -libqgis_gui_la_MOC = \ - qgisinterface.moc.cpp \ - qgsmapcanvas.moc.cpp \ - qgsmapcanvasitem.moc.cpp \ - qgsmapcanvasmap.moc.cpp \ - qgsmapoverviewcanvas.moc.cpp \ - qgsprojectionselector.moc.cpp - -libqgis_gui_la_SOURCES = \ - qgisgui.cpp \ - qgisinterface.cpp \ - qgscursors.cpp \ - qgsmapcanvas.cpp \ - qgsmapcanvasitem.cpp \ - qgsmapcanvasmap.cpp \ - qgsmapoverviewcanvas.cpp \ - qgsmaptool.cpp \ - qgsmaptoolpan.cpp \ - qgsmaptoolzoom.cpp \ - qgsmessageviewer.cpp \ - qgsprojectionselector.cpp \ - qgsrubberband.cpp \ - qgsvertexmarker.cpp - -AM_YFLAGS = -d - -nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC) - -BUILT_SOURCES = $(libqgis_gui_la_MOC) - - -libqgis_gui_la_LIBADD = ../core/libqgis_core.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3 -libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION) - -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../core/include - - -## -## ---------------------------------------------------------------------- -## additional files that need to be installed go here -## ---------------------------------------------------------------------- -## -pkginclude_HEADERS = $(libqgis_guiHEADERS) - -pkginclude_dir = $(includedir)/qgis - - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(libqgis_gui_la_MOC) - diff --git a/src/helpviewer/Makefile.am b/src/helpviewer/Makefile.am deleted file mode 100644 index 36188a0d433..00000000000 --- a/src/helpviewer/Makefile.am +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (C) 2005 Gary Sherman gsherman at mrcc dot com -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - - -bin_PROGRAMS = qgis_help - -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" - - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - - -qgis_help_MOC = qgshelpserver.moc.cpp \ - qgshelpviewer.moc.cpp - -qgis_help_UI = ui_qgshelpviewerbase.h - -qgis_help_UIC = qgshelpviewerbase.ui - -qgis_help_SOURCES = main.cpp \ - qgshelpserver.h \ - qgshelpserver.cpp \ - qgshelpviewer.h \ - qgshelpviewer.cpp \ - $(qgis_help_UI) \ - $(qgis_help_MOC) - -BUILT_SOURCES = $(qgis_help_MOC) $(qgis_help_UI) - -qgis_help_LDADD = $(LDADD) $(QT_LDADD) -lsqlite3 - -qgis_help_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(PKGDATAPATH) - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(qgis_help_UIC) - -# Qt/Mac app needs to be inside a bundle to function correctly -MACBINDIR = $(bindir)/qgis_help.app/Contents/MacOS - -install-exec-hook: -if HAVE_QTMAC - $(mkinstalldirs) $(MACBINDIR) - mv $(bindir)/qgis_help $(MACBINDIR) -endif diff --git a/src/mac/Contents/Makefile.am b/src/mac/Contents/Makefile.am deleted file mode 100644 index 1e8d36bdf50..00000000000 --- a/src/mac/Contents/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (C) 2005 Tom Elwertowski -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -# This is the Contents directory of a Mac OS bundle -# (configure ensures that prefix ends in qgis.app/Contents/MacOS) - -contentsdir = $(exec_prefix)/../ - -contents_DATA = \ - Info.plist \ - Pkginfo - -Info.plist: Info.plist.in $(top_builddir)/configure.in $(top_builddir)/qgssvnversion.h - @SHORTVERSION=$(MAJOR_VERSION).$(MINOR_VERSION).$(MICRO_VERSION) && \ - SVNVERSION=`svnversion $(top_builddir)` && \ - sed -e "s/@VERSION/$(VERSION)/" \ - -e "s/@SHORTVERSION/$$SHORTVERSION/" \ - -e "s/@SVNVERSION/$$SVNVERSION/" \ - < Info.plist.in > $@ - -Pkginfo: Makefile - @echo -n "APPLQGIS" > $@ - -# Update bundle modification date so Finder scans latest plist -install-exec-hook: - touch $(contentsdir)/../. - -EXTRA_DIST = \ - Info.plist.in - -SUBDIRS = Resources diff --git a/src/mac/Contents/Resources/Makefile.am b/src/mac/Contents/Resources/Makefile.am deleted file mode 100644 index 0fcd3e46720..00000000000 --- a/src/mac/Contents/Resources/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (C) 2005 Tom Elwertowski -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -# This is the Resources directory of a Mac OS bundle -# (configure ensures that prefix ends in qgis.app/Contents/MacOS) - -resourcesdir = ${exec_prefix}/../Resources/ -resources_DATA = *.icns - -EXTRA_DIST = $(resources_DATA) \ - qgs.psd diff --git a/src/mac/Makefile.am b/src/mac/Makefile.am deleted file mode 100644 index 58dd16e2944..00000000000 --- a/src/mac/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (C) 2005 Tom Elwertowski -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -SUBDIRS = Contents diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am deleted file mode 100644 index b94e57715ba..00000000000 --- a/src/plugins/Makefile.am +++ /dev/null @@ -1,47 +0,0 @@ -## Makefile.in generated from automake - -if HAVE_SPIT -SPIT = spit -endif - -if HAVE_POSTGRESQL -GEOPROCESSING = geoprocessing -endif - -if HAVE_GRASS -GRASS = grass -endif - -if HAVE_WFS -WFS = wfs -endif - -SUBDIRS = $(GEOPROCESSING) \ - navigation \ - $(SPIT) \ - $(GRASS) \ - $(COMMUNITY) \ - delimited_text \ - georeferencer \ - gps_importer \ - grid_maker \ - north_arrow \ - copyright_label \ - scale_bar \ - $(WFS) - -EXTRA_DIST = \ - plugin_builder.pl \ - plugin_template/plugin.png \ - plugin_template/Makefile.am \ - plugin_template/plugin.cpp \ - plugin_template/pluginguibase.ui \ - plugin_template/pluginguibase.ui.h \ - plugin_template/plugingui.cpp \ - plugin_template/plugingui.h \ - plugin_template/plugin.h \ - plugin_template/README \ - qgisplugin.h - - -pkginclude_HEADERS=qgisplugin.h diff --git a/src/plugins/copyright_label/Makefile.am b/src/plugins/copyright_label/Makefile.am deleted file mode 100644 index c6bb64ca5b6..00000000000 --- a/src/plugins/copyright_label/Makefile.am +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -plugindir = ${pkglibdir} -#CopyrightLabel below to be replaced with the name of the plugin -plugin_LTLIBRARIES = copyrightlabelplugin.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -copyrightlabelplugin_la_SOURCES = plugin.cpp \ - plugin.h \ - plugingui.cpp \ - plugingui.h \ - $(plugin_UI)\ - $(plugin_MOC) \ - $(plugin_QRC) \ - $(plugin_RES) - -plugin_MOC = plugin.moc.cpp \ - plugingui.moc.cpp - -plugin_UI = ui_pluginguibase.h - -plugin_UIC = pluginguibase.ui - -plugin_RES = copyright_plugin.qrc.cpp - -#plugin_QRC = copyright_plugin.qrc - -# UI dependencies -pluginguibase.cpp: pluginguibase.h pluginguibase.ui - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES) - - -copyrightlabelplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la -copyrightlabelplugin_la_LDFLAGS = -avoid-version -module -copyrightlabelplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../gui -I../../ui -I../../core/include - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(plugin_UIC) icon.xpm \ - ui_pluginguibase.h diff --git a/src/plugins/delimited_text/Makefile.am b/src/plugins/delimited_text/Makefile.am deleted file mode 100644 index d756b212f78..00000000000 --- a/src/plugins/delimited_text/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -plugindir = ${pkglibdir} - - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -# DelimitedTextLayer below to be replaced with the name of the plugin -plugin_LTLIBRARIES = delimitedtextplugin.la - -plugin_MOC = qgsdelimitedtextplugin.moc.cpp \ - qgsdelimitedtextplugingui.moc.cpp - -plugin_UI = ui_qgsdelimitedtextpluginguibase.h - -plugin_UIC = qgsdelimitedtextpluginguibase.ui - -#plugin_QRC = delimited_text.qrc - -plugin_RES = delimited_text.qrc.cpp - -delimitedtextplugin_la_SOURCES = qgsdelimitedtextplugin.cpp \ - qgsdelimitedtextplugin.h \ - qgsdelimitedtextplugingui.cpp \ - qgsdelimitedtextplugingui.h \ - $(plugin_UI) \ - $(plugin_MOC) \ - $(plugin_QRC) \ - $(plugin_RES) - - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES) - - - -delimitedtextplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la -delimitedtextplugin_la_LDFLAGS = -avoid-version -module -delimitedtextplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../core/include -I../../gui -I../../ui - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(plugin_UIC) icon.xpm - diff --git a/src/plugins/geoprocessing/Makefile.am b/src/plugins/geoprocessing/Makefile.am deleted file mode 100644 index ff44791b273..00000000000 --- a/src/plugins/geoprocessing/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -plugindir = ${pkglibdir} - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -# %.h: %.ui -# $(UIC) -o $@ $< -# -# %.cpp: %.ui -# $(UIC) -o $@ -impl $*.h $< - - -plugin_LTLIBRARIES = pggeoprocessingplugin.la - - -pggeoprocessing_MOC = qgspggeoprocessing.moc.cpp \ - qgsdlgpgbuffer.moc.cpp - -pggeoprocessing_UI = ui_qgsdlgpgbufferbase.h - -pggeoprocessing_UIC = qgsdlgpgbufferbase.ui - -pggeoprocessingplugin_la_SOURCES = qgspggeoprocessing.cpp \ - qgspggeoprocessing.h \ - qgsdlgpgbuffer.cpp \ - qgsdlgpgbuffer.h \ - $(pggeoprocessing_UI) - -nodist_pggeoprocessingplugin_la_SOURCES = $(pggeoprocessing_MOC) - -# UI dependencies -qgsdlgpgbufferbase.cpp: qgsdlgpgbufferbase.h qgsdlgpgbufferbase.ui -qgsdlgpgbufferbase.h: qgsdlgpgbufferbase.ui - - -BUILT_SOURCES = $(pggeoprocessing_MOC) $(pggeoprocessing_UI) - - -pggeoprocessingplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) ../../core/libqgis_core.la ../../gui/libqgis_gui.la -pggeoprocessingplugin_la_LDFLAGS = -avoid-version -module -pggeoprocessingplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../ui -I../../gui -I../../core/include - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(pggeoprocessing_UIC) icon_buffer.xpm - diff --git a/src/plugins/georeferencer/Makefile.am b/src/plugins/georeferencer/Makefile.am deleted file mode 100644 index dfe2937f0f5..00000000000 --- a/src/plugins/georeferencer/Makefile.am +++ /dev/null @@ -1,88 +0,0 @@ -# Copyright (C) 2005 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - - -if HAVE_GSL - - -plugindir = ${pkglibdir} - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -## target plug-in -plugin_LTLIBRARIES = georefplugin.la - -## qt designer user-interface files -plugin_UIC = pluginguibase.ui \ - qgspointdialogbase.ui \ - mapcoordsdialogbase.ui \ - qgsgeorefwarpoptionsdialogbase.ui - -## uic created headers -plugin_UI = ui_pluginguibase.h \ - ui_qgspointdialogbase.h \ - ui_qgsgeorefwarpoptionsdialogbase.h \ - ui_mapcoordsdialogbase.h - -## MOC files -plugin_MOC = plugin.moc.cpp \ - plugingui.moc.cpp \ - qgspointdialog.moc.cpp \ - mapcoordsdialog.moc.cpp \ - qgsgeorefwarpoptionsdialog.moc.cpp - - -plugin_RES = georeferencer.qrc.cpp - -plugin_QRC = georeferencer.qrc - - -georefplugin_la_SOURCES = plugin.cpp \ - qgsgeorefdatapoint.h \ - qgsgeorefdatapoint.cpp \ - plugin.h \ - plugingui.cpp \ - plugingui.h \ - qgsimagewarper.h \ - qgsimagewarper.cpp \ - qgsleastsquares.h \ - qgsleastsquares.cpp \ - qgspointdialog.h \ - qgspointdialog.cpp \ - qgsgeorefwarpoptionsdialog.h \ - qgsgeorefwarpoptionsdialog.cpp \ - mapcoordsdialog.h \ - mapcoordsdialog.cpp \ - $(plugin_UI) \ - $(plugin_RES) - -nodist_georefplugin_la_SOURCES = $(plugin_MOC) $(plugin_UI) - -georefplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(GSL_CFLAGS) -I../ -I../../ui -I../../gui -I../../core/include -georefplugin_la_LDFLAGS = -avoid-version -module -georefplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GSL_LIBS) ../../gui/libqgis_gui.la ../../core/libqgis_core.la - -BUILT_SOURCES = $(plugin_UI) $(plugin_MOC) $(plugin_RES) - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(plugin_UIC) add_point.xpm - - -endif diff --git a/src/plugins/gps_importer/Makefile.am b/src/plugins/gps_importer/Makefile.am deleted file mode 100644 index 24abefed53e..00000000000 --- a/src/plugins/gps_importer/Makefile.am +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -if HAVE_EXPAT - -plugindir = ${pkglibdir} - -plugin_LTLIBRARIES = gpsimporterplugin.la - - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -gpsimporterplugin_la_SOURCES = \ - qgsgpsplugin.cpp \ - qgsbabelformat.h \ - qgsbabelformat.cpp \ - qgsgpsdevice.h \ - qgsgpsdevice.cpp \ - qgsgpsplugingui.cpp \ - qgsgpsplugingui.h \ - qgsgpsdevicedialog.cpp \ - $(plugin_UI)\ - $(plugin_MOC) \ - $(plugin_QRC) \ - $(plugin_RES) - -plugin_MOC = \ - qgsgpsplugin.moc.cpp \ - qgsbabelformat.moc.cpp \ - qgsgpsdevice.moc.cpp \ - qgsgpsplugingui.moc.cpp \ - qgsgpsdevicedialog.moc.cpp - -plugin_UI = \ - ui_qgsgpspluginguibase.h \ - ui_qgsgpsdevicedialogbase.h - -plugin_UIC = \ - qgsgpspluginguibase.ui \ - qgsgpsdevicedialogbase.ui - -plugin_RES = qgsgps_plugin.qrc.cpp - -#plugin_QRC = qgsgps_plugin.qrc - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES) - -gpsimporterplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la -gpsimporterplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS) -gpsimporterplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../core/include -I../../ui -I../../gui -gpsimporterplugin_la_LDFLAGS = -avoid-version -module - -CLEANFILES = $(BUILT_SOURCES) - -## -## Anything that must go in the tarball gets added here -## - -EXTRA_DIST = $(plugin_UIC) icon.xpm \ - ui_qgsgpspluginguibase.h \ - ui_qgsgpsdevicedialogbase.h \ - qgsgpsplugin.h \ - qgsgpsdevicedialog.h - - - - -endif diff --git a/src/plugins/grass/Makefile.am b/src/plugins/grass/Makefile.am deleted file mode 100644 index 92add109167..00000000000 --- a/src/plugins/grass/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright (C) 2004 Radim Blazek -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -SUBDIRS = config modules themes - -INCLUDES = -I../../gui -I../../core/include - -DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" -DHAVE_OPENPTY=$(HAVE_OPENPTY) - -if !HAVE_QTMAC -PREFIX=-DPREFIX=\"$(prefix)\" -endif - -plugindir = ${pkglibdir} - -grassdatadir = ${pkgdatadir}/grass/ -grassdata_DATA = *.gml images/world.png - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -plugin_LTLIBRARIES = grassplugin.la - -plugin_MOC = qgsgrassplugin.moc.cpp \ - qgsgrassselect.moc.cpp \ - qgsgrassbrowser.moc.cpp \ - qgsgrassedit.moc.cpp \ - qgsgrasstools.moc.cpp \ - qgsgrassmodel.moc.cpp \ - qgsgrassmapcalc.moc.cpp \ - qgsgrassmodule.moc.cpp \ - qgsgrassnewmapset.moc.cpp \ - qgsgrassshell.moc.cpp \ - qgsgrassattributes.moc.cpp \ - qgsgrassregion.moc.cpp \ - qgsgrassutils.moc.cpp - - -plugin_UI = ui_qgsgrassselectbase.h \ - ui_qgsgrasseditbase.h \ - ui_qgsgrassmapcalcbase.h \ - ui_qgsgrassmodulebase.h \ - ui_qgsgrassnewmapsetbase.h \ - ui_qgsgrassshellbase.h \ - ui_qgsgrassattributesbase.h \ - ui_qgsgrassregionbase.h - -plugin_UIC = qgsgrassselectbase.ui \ - qgsgrasseditbase.ui \ - qgsgrassmapcalcbase.ui \ - qgsgrassmodulebase.ui \ - qgsgrassnewmapsetbase.ui \ - qgsgrassshellbase.ui \ - qgsgrassattributesbase.ui \ - qgsgrassregionbase.ui - -grassplugin_la_SOURCES = qgsgrassplugin.cpp \ - qgsgrassplugin.h \ - qgsgrassselect.cpp \ - qgsgrassselect.h \ - qgsgrassbrowser.cpp \ - qgsgrassbrowser.h \ - qgsgrassedit.cpp \ - qgsgrassedit.h \ - qgsgrassedittools.cpp \ - qgsgrassedittools.h \ - qgsgrasstools.cpp \ - qgsgrasstools.h \ - qgsgrassmodel.cpp \ - qgsgrassmodel.h \ - qgsgrassmapcalc.cpp \ - qgsgrassmapcalc.h \ - qgsgrassmodule.cpp \ - qgsgrassmodule.h \ - qgsgrassnewmapset.cpp \ - qgsgrassnewmapset.h \ - qgsgrassshell.cpp \ - qgsgrassshell.h \ - qgsgrassattributes.cpp \ - qgsgrassattributes.h \ - qgsgrassregion.cpp \ - qgsgrassregion.h \ - qgsgrassutils.cpp \ - qgsgrassutils.h \ - ../../providers/grass/qgsgrass.h \ - ../../providers/grass/qgsgrassprovider.h \ - $(plugin_UI) - -nodist_grassplugin_la_SOURCES = $(plugin_MOC) - -# UI dependencies -qgsgrassselectbase.cpp: ui_qgsgrassselectbase.h qgsgrassselectbase.ui -qgsgrassselectbase.h: qgsgrassselectbase.ui -qgsgrasseditbase.cpp: ui_qgsgrasseditbase.h qgsgrasseditbase.ui -qgsgrasseditbase.h: qgsgrasseditbase.ui -qgsgrassmapcalcbase.cpp: ui_qgsgrassmapcalcbase.h qgsgrassmapcalcbase.ui -qgsgrassmapcalcbase.h: qgsgrassmapcalcbase.ui -qgsgrassmodulebase.cpp: ui_qgsgrassmodulebase.h qgsgrassmodulebase.ui -qgsgrassmodulebase.h: qgsgrassmodulebase.ui -qgsgrassnewmapsetbase.cpp: ui_qgsgrassnewmapsetbase.h qgsgrassnewmapsetbase.ui -qgsgrassnewmapsetbase.h: qgsgrassnewmapsetbase.ui -qgsgrassshellbase.cpp: ui_qgsgrassshellbase.h qgsgrassshellbase.ui -qgsgrassshellbase.h: qgsgrassshellbase.ui -qgsgrassattributesbase.cpp: ui_qgsgrassattributesbase.h qgsgrassattributesbase.ui -qgsgrassattributesbase.h: qgsgrassattributesbase.ui -qgsgrassregionbase.cpp: ui_qgsgrassregionbase.h qgsgrassregionbase.ui -qgsgrassregionbase.h: qgsgrassregionbase.ui - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) - - -grassplugin_la_LIBADD = $(QT_LDADD) ../../providers/grass/libqgisgrass.la $(GRASS_LIB) $(PG_LIB) $(GDAL_LDADD) ../../gui/libqgis_gui.la ../../core/libqgis_core.la -grassplugin_la_LDFLAGS = -avoid-version -module -grassplugin_la_CXXFLAGS = $(PREFIX) $(CXXFLAGS) -I$(GRASS_INC) $(DEFS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I$(PG_INC) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../ui - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(plugin_UIC) \ - add_vector.xpm \ - add_raster.xpm \ - grass_edit.xpm \ - grass_region.xpm \ - grass_region_edit.xpm \ - grass_tools.xpm \ - $(grassdata_DATA) diff --git a/src/plugins/grass/config/Makefile.am b/src/plugins/grass/config/Makefile.am deleted file mode 100644 index ea123a09283..00000000000 --- a/src/plugins/grass/config/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -grassconfigdir = ${pkgdatadir}/grass/config -grassconfig_DATA = *.qgc - -EXTRA_DIST = $(grassconfig_DATA) diff --git a/src/plugins/grass/modules/Makefile.am b/src/plugins/grass/modules/Makefile.am deleted file mode 100644 index 03e0b7393a8..00000000000 --- a/src/plugins/grass/modules/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -grassmodulesdir = ${pkgdatadir}/grass/modules -grassmodules_DATA = *.qgm *.svg *.png - -EXTRA_DIST = $(grassmodules_DATA) diff --git a/src/plugins/grass/themes/Makefile.am b/src/plugins/grass/themes/Makefile.am deleted file mode 100644 index 0830ddb7c40..00000000000 --- a/src/plugins/grass/themes/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ - -SUBDIRS = default diff --git a/src/plugins/grass/themes/default/Makefile.am b/src/plugins/grass/themes/default/Makefile.am deleted file mode 100644 index e708d071458..00000000000 --- a/src/plugins/grass/themes/default/Makefile.am +++ /dev/null @@ -1,5 +0,0 @@ - -imagedir = ${pkgdatadir}/themes/default/grass/ -image_DATA = *.png - -EXTRA_DIST = $(image_DATA) diff --git a/src/plugins/grid_maker/Makefile.am b/src/plugins/grid_maker/Makefile.am deleted file mode 100644 index a5e1bbe5910..00000000000 --- a/src/plugins/grid_maker/Makefile.am +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -if !HAVE_QTMAC -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -plugindir = ${pkglibdir} - -#for plugin so -plugin_LTLIBRARIES = gridmakerplugin.la - -# For standalone executable -# don't build on mingw since we haven't figured out the makefile issues -if MINGW_FALSE -bin_PROGRAMS = gridmaker -endif - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -## -## For plugin lib -## - -gridmakerplugin_la_SOURCES = plugin.cpp \ - graticulecreator.cpp \ - graticulecreator.h \ - utils.c \ - shpopen.c \ - dbfopen.c \ - shapefile.h \ - plugingui.cpp \ - $(plugin_UI)\ - $(plugin_MOC)\ - $(plugin_QRC) \ - $(plugin_RES) - - -plugin_MOC = plugin.moc.cpp \ - plugingui.moc.cpp - -plugin_UI = ui_pluginguibase.h - -plugin_UIC = pluginguibase.ui - -plugin_RES = gridmaker_plugin.qrc.cpp - -#plugin_QRC = gridmaker_plugin.qrc - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES) - -gridmakerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la -gridmakerplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS) -gridmakerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../core/include -I../../ui -I../../gui -gridmakerplugin_la_LDFLAGS = -avoid-version -module - -## -## For standalone executable -## - -gridmaker_SOURCES = main.cpp \ - graticulecreator.cpp \ - graticulecreator.h \ - utils.c \ - shpopen.c \ - dbfopen.c \ - shapefile.h \ - plugingui.cpp \ - $(standalone_MOC) - -gridmaker_LDADD = $(QT_LDADD) -gridmaker_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS) -gridmaker_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PKGDATAPATH) $(DEBUG_QGIS) -I../../gui -I../../ui -I../../core - -standalone_MOC = plugingui.moc.cpp - -standalone_UI = ui_pluginguibase.h - -CLEANFILES = $(BUILT_SOURCES) - -## -## Anything that must go in the tarball gets added here -## - -EXTRA_DIST = $(plugin_UIC) icon.xpm \ -ui_pluginguibase.h \ -plugingui.h \ -plugin.h \ -utils.h diff --git a/src/plugins/maplayer/Makefile.am b/src/plugins/maplayer/Makefile.am deleted file mode 100644 index 616981296b5..00000000000 --- a/src/plugins/maplayer/Makefile.am +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = maplayerplugin.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -%.h: %.ui - $(UIC) -o $@ $< - -%.cpp: %.ui - $(UIC) -o $@ -impl $*.h $< - -maplayer_MOC = maplayertest.moc.cpp - -maplayer_UI = - -maplayerplugin_la_SOURCES = maplayertest.cpp \ - $(maplayer_UI)\ - $(maplayer_MOC) - -# UI dependencies - - -maplayerplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../libqgis.la -maplayerplugin_la_LDFLAGS = -avoid-version -module -maplayerplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I../../src diff --git a/src/plugins/north_arrow/Makefile.am b/src/plugins/north_arrow/Makefile.am deleted file mode 100644 index 9f75efc5f9e..00000000000 --- a/src/plugins/north_arrow/Makefile.am +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -plugindir = ${pkglibdir} -if !HAVE_QTMAC -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif -#NorthArrow below to be replaced with the name of the plugin -plugin_LTLIBRARIES = northarrowplugin.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -northarrowplugin_la_SOURCES = plugin.cpp \ - plugin.h \ - plugingui.cpp \ - plugingui.h \ - $(plugin_UI)\ - $(plugin_MOC) \ - $(plugin_QRC) \ - $(plugin_RES) - -plugin_MOC = plugin.moc.cpp \ - plugingui.moc.cpp - -plugin_UI = ui_pluginguibase.h - -plugin_UIC = pluginguibase.ui - -plugin_RES = northarrow_plugin.qrc.cpp - -#plugin_QRC = northarrow_plugin.qrc - - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES) - - -northarrowplugin_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) ../../core/libqgis_core.la -northarrowplugin_la_LDFLAGS = -avoid-version -module -northarrowplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) $(PKGDATAPATH) -I../../gui -I../../ui -I../../core/include - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(plugin_UIC) icon.xpm \ - ui_pluginguibase.h - diff --git a/src/plugins/scale_bar/Makefile.am b/src/plugins/scale_bar/Makefile.am deleted file mode 100644 index 2df7f739946..00000000000 --- a/src/plugins/scale_bar/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -plugindir = ${pkglibdir} -#ScaleBar below to be replaced with the name of the plugin -plugin_LTLIBRARIES = scalebarplugin.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -scalebarplugin_la_SOURCES = plugin.cpp \ - plugin.h \ - plugingui.cpp \ - plugingui.h \ - $(plugin_UI)\ - $(plugin_MOC) \ - $(plugin_QRC) \ - $(plugin_RES) - -plugin_MOC = plugin.moc.cpp \ - plugingui.moc.cpp - -plugin_UI = ui_pluginguibase.h - -plugin_UIC = pluginguibase.ui - -plugin_RES = scalebar_plugin.qrc.cpp - -#plugin_QRC = scalebar_plugin.qrc - -# UI dependencies -pluginguibase.cpp: pluginguibase.h pluginguibase.ui - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) $(plugin_RES) - - -scalebarplugin_la_LIBADD = $(QT_LDADD) ../../core/libqgis_core.la -scalebarplugin_la_LDFLAGS = -avoid-version -module -scalebarplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) $(GEOS_CFLAGS) -I../../gui -I../../ui -I../../core/include - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(plugin_UIC) \ - icon.xpm \ - ui_pluginguibase.h diff --git a/src/plugins/spit/Makefile.am b/src/plugins/spit/Makefile.am deleted file mode 100644 index 8dbc0ef4661..00000000000 --- a/src/plugins/spit/Makefile.am +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ - -plugindir = ${pkglibdir} - -plugin_LTLIBRARIES = spitplugin.la - -if MINGW_FALSE -bin_PROGRAMS = spit -endif - - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -spit_MOC = qgsspit.moc.cpp \ - qgsshapefile.moc.cpp \ - qgseditreservedwordsdialog.moc.cpp \ - qgsconnectiondialog.moc.cpp - -spit_RES = spit.qrc.cpp - -#spit_QRC = spit.qrc - -spitplugin_la_MOC = $(spit_MOC) qgsspitplugin.moc.cpp - -spit_UI = ui_qgsconnectiondialogbase.h \ - ui_qgsspitbase.h \ - ui_qgseditreservedwordsbase.h - -spit_UIC = qgsconnectiondialogbase.ui \ - qgsspitbase.ui \ - qgseditreservedwordsbase.ui - -common_sources = qgsspit.cpp \ - qgsspit.h \ - qgsdbfbase.h \ - qgsconnectiondialog.cpp \ - qgsconnectiondialog.h \ - qgspgutil.cpp \ - qgsshapefile.cpp \ - qgsshapefile.h \ - qgseditreservedwordsdialog.h \ - qgseditreservedwordsdialog.cpp \ - $(spit_UI) \ - $(spit_QRC) \ - $(spit_RES) - -spitplugin_la_SOURCES = $(common_sources) \ - qgsspitplugin.cpp \ - qgsspitplugin.h - -spit_SOURCES = $(common_sources) main.cpp $(SPIT_UIC) $(spit_MOC) - -nodist_spitplugin_la_SOURCES = $(spitplugin_la_MOC) - -# UI dependencies -##qgsconnectiondialogbase.cpp: qgsconnectiondialogbase.ui qgsconnectiondialogbase.h -##qgsconnectiondialogbase.h: qgsconnectiondialogbase.ui -##qgsspitbase.cpp: qgsspitbase.h qgsspitbase.ui -##qgsspitbase.h: qgsspitbase.ui - -BUILT_SOURCES = $(spit_MOC) $(spit_UI) $(spitplugin_la_MOC) - - -spitplugin_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la -spitplugin_la_LDFLAGS = -avoid-version -module -spitplugin_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GEOS_CFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../gui -I../../ui -I../../core - - -spit_LDADD = $(QT_LDADD) $(PG_LIB) $(GDAL_LDADD) ../../core/libqgis_core.la ../../gui/libqgis_gui.la -#spit_LDFLAGS = -avoid-version -module -spit_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(GDAL_CFLAGS) $(QT_CXXFLAGS) $(PG_INC) -I../../gui -I../../ui -I../../core/include - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(spit_UIC) icon_spit.xpm spiticon.xpm spit_icons.h diff --git a/src/plugins/wfs/Makefile.am b/src/plugins/wfs/Makefile.am deleted file mode 100644 index 680188a1b95..00000000000 --- a/src/plugins/wfs/Makefile.am +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# and 2006 Tim Sutton -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id: Makefile.am 5198 2006-04-06 14:35:09Z timlinux $ - -#qgswfsplugin below to be replaced with the name of the plugin - -## -## Legacy support for pkgdatapath - you are encouraged to use -## Qt4.x resource files where possible rather! -## -if !HAVE_QTMAC -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -plugindir = ${pkglibdir} - -#for plugin so -plugin_LTLIBRARIES = wfsplugin.la - -## For Qt4 intermerdiary meta object compiler files -%.moc.cpp: %.h - $(MOC) -o $@ $< - -## For Qt4 User Interface Files -ui_%.h: %.ui - $(UIC) -o $@ $< - -## For Qt4 Resource Files -%.qrc.cpp: %.qrc - $(RCC) -o $@ $< - -## -## For plugin lib -## - -wfsplugin_la_SOURCES = qgswfsplugin.cpp \ - qgswfssourceselect.cpp \ - qgswfsplugin.h \ - qgswfssourceselect.h \ - $(plugin_UI)\ - $(plugin_MOC) - - -plugin_MOC = qgswfsplugin.moc.cpp \ - qgswfssourceselect.moc.cpp - -plugin_UI = ui_qgswfssourceselectbase.h - -plugin_UIC = qgswfssourceselectbase.ui - -BUILT_SOURCES = $(plugin_MOC) $(plugin_UI) - -wfsplugin_la_LIBADD = $(QT_LDADD) \ - $(GDAL_LDADD) \ - ../../core/libqgis_core.la \ - ../../gui/libqgis_gui.la - -wfsplugin_la_CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS) $(DEBUG_QGIS) -wfsplugin_la_CXXFLAGS = $(CXXFLAGS) \ - $(EXTRA_CXXFLAGS) \ - $(QT_CXXFLAGS) \ - $(DEBUG_QGIS) \ - $(GDAL_CFLAGS) \ - $(GEOS_CFLAGS) \ - $(GEOS_CFLAGS)/geos \ - -I../../core \ - -I../../ui \ - -I../../gui \ - -I../../raster \ - -I../../../include/qgis \ - -I../../providers/wfs \ - -I../../widgets/projectionselector \ - -I.. - -wfsplugin_la_LDFLAGS = -avoid-version -module - -EXTRA_DIST = $(wfsplugin_la_HEADERS) $(PLUGIN_UI) $(PLUGIN_UIC) mIconAddWfsLayer.xpm diff --git a/src/providers/Makefile.am b/src/providers/Makefile.am deleted file mode 100644 index 423553cf58e..00000000000 --- a/src/providers/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -if HAVE_POSTGRESQL -POSTGRESQL = postgres -endif - -if HAVE_GRASS -GRASS = grass -endif - -if HAVE_WFS -WFS = wfs -endif - -SUBDIRS = ogr $(POSTGRESQL) $(GRASS) delimitedtext gpx wms $(WFS) diff --git a/src/providers/delimitedtext/Makefile.am b/src/providers/delimitedtext/Makefile.am deleted file mode 100644 index 86a238b0585..00000000000 --- a/src/providers/delimitedtext/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ -## $Id$ - -INCLUDES = -I../../core/include/ -I../../ui/ - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = delimitedtextprovider.la - -delimitedtextprovider_la_SOURCES = qgsdelimitedtextprovider.cpp - - -delimitedtextprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LIB) $(GEOS_LDADD) ../../core/libqgis_core.la -delimitedtextprovider_la_LDFLAGS = -avoid-version -module -delimitedtextprovider_la_CXXFLAGS = $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) - -EXTRA_DIST = qgsdelimitedtextprovider.h diff --git a/src/providers/gpx/Makefile.am b/src/providers/gpx/Makefile.am deleted file mode 100644 index 13ed702021c..00000000000 --- a/src/providers/gpx/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -## $Id$ - -if HAVE_EXPAT - -INCLUDES = -I../../core/include - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = gpxprovider.la - -gpxprovider_la_SOURCES = qgsgpxprovider.cpp \ - gpsdata.cpp - - -gpxprovider_la_LIBADD = $(QT_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la -lexpat -gpxprovider_la_LDFLAGS = -avoid-version -module -gpxprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS) - -EXTRA_DIST = qgsgpxprovider.h gpsdata.h - -endif diff --git a/src/providers/grass/Makefile.am b/src/providers/grass/Makefile.am deleted file mode 100644 index cefd3500e7e..00000000000 --- a/src/providers/grass/Makefile.am +++ /dev/null @@ -1,40 +0,0 @@ -## -## $Id$ -## - -INCLUDES = -I../../core/include - -DEFS=-DGRASS_BASE=\"$(GRASS_BASE)\" - -lib_LTLIBRARIES = libqgisgrass.la - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = grassprovider.la - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -%.h: %.ui - $(UIC) -o $@ $< - -%.cpp: %.ui - $(UIC) -o $@ -impl $*.h $< - -grassprovider_la_SOURCES = provider.cpp \ - qgsgrassprovider.h - -grassprovider_la_LIBADD = $(QT_LDADD) libqgisgrass.la -grassprovider_la_LDFLAGS = -avoid-version -module -grassprovider_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(GRASS_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS) - -libqgisgrass_la_SOURCES = qgsgrassprovider.cpp \ - qgsgrassprovider.h \ - qgsgrass.cpp \ - qgsgrass.h - -libqgisgrass_la_LIBADD = $(QT_LDADD) $(GRASS_LIB) ../../core/libqgis_core.la -libqgisgrass_la_LDFLAGS = -version-info $(INTERFACE_VERSION) -libqgisgrass_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) -I$(GRASS_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS) -if HAVE_POSTGRESQL -libqgisgrass_la_CXXFLAGS += -I$(PG_INC) -endif diff --git a/src/providers/ogr/Makefile.am b/src/providers/ogr/Makefile.am deleted file mode 100644 index 43ef53ee7b7..00000000000 --- a/src/providers/ogr/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -INCLUDES = -I../../core/include/ - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = ogrprovider.la - -ogrprovider_la_SOURCES = qgsogrprovider.cpp \ - qgsogrprovider.h - -ogrprovider_la_LIBADD = $(QT_LDADD) $(GDAL_LDADD) $(GEOS_LDADD) ../../core/libqgis_core.la -ogrprovider_la_LDFLAGS = -avoid-version -module -ogrprovider_la_CXXFLAGS := $(GDAL_CFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GEOS_CFLAGS) - diff --git a/src/providers/postgres/Makefile.am b/src/providers/postgres/Makefile.am deleted file mode 100644 index 332f7e4b8ef..00000000000 --- a/src/providers/postgres/Makefile.am +++ /dev/null @@ -1,34 +0,0 @@ -INCLUDES = -I../../core/include/ - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = postgresprovider.la - - -## non-uic files generated from MOC - -postgresprovider_MOC = qgspostgresprovider.moc.cpp - - -postgresprovider_la_SOURCES = \ - qgspostgresprovider.cpp \ - qgspostgresprovider.moc.cpp \ - qgspostgresprovider.h \ - qgspostgisbox2d.cpp \ - qgspostgisbox2d.h \ - qgspostgisbox3d.cpp \ - qgspostgisbox3d.h \ - qgspostgrescountthread.cpp \ - qgspostgrescountthread.h \ - qgspostgresextentthread.cpp \ - qgspostgresextentthread.h - -BUILT_SOURCES = $(postgresprovider_MOC) - -postgresprovider_la_LIBADD = $(QT_LDADD) $(PG_LIB) $(GEOS_LDADD) ../../core/libqgis_core.la -postgresprovider_la_LDFLAGS = -avoid-version -module -postgresprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(GDAL_CFLAGS) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/providers/wfs/Makefile.am b/src/providers/wfs/Makefile.am deleted file mode 100644 index b5c0d2e2ddb..00000000000 --- a/src/providers/wfs/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -INCLUDES = -I../../core/ -I../../gui/ -I../../ui - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = libwfsprovider.la - -libwfsprovider_la_SOURCES = qgswfsprovider.cpp $(libwfsprovider_MOC) qgswfsprovider.h - -BUILT_SOURCES = $(wfsprovider_MOC) - -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) $(GEOS_CFLAGS)/geos - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/providers/wms/Makefile.am b/src/providers/wms/Makefile.am deleted file mode 100644 index 39d6f36121a..00000000000 --- a/src/providers/wms/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -INCLUDES = -I../../core/include - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -plugindir = ${pkglibdir} -plugin_LTLIBRARIES = wmsprovider.la - - -## non-uic files generated from MOC - -wmsprovider_MOC = qgswmsprovider.moc.cpp \ - ../../core/qgsdataprovider.moc.cpp \ - ../../core/qgsrasterdataprovider.moc.cpp - -wmsprovider_la_SOURCES = \ - qgswmsprovider.cpp \ - qgswmsprovider.moc.cpp \ - qgswmsprovider.h - -BUILT_SOURCES = $(wmsprovider_MOC) - -wmsprovider_la_LIBADD = $(QT_LDADD) ../../core/libqgis_core.la -wmsprovider_la_LDFLAGS = -avoid-version -module -wmsprovider_la_CXXFLAGS = $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) $(GDAL_CFLAGS) - -CLEANFILES = $(BUILT_SOURCES) diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am deleted file mode 100644 index 019103268b3..00000000000 --- a/src/ui/Makefile.am +++ /dev/null @@ -1,159 +0,0 @@ -# Copyright (C) 2005 Tim Sutton tim@linfiniti.com -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -ui_%.h: %.ui - $(UIC) -o $@ $< - - -## qt designer files for all the GUI stuff - -qgis_ui_UIC = \ - qgsabout.ui \ - qgsaddattrdialogbase.ui \ - qgsattributedialogbase.ui \ - qgsattributeactiondialogbase.ui \ - qgsattributetablebase.ui \ - qgsbookmarksbase.ui \ - qgscontinuouscolordialogbase.ui \ - qgsdelattrdialogbase.ui \ - qgsvectorlayerpropertiesbase.ui \ - qgsgeomtypedialogbase.ui \ - qgsgraduatedsymboldialogbase.ui \ - qgshelpviewerbase.ui \ - qgsidentifyresultsbase.ui \ - qgslabeldialogbase.ui \ - qgslinestyledialogbase.ui \ - qgsludialogbase.ui \ - qgsmapserverexportbase.ui \ - qgsmarkerdialogbase.ui \ - qgsmessageviewer.ui \ - qgsmeasurebase.ui \ - qgsnewhttpconnectionbase.ui \ - qgsoptionsbase.ui \ - qgspastetransformationsbase.ui \ - qgspatterndialogbase.ui \ - qgspluginmanagerbase.ui \ - qgsprojectpropertiesbase.ui \ - qgsrasterlayerpropertiesbase.ui \ - qgsserversourceselectbase.ui \ - qgssinglesymboldialogbase.ui \ - qgsuniquevaluedialogbase.ui \ - qgslayerprojectionselectorbase.ui \ - qgscustomprojectiondialogbase.ui \ - qgscomposerbase.ui \ - qgscompositionbase.ui \ - qgsgeomtypedialogbase.ui \ - qgspastetransformationsbase.ui \ - qgscomposermapbase.ui \ - qgscomposerlabelbase.ui \ - qgscomposerpicturebase.ui \ - qgscomposerscalebarbase.ui \ - qgscomposervectorlegendbase.ui \ - qgscontinuouscolordialogbase.ui \ - qgsattributedialogbase.ui \ - qgsfillstylewidgetbase.ui \ - qgsgraduatedsymboldialogbase.ui \ - qgslabeldialogbase.ui \ - qgslinestylewidgetbase.ui \ - qgsmeasurebase.ui \ - qgspointstylewidgetbase.ui \ - qgsidentifyresultsbase.ui \ - qgsuniquevaluedialogbase.ui \ - qgsattributetabledisplaybase.ui \ - qgsaddattrdialogbase.ui \ - qgsattributeactiondialogbase.ui \ - qgsdelattrdialogbase.ui \ - qgspgquerybuilderbase.ui \ - qgsludialogbase.ui \ - qgspatterndialogbase.ui \ - qgslinestyledialogbase.ui \ - qgsmarkerdialogbase.ui \ - qgsnewhttpconnectionbase.ui \ - qgsnewconnectionbase.ui \ - qgsprojectionselectorbase.ui - -## all the ui files generate a corresponding header file -qgis_ui_UIHEADERS = ui_qgisappbase.h \ - ui_qgsabout.h \ - ui_qgsaddattrdialogbase.h \ - ui_qgsattributedialogbase.h \ - ui_qgsattributeactiondialogbase.h \ - ui_qgsattributetablebase.h \ - ui_qgsbookmarksbase.h \ - ui_qgscontinuouscolordialogbase.h \ - ui_qgsdelattrdialogbase.h \ - ui_qgsvectorlayerpropertiesbase.h \ - ui_qgsgeomtypedialogbase.h \ - ui_qgsgraduatedsymboldialogbase.h \ - ui_qgshelpviewerbase.h \ - ui_qgsidentifyresultsbase.h \ - ui_qgslabeldialogbase.h \ - ui_qgslinestyledialogbase.h \ - ui_qgsludialogbase.h \ - ui_qgsmapserverexportbase.h \ - ui_qgsmarkerdialogbase.h \ - ui_qgsmessageviewer.h \ - ui_qgsmeasurebase.h \ - ui_qgsnewhttpconnectionbase.h \ - ui_qgsoptionsbase.h \ - ui_qgspastetransformationsbase.h \ - ui_qgspatterndialogbase.h \ - ui_qgspluginmanagerbase.h \ - ui_qgsprojectpropertiesbase.h \ - ui_qgsrasterlayerpropertiesbase.h \ - ui_qgsserversourceselectbase.h \ - ui_qgssinglesymboldialogbase.h \ - ui_qgsuniquevaluedialogbase.h \ - ui_qgslayerprojectionselectorbase.h \ - ui_qgscustomprojectiondialogbase.h \ - ui_qgscomposerbase.h \ - ui_qgscompositionbase.h \ - ui_qgsgeomtypedialogbase.h \ - ui_qgspastetransformationsbase.h \ - ui_qgscomposermapbase.h \ - ui_qgscomposerlabelbase.h \ - ui_qgscomposerpicturebase.h \ - ui_qgscomposerscalebarbase.h \ - ui_qgscomposervectorlegendbase.h \ - ui_qgscontinuouscolordialogbase.h \ - ui_qgsattributedialogbase.h \ - ui_qgsfillstylewidgetbase.h \ - ui_qgsgraduatedsymboldialogbase.h \ - ui_qgslabeldialogbase.h \ - ui_qgslinestylewidgetbase.h \ - ui_qgsmeasurebase.h \ - ui_qgspointstylewidgetbase.h \ - ui_qgsidentifyresultsbase.h \ - ui_qgsaddattrdialogbase.h \ - ui_qgsattributeactiondialogbase.h \ - ui_qgsdelattrdialogbase.h \ - ui_qgspgquerybuilderbase.h \ - ui_qgsludialogbase.h \ - ui_qgspatterndialogbase.h \ - ui_qgslinestyledialogbase.h \ - ui_qgsmarkerdialogbase.h \ - ui_qgsuniquevaluedialogbase.h \ - ui_qgsnewhttpconnectionbase.h \ - ui_qgsnewconnectionbase.h \ - ui_qgsprojectionselectorbase.h - - -postgresUIHEADERS = ui_qgsdbsourceselectbase.h \ - ui_qgsnewconnectionbase.h \ - ui_qgspgquerybuilderbase.h - -BUILT_SOURCES = $(qgis_ui_UIHEADERS) $(postgresUIHEADERS) -# the following is not used anywhere so its commented out -#qgis_ui_LDADD = $(LDADD) $(QT_LDADD) -qgis_ui_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) - -CLEANFILES = $(BUILT_SOURCES) - -EXTRA_DIST = $(qgis_ui_UIHEADERS) $(postgresUIHEADERS) diff --git a/src/ui/qgsrasterlayerpropertiesbase.ui b/src/ui/qgsrasterlayerpropertiesbase.ui index 869d9a5ffc0..7b6b915f41e 100644 --- a/src/ui/qgsrasterlayerpropertiesbase.ui +++ b/src/ui/qgsrasterlayerpropertiesbase.ui @@ -22,12 +22,6 @@ true - - 9 - - - 6 - @@ -38,24 +32,12 @@ Symbology - - 9 - - - 6 - Display - - 9 - - - 6 - @@ -116,9 +98,7 @@ - - 3 - 3 + 0 0 @@ -161,15 +141,13 @@ true - - 7 - 1 + 0 0 - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif"> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:13pt;font-family:Lucida Grande"> <p style="margin-top:14px" dir="ltr"><span style="font-weight:600">Notes</span></p> </body></html> @@ -188,12 +166,6 @@ Color Image - - 9 - - - 6 - @@ -292,12 +264,6 @@ Grayscale Image - - 9 - - - 6 - @@ -373,20 +339,8 @@ General - - 9 - - - 6 - - - 0 - - - 6 - @@ -396,10 +350,22 @@ Qt::Vertical - + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + 0 @@ -446,10 +412,22 @@ Qt::Vertical - + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + 0 @@ -496,10 +474,22 @@ Qt::Vertical - + 0 - + + 0 + + + 0 + + + 0 + + + 0 + + 0 @@ -571,12 +561,6 @@ - - 0 - - - 6 - @@ -616,23 +600,17 @@ true - - 9 - - - 6 - Maximum scale at which this layer will be displayed. - - 100000000 - 1 + + 100000000 + @@ -650,12 +628,12 @@ Minimum scale at which this layer will be displayed. - - 100000000 - 1 + + 100000000 + @@ -677,12 +655,6 @@ Spatial Reference System - - 9 - - - 6 - @@ -707,14 +679,12 @@ Metadata - - 9 - - - 6 - - + + + QTextEdit::AutoAll + + @@ -723,12 +693,6 @@ Pyramids - - 9 - - - 6 - @@ -739,9 +703,7 @@ - - 5 - 7 + 0 0 @@ -760,16 +722,14 @@ - - 7 - 7 + 5 0 - <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:9pt;font-family:Sans Serif"> -<p style="margin-top:18px" dir="ltr"><span style="font-size:15pt;font-weight:600">Description</span></p> + <html><head><meta name="qrichtext" content="1" /></head><body style="font-size:13pt;font-family:Lucida Grande"> +<p style="margin-top:18px" dir="ltr"><span style="font-size:21pt;font-weight:600">Description</span></p> <p dir="ltr">Large resolution raster layers can slow navigation in QGIS. By creating lower resolution copies of the data (pyramids) performance can be considerably improved as QGIS selects the most suitable resolution to use depending on the level of zoom. You must have write access in the directory where the original data is stored to build pyramids. </p> <p dir="ltr"><span style="color:#ff0000">Please note that building pyramids may alter the original data file and once created they cannot be removed.</span></p> <p dir="ltr"><span style="color:#ff0000">Please note that building pyramids could corrupt your image - always make a backup of your data first!</span></p> @@ -783,12 +743,6 @@ - - 0 - - - 6 - @@ -845,12 +799,6 @@ Histogram - - 9 - - - 6 - @@ -870,12 +818,6 @@ Options - - 9 - - - 6 - @@ -902,12 +844,12 @@ - - 1024 - 8 + + 1024 + 8 @@ -925,12 +867,6 @@ Chart Type - - 9 - - - 6 - @@ -961,9 +897,7 @@ - - 7 - 5 + 0 0 @@ -1003,16 +937,6 @@ - - Q3TextEdit - Q3Frame -
q3textedit.h
- - - Q3TextBrowser - Q3TextEdit -
Qt3Support/Q3TextBrowser
- Q3GroupBox QGroupBox @@ -1022,7 +946,12 @@ Q3ListBox Q3Frame -
Qt3Support/Q3ListBox
+
q3listbox.h
+ + + Q3TextEdit + Q3Frame +
q3textedit.h
 diff --git a/tests/Makefile.am b/tests/Makefile.am deleted file mode 100644 index e5c2500da3a..00000000000 --- a/tests/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -SUBDIRS = src - diff --git a/tests/src/Makefile.am b/tests/src/Makefile.am deleted file mode 100644 index 45d3fd451f6..00000000000 --- a/tests/src/Makefile.am +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -SUBDIRS = core \ - gui - -all: - @echo Running unit tests - ./runtests.sh - diff --git a/tests/src/core/Makefile.am b/tests/src/core/Makefile.am deleted file mode 100644 index 601d7aa4732..00000000000 --- a/tests/src/core/Makefile.am +++ /dev/null @@ -1,289 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -nodistdir : `pwd` -noinst_PROGRAMS = testqgsapplication \ - testqgsapplication \ - testqgscolortable \ - testqgscontexthelp \ - testqgscustomsymbol \ - testqgsdatamanager \ - testqgsdatasource \ - testqgsfeature \ - testqgsfeatureattribute \ - testqgsfield \ - testqgsgeometry \ - testqgsgeometryvertexindex \ - testqgsline \ - testqgslinesymbol \ - testqgsmarkercatalogue \ - testqgspluginitem \ - testqgspluginregistry \ - testqgspoint \ - testqgspolygonsymbol \ - testqgsprovidercountcalcevent \ - testqgsproviderextentcalcevent \ - testqgsprovidermetadata \ - testqgsproviderregistry \ - testqgsrangerenderitem \ - testqgsrasterdataprovider \ - testqgsrect \ - testqgsrenderer \ - testqgsrenderitem \ - testqgsscalecalculator \ - testqgssearchstring \ - testqgssearchtreenode \ - testqgssymbol \ - testqgsvectordataprovider -# testqgslabelattributes -# testqgsdistancearea -# testqgsbookmarkitem - -# -# Define some global variables that will be used for building each test -# - -GLOBALLDADD = $(QT_LDADD) \ - $(PG_LIB) \ - $(GDAL_LDADD) \ - -lproj \ - ../../../src/core/libqgis_core.la -GLOBALCXXFLAGS = $(CXXFLAGS) \ - $(EXTRA_CXXFLAGS) \ - $(GDAL_CFLAGS) \ - $(QT_CXXFLAGS) \ - $(GEOS_CFLAGS) \ - $(PG_INC) \ - -I../../../src/core/include - -# -# Instruction for running the qt4 meta object compiler -# - -%.moc.cpp: %.cpp - $(MOC) -o $@ $< - -BUILT_SOURCES = $(testqgsapplication_MOC) \ - $(testqgsbookmarkitem_MOC) \ - $(testqgscolortable_MOC) \ - $(testqgscontexthelp_MOC) \ - $(testqgscustomsymbol_MOC) \ - $(testqgsdatamanager_MOC) \ - $(testqgsdatasource_MOC) \ - $(testqgsdistancearea_MOC) \ - $(testqgsfeatureattribute_MOC) \ - $(testqgsfeature_MOC) \ - $(testqgsfield_MOC) \ - $(testqgsgeometry_MOC) \ - $(testqgsgeometryvertexindex_MOC) \ - $(testqgslabelattributes_MOC) \ - $(testqgsline_MOC) \ - $(testqgslinesymbol_MOC) \ - $(testqgsmarkercatalogue_MOC) \ - $(testqgspluginitem_MOC) \ - $(testqgspluginregistry_MOC) \ - $(testqgspoint_MOC) \ - $(testqgspolygonsymbol_MOC) \ - $(testqgsprovidercountcalcevent_MOC) \ - $(testqgsproviderextentcalcevent_MOC) \ - $(testqgsprovidermetadata_MOC) \ - $(testqgsproviderregistry_MOC) \ - $(testqgsrangerenderitem_MOC) \ - $(testqgsrasterdataprovider_MOC) \ - $(testqgsrect_MOC) \ - $(testqgsrenderer_MOC) \ - $(testqgsrenderitem_MOC) \ - $(testqgsscalecalculator_MOC) \ - $(testqgssearchstring_MOC) \ - $(testqgssearchtreenode_MOC) \ - $(testqgssymbol_MOC) \ - $(testqgsvectordataprovider_MOC) - -CLEANFILES = $(BUILT_SOURCES) - -# -# Specify the compilation files for each unit test now -# - -testqgsapplication_MOC = testqgsapplication.moc.cpp -testqgsapplication_SOURCES = testqgsapplication.cpp -testqgsapplication_LDADD = $(GLOBALLDADD) -testqgsapplication_CXXFLAGS = $(GLOBALCXXFLAGS) - - -testqgssymbol_MOC = testqgssymbol.moc.cpp -testqgssymbol_SOURCES = testqgssymbol.cpp -testqgssymbol_LDADD = $(GLOBALLDADD) -testqgssymbol_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsfield_MOC = testqgsfield.moc.cpp -testqgsfield_SOURCES = testqgsfield.cpp -testqgsfield_LDADD = $(GLOBALLDADD) -testqgsfield_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsfeature_MOC = testqgsfeature.moc.cpp -testqgsfeature_SOURCES = testqgsfeature.cpp -testqgsfeature_LDADD = $(GLOBALLDADD) -testqgsfeature_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsgeometry_MOC = testqgsgeometry.moc.cpp -testqgsgeometry_SOURCES = testqgsgeometry.cpp -testqgsgeometry_LDADD = $(GLOBALLDADD) -testqgsgeometry_CXXFLAGS = $(GLOBALCXXFLAGS) - -#testqgsbookmarkitem_MOC = testqgsbookmarkitem.moc.cpp -#testqgsbookmarkitem_SOURCES = testqgsbookmarkitem.cpp -#testqgsbookmarkitem_LDADD = $(GLOBALLDADD) -#testqgsbookmarkitem_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscolortable_MOC = testqgscolortable.moc.cpp -testqgscolortable_SOURCES = testqgscolortable.cpp -testqgscolortable_LDADD = $(GLOBALLDADD) -testqgscolortable_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscontexthelp_MOC = testqgscontexthelp.moc.cpp -testqgscontexthelp_SOURCES = testqgscontexthelp.cpp -testqgscontexthelp_LDADD = $(GLOBALLDADD) -testqgscontexthelp_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscustomsymbol_MOC = testqgscustomsymbol.moc.cpp -testqgscustomsymbol_SOURCES = testqgscustomsymbol.cpp -testqgscustomsymbol_LDADD = $(GLOBALLDADD) -testqgscustomsymbol_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsdatamanager_MOC = testqgsdatamanager.moc.cpp -testqgsdatamanager_SOURCES = testqgsdatamanager.cpp -testqgsdatamanager_LDADD = $(GLOBALLDADD) -testqgsdatamanager_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsdatasource_MOC = testqgsdatasource.moc.cpp -testqgsdatasource_SOURCES = testqgsdatasource.cpp -testqgsdatasource_LDADD = $(GLOBALLDADD) -testqgsdatasource_CXXFLAGS = $(GLOBALCXXFLAGS) - -#testqgsdistancearea_MOC = testqgsdistancearea.moc.cpp -#testqgsdistancearea_SOURCES = testqgsdistancearea.cpp -#testqgsdistancearea_LDADD = $(GLOBALLDADD) -#testqgsdistancearea_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsfeatureattribute_MOC = testqgsfeatureattribute.moc.cpp -testqgsfeatureattribute_SOURCES = testqgsfeatureattribute.cpp -testqgsfeatureattribute_LDADD = $(GLOBALLDADD) -testqgsfeatureattribute_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsgeometryvertexindex_MOC = testqgsgeometryvertexindex.moc.cpp -testqgsgeometryvertexindex_SOURCES = testqgsgeometryvertexindex.cpp -testqgsgeometryvertexindex_LDADD = $(GLOBALLDADD) -testqgsgeometryvertexindex_CXXFLAGS = $(GLOBALCXXFLAGS) - -#testqgslabelattributes_MOC = testqgslabelattributes.moc.cpp -#testqgslabelattributes_SOURCES = testqgslabelattributes.cpp -#testqgslabelattributes_LDADD = $(GLOBALLDADD) -#testqgslabelattributes_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsline_MOC = testqgsline.moc.cpp -testqgsline_SOURCES = testqgsline.cpp -testqgsline_LDADD = $(GLOBALLDADD) -testqgsline_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgslinesymbol_MOC = testqgslinesymbol.moc.cpp -testqgslinesymbol_SOURCES = testqgslinesymbol.cpp -testqgslinesymbol_LDADD = $(GLOBALLDADD) -testqgslinesymbol_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmarkercatalogue_MOC = testqgsmarkercatalogue.moc.cpp -testqgsmarkercatalogue_SOURCES = testqgsmarkercatalogue.cpp -testqgsmarkercatalogue_LDADD = $(GLOBALLDADD) -testqgsmarkercatalogue_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspluginitem_MOC = testqgspluginitem.moc.cpp -testqgspluginitem_SOURCES = testqgspluginitem.cpp -testqgspluginitem_LDADD = $(GLOBALLDADD) -testqgspluginitem_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspluginregistry_MOC = testqgspluginregistry.moc.cpp -testqgspluginregistry_SOURCES = testqgspluginregistry.cpp -testqgspluginregistry_LDADD = $(GLOBALLDADD) -testqgspluginregistry_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspoint_MOC = testqgspoint.moc.cpp -testqgspoint_SOURCES = testqgspoint.cpp -testqgspoint_LDADD = $(GLOBALLDADD) -testqgspoint_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspolygonsymbol_MOC = testqgspolygonsymbol.moc.cpp -testqgspolygonsymbol_SOURCES = testqgspolygonsymbol.cpp -testqgspolygonsymbol_LDADD = $(GLOBALLDADD) -testqgspolygonsymbol_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsprovidercountcalcevent_MOC = testqgsprovidercountcalcevent.moc.cpp -testqgsprovidercountcalcevent_SOURCES = testqgsprovidercountcalcevent.cpp -testqgsprovidercountcalcevent_LDADD = $(GLOBALLDADD) -testqgsprovidercountcalcevent_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsproviderextentcalcevent_MOC = testqgsproviderextentcalcevent.moc.cpp -testqgsproviderextentcalcevent_SOURCES = testqgsproviderextentcalcevent.cpp -testqgsproviderextentcalcevent_LDADD = $(GLOBALLDADD) -testqgsproviderextentcalcevent_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsprovidermetadata_MOC = testqgsprovidermetadata.moc.cpp -testqgsprovidermetadata_SOURCES = testqgsprovidermetadata.cpp -testqgsprovidermetadata_LDADD = $(GLOBALLDADD) -testqgsprovidermetadata_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsproviderregistry_MOC = testqgsproviderregistry.moc.cpp -testqgsproviderregistry_SOURCES = testqgsproviderregistry.cpp -testqgsproviderregistry_LDADD = $(GLOBALLDADD) -testqgsproviderregistry_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrangerenderitem_MOC = testqgsrangerenderitem.moc.cpp -testqgsrangerenderitem_SOURCES = testqgsrangerenderitem.cpp -testqgsrangerenderitem_LDADD = $(GLOBALLDADD) -testqgsrangerenderitem_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrasterdataprovider_MOC = testqgsrasterdataprovider.moc.cpp -testqgsrasterdataprovider_SOURCES = testqgsrasterdataprovider.cpp -testqgsrasterdataprovider_LDADD = $(GLOBALLDADD) -testqgsrasterdataprovider_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrect_MOC = testqgsrect.moc.cpp -testqgsrect_SOURCES = testqgsrect.cpp -testqgsrect_LDADD = $(GLOBALLDADD) -testqgsrect_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrenderer_MOC = testqgsrenderer.moc.cpp -testqgsrenderer_SOURCES = testqgsrenderer.cpp -testqgsrenderer_LDADD = $(GLOBALLDADD) -testqgsrenderer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrenderitem_MOC = testqgsrenderitem.moc.cpp -testqgsrenderitem_SOURCES = testqgsrenderitem.cpp -testqgsrenderitem_LDADD = $(GLOBALLDADD) -testqgsrenderitem_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsscalecalculator_MOC = testqgsscalecalculator.moc.cpp -testqgsscalecalculator_SOURCES = testqgsscalecalculator.cpp -testqgsscalecalculator_LDADD = $(GLOBALLDADD) -testqgsscalecalculator_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgssearchstring_MOC = testqgssearchstring.moc.cpp -testqgssearchstring_SOURCES = testqgssearchstring.cpp -testqgssearchstring_LDADD = $(GLOBALLDADD) -testqgssearchstring_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgssearchtreenode_MOC = testqgssearchtreenode.moc.cpp -testqgssearchtreenode_SOURCES = testqgssearchtreenode.cpp -testqgssearchtreenode_LDADD = $(GLOBALLDADD) -testqgssearchtreenode_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsvectordataprovider_MOC = testqgsvectordataprovider.moc.cpp -testqgsvectordataprovider_SOURCES = testqgsvectordataprovider.cpp -testqgsvectordataprovider_LDADD = $(GLOBALLDADD) -testqgsvectordataprovider_CXXFLAGS = $(GLOBALCXXFLAGS) diff --git a/tests/src/gui/Makefile.am b/tests/src/gui/Makefile.am deleted file mode 100644 index 828ebcc0729..00000000000 --- a/tests/src/gui/Makefile.am +++ /dev/null @@ -1,549 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -noinst_PROGRAMS = testqgisapp \ - testqgsabout \ - testqgsaddattrdialog \ - testqgsattributeactiondialog \ - testqgsattributedialog \ - testqgsattributetable \ - testqgsattributetabledisplay \ - testqgsbookmarks \ - testqgsclipboard \ - testqgscontinuouscolordialog \ - testqgscontinuouscolorrenderer \ - testqgscoordinatetransform \ - testqgscustomprojectiondialog \ - testqgsdelattrdialog \ - testqgsencodingfiledialog \ - testqgsfillstylewidget \ - testqgsgeomtypedialog \ - testqgsgraduatedsymboldialog \ - testqgsgraduatedsymbolrenderer \ - testqgshelpviewer \ - testqgsidentifyresults \ - testqgslabeldialog \ - testqgslayerprojectionselector \ - testqgslinestyledialog \ - testqgslinestylewidget \ - testqgsludialog \ - testqgsmapcanvas \ - testqgsmapcanvasitem \ - testqgsmapcanvasmap \ - testqgsmaplayer \ - testqgsmaplayerregistry \ - testqgsmapoverviewcanvas \ - testqgsmaprender \ - testqgsmapserverexport \ - testqgsmaptool \ - testqgsmaptoolcapture \ - testqgsmaptoolidentify \ - testqgsmaptoolpan \ - testqgsmaptoolselect \ - testqgsmaptoolvertexedit \ - testqgsmaptoolzoom \ - testqgsmarkerdialog \ - testqgsmeasure \ - testqgsmessageviewer \ - testqgsnewconnection \ - testqgsnewhttpconnection \ - testqgsoptions \ - testqgspastetransformations \ - testqgspatterndialog \ - testqgspgquerybuilder \ - testqgspluginmanager \ - testqgspluginmetadata \ - testqgspointstylewidget \ - testqgsproject \ - testqgsprojectproperties \ - testqgsrasterlayerproperties \ - testqgsrubberband \ - testqgsrunprocess \ - testqgssearchquerybuilder \ - testqgsserversourceselect \ - testqgssinglesymboldialog \ - testqgssinglesymbolrenderer \ - testqgsspatialrefsys \ - testqgsuniquevaluedialog \ - testqgsuniquevaluerenderer \ - testqgsvectorfilewriter \ - testqgsvectorlayer \ - testqgsvectorlayerproperties \ - testqgsvertexmarker - -# testqgsdbsourceselect -# testqgslabel -# testqgsvectorsymbologywidget - -# -# Define some global variables that will be used for building each test -# - -GLOBALLDADD = $(QT_LDADD) \ - $(PG_LIB) \ - $(GDAL_LDADD) \ - -lproj \ - ../../../src/core/libqgis_core.la \ - ../../../src/gui/libqgis_gui.la -GLOBALCXXFLAGS = $(CXXFLAGS) \ - $(EXTRA_CXXFLAGS) \ - $(GDAL_CFLAGS) \ - $(QT_CXXFLAGS) \ - $(PG_INC) \ - -I../../../src/core/include \ - -I../../../src/widgets/projectionselector \ - -I../../../src/ui \ - -I../../../src/gui - -# -# Instruction for running the qt4 meta object compiler -# - -%.moc.cpp: %.cpp - $(MOC) -o $@ $< - -BUILT_SOURCES = $(testqgisapp_MOC) \ - $(testqgsvertexmarker_MOC) \ - $(testqgsvectorsymbologywidget_MOC) \ - $(testqgsvectorlayerproperties_MOC) \ - $(testqgsvectorlayer_MOC) \ - $(testqgsvectorfilewriter_MOC) \ - $(testqgsuniquevaluerenderer_MOC) \ - $(testqgsuniquevaluedialog_MOC) \ - $(testqgsspatialrefsys_MOC) \ - $(testqgssinglesymbolrenderer_MOC) \ - $(testqgssinglesymboldialog_MOC) \ - $(testqgsserversourceselect_MOC) \ - $(testqgssearchquerybuilder_MOC) \ - $(testqgsrunprocess_MOC) \ - $(testqgsrubberband_MOC) \ - $(testqgsrasterlayerproperties_MOC) \ - $(testqgsprojectproperties_MOC) \ - $(testqgsproject_MOC) \ - $(testqgspointstylewidget_MOC) \ - $(testqgspluginmetadata_MOC) \ - $(testqgspluginmanager_MOC) \ - $(testqgspgquerybuilder_MOC) \ - $(testqgspatterndialog_MOC) \ - $(testqgspastetransformations_MOC) \ - $(testqgsoptions_MOC) \ - $(testqgsnewhttpconnection_MOC) \ - $(testqgsnewconnection_MOC) \ - $(testqgsmessageviewer_MOC) \ - $(testqgsmeasure_MOC) \ - $(testqgsmarkerdialog_MOC) \ - $(testqgsmaptoolzoom_MOC) \ - $(testqgsmaptoolvertexedit_MOC) \ - $(testqgsmaptoolselect_MOC) \ - $(testqgsmaptoolpan_MOC) \ - $(testqgsmaptoolidentify_MOC) \ - $(testqgsmaptool_MOC) \ - $(testqgsmaptoolcapture_MOC) \ - $(testqgsmapserverexport_MOC) \ - $(testqgsmaprender_MOC) \ - $(testqgsmapoverviewcanvas_MOC) \ - $(testqgsmaplayerregistry_MOC) \ - $(testqgsmaplayer_MOC) \ - $(testqgsmapcanvasmap_MOC) \ - $(testqgsmapcanvasitem_MOC) \ - $(testqgsmapcanvas_MOC) \ - $(testqgsludialog_MOC) \ - $(testqgslinestylewidget_MOC) \ - $(testqgslinestyledialog_MOC) \ - $(testqgslayerprojectionselector_MOC) \ - $(testqgslabeldialog_MOC) \ - $(testqgslabel_MOC) \ - $(testqgsidentifyresults_MOC) \ - $(testqgshelpviewer_MOC) \ - $(testqgsgraduatedsymbolrenderer_MOC) \ - $(testqgsgraduatedsymboldialog_MOC) \ - $(testqgsgeomtypedialog_MOC) \ - $(testqgsfillstylewidget_MOC) \ - $(testqgsencodingfiledialog_MOC) \ - $(testqgsdelattrdialog_MOC) \ - $(testqgsdbsourceselect_MOC) \ - $(testqgscustomprojectiondialog_MOC) \ - $(testqgscoordinatetransform_MOC) \ - $(testqgscontinuouscolorrenderer_MOC) \ - $(testqgscontinuouscolordialog_MOC) \ - $(testqgsclipboard_MOC) \ - $(testqgsbookmarks_MOC) \ - $(testqgsattributetabledisplay_MOC) \ - $(testqgsattributetable_MOC) \ - $(testqgsattributedialog_MOC) \ - $(testqgsattributeactiondialog_MOC) \ - $(testqgsaddattrdialog_MOC) \ - $(testqgsabout_MOC) - -CLEANFILES = $(BUILT_SOURCES) - -# -# Specify the compilation files for each unit test now -# - -testqgisapp_MOC = testqgisapp.moc.cpp -testqgisapp_SOURCES = testqgisapp.cpp -testqgisapp_LDADD = $(GLOBALLDADD) -testqgisapp_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsabout_MOC = testqgsabout.moc.cpp -testqgsabout_SOURCES = testqgsabout.cpp -testqgsabout_LDADD = $(GLOBALLDADD) -testqgsabout_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsaddattrdialog_MOC = testqgsaddattrdialog.moc.cpp -testqgsaddattrdialog_SOURCES = testqgsaddattrdialog.cpp -testqgsaddattrdialog_LDADD = $(GLOBALLDADD) -testqgsaddattrdialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsattributeactiondialog_MOC = testqgsattributeactiondialog.moc.cpp -testqgsattributeactiondialog_SOURCES = testqgsattributeactiondialog.cpp -testqgsattributeactiondialog_LDADD = $(GLOBALLDADD) -testqgsattributeactiondialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsattributedialog_MOC = testqgsattributedialog.moc.cpp -testqgsattributedialog_SOURCES = testqgsattributedialog.cpp -testqgsattributedialog_LDADD = $(GLOBALLDADD) -testqgsattributedialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsattributetable_MOC = testqgsattributetable.moc.cpp -testqgsattributetable_SOURCES = testqgsattributetable.cpp -testqgsattributetable_LDADD = $(GLOBALLDADD) -testqgsattributetable_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsattributetabledisplay_MOC = testqgsattributetabledisplay.moc.cpp -testqgsattributetabledisplay_SOURCES = testqgsattributetabledisplay.cpp -testqgsattributetabledisplay_LDADD = $(GLOBALLDADD) -testqgsattributetabledisplay_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsbookmarks_MOC = testqgsbookmarks.moc.cpp -testqgsbookmarks_SOURCES = testqgsbookmarks.cpp -testqgsbookmarks_LDADD = $(GLOBALLDADD) -testqgsbookmarks_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsclipboard_MOC = testqgsclipboard.moc.cpp -testqgsclipboard_SOURCES = testqgsclipboard.cpp -testqgsclipboard_LDADD = $(GLOBALLDADD) -testqgsclipboard_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscontinuouscolordialog_MOC = testqgscontinuouscolordialog.moc.cpp -testqgscontinuouscolordialog_SOURCES = testqgscontinuouscolordialog.cpp -testqgscontinuouscolordialog_LDADD = $(GLOBALLDADD) -testqgscontinuouscolordialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscontinuouscolorrenderer_MOC = testqgscontinuouscolorrenderer.moc.cpp -testqgscontinuouscolorrenderer_SOURCES = testqgscontinuouscolorrenderer.cpp -testqgscontinuouscolorrenderer_LDADD = $(GLOBALLDADD) -testqgscontinuouscolorrenderer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscoordinatetransform_MOC = testqgscoordinatetransform.moc.cpp -testqgscoordinatetransform_SOURCES = testqgscoordinatetransform.cpp -testqgscoordinatetransform_LDADD = $(GLOBALLDADD) -testqgscoordinatetransform_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgscustomprojectiondialog_MOC = testqgscustomprojectiondialog.moc.cpp -testqgscustomprojectiondialog_SOURCES = testqgscustomprojectiondialog.cpp -testqgscustomprojectiondialog_LDADD = $(GLOBALLDADD) -testqgscustomprojectiondialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsdbsourceselect_MOC = testqgsdbsourceselect.moc.cpp -testqgsdbsourceselect_SOURCES = testqgsdbsourceselect.cpp -testqgsdbsourceselect_LDADD = $(GLOBALLDADD) -testqgsdbsourceselect_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsdelattrdialog_MOC = testqgsdelattrdialog.moc.cpp -testqgsdelattrdialog_SOURCES = testqgsdelattrdialog.cpp -testqgsdelattrdialog_LDADD = $(GLOBALLDADD) -testqgsdelattrdialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsencodingfiledialog_MOC = testqgsencodingfiledialog.moc.cpp -testqgsencodingfiledialog_SOURCES = testqgsencodingfiledialog.cpp -testqgsencodingfiledialog_LDADD = $(GLOBALLDADD) -testqgsencodingfiledialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsfillstylewidget_MOC = testqgsfillstylewidget.moc.cpp -testqgsfillstylewidget_SOURCES = testqgsfillstylewidget.cpp -testqgsfillstylewidget_LDADD = $(GLOBALLDADD) -testqgsfillstylewidget_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsgeomtypedialog_MOC = testqgsgeomtypedialog.moc.cpp -testqgsgeomtypedialog_SOURCES = testqgsgeomtypedialog.cpp -testqgsgeomtypedialog_LDADD = $(GLOBALLDADD) -testqgsgeomtypedialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsgraduatedsymboldialog_MOC = testqgsgraduatedsymboldialog.moc.cpp -testqgsgraduatedsymboldialog_SOURCES = testqgsgraduatedsymboldialog.cpp -testqgsgraduatedsymboldialog_LDADD = $(GLOBALLDADD) -testqgsgraduatedsymboldialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsgraduatedsymbolrenderer_MOC = testqgsgraduatedsymbolrenderer.moc.cpp -testqgsgraduatedsymbolrenderer_SOURCES = testqgsgraduatedsymbolrenderer.cpp -testqgsgraduatedsymbolrenderer_LDADD = $(GLOBALLDADD) -testqgsgraduatedsymbolrenderer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgshelpviewer_MOC = testqgshelpviewer.moc.cpp -testqgshelpviewer_SOURCES = testqgshelpviewer.cpp -testqgshelpviewer_LDADD = $(GLOBALLDADD) -testqgshelpviewer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsidentifyresults_MOC = testqgsidentifyresults.moc.cpp -testqgsidentifyresults_SOURCES = testqgsidentifyresults.cpp -testqgsidentifyresults_LDADD = $(GLOBALLDADD) -testqgsidentifyresults_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgslabel_MOC = testqgslabel.moc.cpp -testqgslabel_SOURCES = testqgslabel.cpp -testqgslabel_LDADD = $(GLOBALLDADD) -testqgslabel_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgslabeldialog_MOC = testqgslabeldialog.moc.cpp -testqgslabeldialog_SOURCES = testqgslabeldialog.cpp -testqgslabeldialog_LDADD = $(GLOBALLDADD) -testqgslabeldialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgslayerprojectionselector_MOC = testqgslayerprojectionselector.moc.cpp -testqgslayerprojectionselector_SOURCES = testqgslayerprojectionselector.cpp -testqgslayerprojectionselector_LDADD = $(GLOBALLDADD) -testqgslayerprojectionselector_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgslinestyledialog_MOC = testqgslinestyledialog.moc.cpp -testqgslinestyledialog_SOURCES = testqgslinestyledialog.cpp -testqgslinestyledialog_LDADD = $(GLOBALLDADD) -testqgslinestyledialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgslinestylewidget_MOC = testqgslinestylewidget.moc.cpp -testqgslinestylewidget_SOURCES = testqgslinestylewidget.cpp -testqgslinestylewidget_LDADD = $(GLOBALLDADD) -testqgslinestylewidget_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsludialog_MOC = testqgsludialog.moc.cpp -testqgsludialog_SOURCES = testqgsludialog.cpp -testqgsludialog_LDADD = $(GLOBALLDADD) -testqgsludialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmapcanvas_MOC = testqgsmapcanvas.moc.cpp -testqgsmapcanvas_SOURCES = testqgsmapcanvas.cpp -testqgsmapcanvas_LDADD = $(GLOBALLDADD) -testqgsmapcanvas_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmapcanvasitem_MOC = testqgsmapcanvasitem.moc.cpp -testqgsmapcanvasitem_SOURCES = testqgsmapcanvasitem.cpp -testqgsmapcanvasitem_LDADD = $(GLOBALLDADD) -testqgsmapcanvasitem_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmapcanvasmap_MOC = testqgsmapcanvasmap.moc.cpp -testqgsmapcanvasmap_SOURCES = testqgsmapcanvasmap.cpp -testqgsmapcanvasmap_LDADD = $(GLOBALLDADD) -testqgsmapcanvasmap_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaplayer_MOC = testqgsmaplayer.moc.cpp -testqgsmaplayer_SOURCES = testqgsmaplayer.cpp -testqgsmaplayer_LDADD = $(GLOBALLDADD) -testqgsmaplayer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaplayerregistry_MOC = testqgsmaplayerregistry.moc.cpp -testqgsmaplayerregistry_SOURCES = testqgsmaplayerregistry.cpp -testqgsmaplayerregistry_LDADD = $(GLOBALLDADD) -testqgsmaplayerregistry_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmapoverviewcanvas_MOC = testqgsmapoverviewcanvas.moc.cpp -testqgsmapoverviewcanvas_SOURCES = testqgsmapoverviewcanvas.cpp -testqgsmapoverviewcanvas_LDADD = $(GLOBALLDADD) -testqgsmapoverviewcanvas_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaprender_MOC = testqgsmaprender.moc.cpp -testqgsmaprender_SOURCES = testqgsmaprender.cpp -testqgsmaprender_LDADD = $(GLOBALLDADD) -testqgsmaprender_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmapserverexport_MOC = testqgsmapserverexport.moc.cpp -testqgsmapserverexport_SOURCES = testqgsmapserverexport.cpp -testqgsmapserverexport_LDADD = $(GLOBALLDADD) -testqgsmapserverexport_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptoolcapture_MOC = testqgsmaptoolcapture.moc.cpp -testqgsmaptoolcapture_SOURCES = testqgsmaptoolcapture.cpp -testqgsmaptoolcapture_LDADD = $(GLOBALLDADD) -testqgsmaptoolcapture_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptool_MOC = testqgsmaptool.moc.cpp -testqgsmaptool_SOURCES = testqgsmaptool.cpp -testqgsmaptool_LDADD = $(GLOBALLDADD) -testqgsmaptool_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptoolidentify_MOC = testqgsmaptoolidentify.moc.cpp -testqgsmaptoolidentify_SOURCES = testqgsmaptoolidentify.cpp -testqgsmaptoolidentify_LDADD = $(GLOBALLDADD) -testqgsmaptoolidentify_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptoolpan_MOC = testqgsmaptoolpan.moc.cpp -testqgsmaptoolpan_SOURCES = testqgsmaptoolpan.cpp -testqgsmaptoolpan_LDADD = $(GLOBALLDADD) -testqgsmaptoolpan_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptoolselect_MOC = testqgsmaptoolselect.moc.cpp -testqgsmaptoolselect_SOURCES = testqgsmaptoolselect.cpp -testqgsmaptoolselect_LDADD = $(GLOBALLDADD) -testqgsmaptoolselect_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptoolvertexedit_MOC = testqgsmaptoolvertexedit.moc.cpp -testqgsmaptoolvertexedit_SOURCES = testqgsmaptoolvertexedit.cpp -testqgsmaptoolvertexedit_LDADD = $(GLOBALLDADD) -testqgsmaptoolvertexedit_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmaptoolzoom_MOC = testqgsmaptoolzoom.moc.cpp -testqgsmaptoolzoom_SOURCES = testqgsmaptoolzoom.cpp -testqgsmaptoolzoom_LDADD = $(GLOBALLDADD) -testqgsmaptoolzoom_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmarkerdialog_MOC = testqgsmarkerdialog.moc.cpp -testqgsmarkerdialog_SOURCES = testqgsmarkerdialog.cpp -testqgsmarkerdialog_LDADD = $(GLOBALLDADD) -testqgsmarkerdialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmeasure_MOC = testqgsmeasure.moc.cpp -testqgsmeasure_SOURCES = testqgsmeasure.cpp -testqgsmeasure_LDADD = $(GLOBALLDADD) -testqgsmeasure_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsmessageviewer_MOC = testqgsmessageviewer.moc.cpp -testqgsmessageviewer_SOURCES = testqgsmessageviewer.cpp -testqgsmessageviewer_LDADD = $(GLOBALLDADD) -testqgsmessageviewer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsnewconnection_MOC = testqgsnewconnection.moc.cpp -testqgsnewconnection_SOURCES = testqgsnewconnection.cpp -testqgsnewconnection_LDADD = $(GLOBALLDADD) -testqgsnewconnection_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsnewhttpconnection_MOC = testqgsnewhttpconnection.moc.cpp -testqgsnewhttpconnection_SOURCES = testqgsnewhttpconnection.cpp -testqgsnewhttpconnection_LDADD = $(GLOBALLDADD) -testqgsnewhttpconnection_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsoptions_MOC = testqgsoptions.moc.cpp -testqgsoptions_SOURCES = testqgsoptions.cpp -testqgsoptions_LDADD = $(GLOBALLDADD) -testqgsoptions_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspastetransformations_MOC = testqgspastetransformations.moc.cpp -testqgspastetransformations_SOURCES = testqgspastetransformations.cpp -testqgspastetransformations_LDADD = $(GLOBALLDADD) -testqgspastetransformations_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspatterndialog_MOC = testqgspatterndialog.moc.cpp -testqgspatterndialog_SOURCES = testqgspatterndialog.cpp -testqgspatterndialog_LDADD = $(GLOBALLDADD) -testqgspatterndialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspgquerybuilder_MOC = testqgspgquerybuilder.moc.cpp -testqgspgquerybuilder_SOURCES = testqgspgquerybuilder.cpp -testqgspgquerybuilder_LDADD = $(GLOBALLDADD) -testqgspgquerybuilder_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspluginmanager_MOC = testqgspluginmanager.moc.cpp -testqgspluginmanager_SOURCES = testqgspluginmanager.cpp -testqgspluginmanager_LDADD = $(GLOBALLDADD) -testqgspluginmanager_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspluginmetadata_MOC = testqgspluginmetadata.moc.cpp -testqgspluginmetadata_SOURCES = testqgspluginmetadata.cpp -testqgspluginmetadata_LDADD = $(GLOBALLDADD) -testqgspluginmetadata_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgspointstylewidget_MOC = testqgspointstylewidget.moc.cpp -testqgspointstylewidget_SOURCES = testqgspointstylewidget.cpp -testqgspointstylewidget_LDADD = $(GLOBALLDADD) -testqgspointstylewidget_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsproject_MOC = testqgsproject.moc.cpp -testqgsproject_SOURCES = testqgsproject.cpp -testqgsproject_LDADD = $(GLOBALLDADD) -testqgsproject_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsprojectproperties_MOC = testqgsprojectproperties.moc.cpp -testqgsprojectproperties_SOURCES = testqgsprojectproperties.cpp -testqgsprojectproperties_LDADD = $(GLOBALLDADD) -testqgsprojectproperties_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrasterlayerproperties_MOC = testqgsrasterlayerproperties.moc.cpp -testqgsrasterlayerproperties_SOURCES = testqgsrasterlayerproperties.cpp -testqgsrasterlayerproperties_LDADD = $(GLOBALLDADD) -testqgsrasterlayerproperties_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrubberband_MOC = testqgsrubberband.moc.cpp -testqgsrubberband_SOURCES = testqgsrubberband.cpp -testqgsrubberband_LDADD = $(GLOBALLDADD) -testqgsrubberband_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsrunprocess_MOC = testqgsrunprocess.moc.cpp -testqgsrunprocess_SOURCES = testqgsrunprocess.cpp -testqgsrunprocess_LDADD = $(GLOBALLDADD) -testqgsrunprocess_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgssearchquerybuilder_MOC = testqgssearchquerybuilder.moc.cpp -testqgssearchquerybuilder_SOURCES = testqgssearchquerybuilder.cpp -testqgssearchquerybuilder_LDADD = $(GLOBALLDADD) -testqgssearchquerybuilder_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsserversourceselect_MOC = testqgsserversourceselect.moc.cpp -testqgsserversourceselect_SOURCES = testqgsserversourceselect.cpp -testqgsserversourceselect_LDADD = $(GLOBALLDADD) -testqgsserversourceselect_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgssinglesymboldialog_MOC = testqgssinglesymboldialog.moc.cpp -testqgssinglesymboldialog_SOURCES = testqgssinglesymboldialog.cpp -testqgssinglesymboldialog_LDADD = $(GLOBALLDADD) -testqgssinglesymboldialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgssinglesymbolrenderer_MOC = testqgssinglesymbolrenderer.moc.cpp -testqgssinglesymbolrenderer_SOURCES = testqgssinglesymbolrenderer.cpp -testqgssinglesymbolrenderer_LDADD = $(GLOBALLDADD) -testqgssinglesymbolrenderer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsspatialrefsys_MOC = testqgsspatialrefsys.moc.cpp -testqgsspatialrefsys_SOURCES = testqgsspatialrefsys.cpp -testqgsspatialrefsys_LDADD = $(GLOBALLDADD) -testqgsspatialrefsys_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsuniquevaluedialog_MOC = testqgsuniquevaluedialog.moc.cpp -testqgsuniquevaluedialog_SOURCES = testqgsuniquevaluedialog.cpp -testqgsuniquevaluedialog_LDADD = $(GLOBALLDADD) -testqgsuniquevaluedialog_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsuniquevaluerenderer_MOC = testqgsuniquevaluerenderer.moc.cpp -testqgsuniquevaluerenderer_SOURCES = testqgsuniquevaluerenderer.cpp -testqgsuniquevaluerenderer_LDADD = $(GLOBALLDADD) -testqgsuniquevaluerenderer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsvectorfilewriter_MOC = testqgsvectorfilewriter.moc.cpp -testqgsvectorfilewriter_SOURCES = testqgsvectorfilewriter.cpp -testqgsvectorfilewriter_LDADD = $(GLOBALLDADD) -testqgsvectorfilewriter_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsvectorlayer_MOC = testqgsvectorlayer.moc.cpp -testqgsvectorlayer_SOURCES = testqgsvectorlayer.cpp -testqgsvectorlayer_LDADD = $(GLOBALLDADD) -testqgsvectorlayer_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsvectorlayerproperties_MOC = testqgsvectorlayerproperties.moc.cpp -testqgsvectorlayerproperties_SOURCES = testqgsvectorlayerproperties.cpp -testqgsvectorlayerproperties_LDADD = $(GLOBALLDADD) -testqgsvectorlayerproperties_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsvectorsymbologywidget_MOC = testqgsvectorsymbologywidget.moc.cpp -testqgsvectorsymbologywidget_SOURCES = testqgsvectorsymbologywidget.cpp -testqgsvectorsymbologywidget_LDADD = $(GLOBALLDADD) -testqgsvectorsymbologywidget_CXXFLAGS = $(GLOBALCXXFLAGS) - -testqgsvertexmarker_MOC = testqgsvertexmarker.moc.cpp -testqgsvertexmarker_SOURCES = testqgsvertexmarker.cpp -testqgsvertexmarker_LDADD = $(GLOBALLDADD) -testqgsvertexmarker_CXXFLAGS = $(GLOBALCXXFLAGS) diff --git a/tools/Makefile.am b/tools/Makefile.am deleted file mode 100644 index 73d1fbd7a77..00000000000 --- a/tools/Makefile.am +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (C) 2004 Jens Oberender -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id$ -if USE_PYTHON -MAPSERVER = mapserver_export -endif - -SUBDIRS = qgis_config $(MAPSERVER) - -m4filedir = $(datadir)/aclocal - -m4file_DATA = qgis.m4 - -m4file_SOURCE = qgisdetect.m4 - -$(m4file_DATA): $(m4file_SOURCE) - cat ../acinclude.m4 $(m4file_SOURCE) > $(m4file_DATA) - -EXTRA_DIST = $(m4file_SOURCE) - -clean: - rm -f $(m4file_DATA) diff --git a/tools/mapserver_export/Makefile.am b/tools/mapserver_export/Makefile.am deleted file mode 100644 index b706934b41c..00000000000 --- a/tools/mapserver_export/Makefile.am +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (C) 2004 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -# -# $Id: Makefile.am 4200 2005-11-12 01:37:49Z gsherman $ - -bin_PROGRAMS = msexport -if HAVE_QTMAC -MAC = mac -endif - -if !HAVE_QTMAC -PREFIX=-DPREFIX=\"$(prefix)\" -PLUGINPATH=-DPLUGINPATH=\"$(pkglibdir)\" -PKGDATAPATH=-DPKGDATAPATH=\"$(pkgdatadir)\" -endif - -%.moc.cpp: %.h - $(MOC) -o $@ $< - -ui_%.h: %.ui - $(UIC) -o $@ $< - -#uic $< -o $@ - -# %.h: %.ui -# $(UIC) -o $@ $< -# -# %.cpp: %.ui -# $(UIC) -o $@ -impl $*.h $< - -msexport_MOC = qgsmapserverexport.moc.cpp - - -msexport_UI = ui_qgsmapserverexportbase.h - -msexport_UIC = qgsmapserverexportbase.ui - -msexport_SOURCES = qgsmapserverexport.cpp \ - qgsmapserverexport.h \ - ms_main.cpp \ - msexport_wrap.cxx \ - $(msexport_UI) \ - $(msexport_UIC) \ - $(msexport_MOC) - - - -# UI dependencies -qgsmapserverexportbase.cpp: qgsmapserverexportbase.ui qgsmapserverexportbase.h -qgsmapserverexportbase.h: qgsmapserverexportbase.ui - -BUILT_SOURCES = $(msexport_MOC) $(msexport_UI) - - - -msexport_LDADD = $(QT_LDADD) $(PG_LIB) $(PYTHON_LIB) $(PROJ_LIB) ../../src/core/libqgis_core.la ../../src/gui/libqgis_gui.la - -msexport_CXXFLAGS = $(CXXFLAGS) $(PKGDATAPATH) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PYTHON_INCLUDE_DIR) -I../../src - -CLEANFILES = $(BUILT_SOURCES) - -lib_LTLIBRARIES = libmsexport.la - -libmsexport_la_SOURCES = qgsmapserverexport.cpp qgsmapserverexport.moc.cpp msexport_wrap.cxx - -libmsexport_la_LIBADD = $(PYTHON_LIB) $(QT_LDADD) -libmsexport_la_LDFLAGS = -version-info $(INTERFACE_VERSION) -libmsexport_la_CXXFLAGS = $(CXXFLAGS) $(PKGDATAPATH) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PYTHON_INCLUDE_DIR) -I../../src - -# Qt/Mac app needs to be inside a bundle to function correctly -MACBINDIR = $(bindir)/msexport.app/Contents/MacOS - -install-exec-hook: -if HAVE_QTMAC - $(mkinstalldirs) $(MACBINDIR) - mv $(bindir)/msexport $(MACBINDIR) -endif - - -# -# Put script into an appropriate dir -# -pythondir = ${pkgdatadir}/python -if HAVE_QTMAC - pythondir=$(MACBINDIR)/share/qgis/python -endif - -python_DATA = *.py - -EXTRA_DIST = $(msexport_UIC) \ - $(python_DATA) diff --git a/tools/qgis_config/Makefile.am b/tools/qgis_config/Makefile.am deleted file mode 100644 index f5d8cb95cfd..00000000000 --- a/tools/qgis_config/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2003 Gary Sherman -# -# This file is free software; as a special exception the author gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - -PREFIX=-DPREFIX=\"$(prefix)\" -INCLUDE_DIR=-DINCLUDE_DIR=\"$(prefix)/include\" -LIB_DIR=-DLIB_DIR=\"${libdir}\" -BIN_DIR=-DBIN_DIR=\"${exec_prefix}/bin\" -PLUGIN_DIR=-DPLUGIN_DIR=\"${pkglibdir}\" -VERSION=-DMAJOR_VERSION=\"$(MAJOR_VERSION)\" -DMINOR_VERSION=\"$(MINOR_VERSION)\" -DMICRO_VERSION=\"$(MICRO_VERSION)\" -DEXTRA_VERSION=\"$(EXTRA_VERSION)\" - -## main app -bin_PROGRAMS = qgis-config - -## ancillary library for plug-ins - -qgis_config_SOURCES = qgis_config.cpp -qgis_config_CXXFLAGS = $(PREFIX) $(INCLUDE_DIR) $(LIB_DIR) $(BIN_DIR) $(PLUGIN_DIR) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(DEBUG_QGIS) $(VERSION)