sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

minor housekeeping

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@246 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman 2003-08-24 22:14:42 +00:00
parent 3402f946ab
commit 7163fe27e7
9 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile
View File

@ -1,6 +1,6 @@
#############################################################################
# Makefile for building: qgis
# Generated by qmake (1.04a) (Qt 3.1.1) on: Tue Jun 10 19:53:00 2003
# Generated by qmake (1.06c) (Qt 3.2.0) on: Fri Aug 22 10:17:43 2003
# Project: qgis.pro
# Template: subdirs
# Command: $(QMAKE) -o Makefile qgis.pro
@ -9,6 +9,8 @@
MAKEFILE = Makefile
QMAKE = qmake
DEL_FILE = rm -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
SUBTARGETS = \
sub-src \
sub-plugins
@ -18,16 +20,18 @@ first: all
all: Makefile $(SUBTARGETS)
src/$(MAKEFILE):
cd src && $(QMAKE) -o $(MAKEFILE)
@$(CHK_DIR_EXISTS) "src" || $(MKDIR) "src"
cd src && $(QMAKE) src.pro -o $(MAKEFILE)
sub-src: src/$(MAKEFILE) FORCE
cd src && $(MAKE) -f $(MAKEFILE)
plugins/$(MAKEFILE):
cd plugins && $(QMAKE) -o $(MAKEFILE)
@$(CHK_DIR_EXISTS) "plugins" || $(MKDIR) "plugins"
cd plugins && $(QMAKE) plugins.pro -o $(MAKEFILE)
sub-plugins: plugins/$(MAKEFILE) FORCE
cd plugins && $(MAKE) -f $(MAKEFILE)
Makefile: qgis.pro $(QTDIR)/mkspecs/default/qmake.conf
Makefile: qgis.pro /usr/local/qt-x11-free-3.2.0/mkspecs/default/qmake.conf
$(QMAKE) -o Makefile qgis.pro
qmake: qmake_all
@$(QMAKE) -o Makefile qgis.pro
@ -36,7 +40,7 @@ all: $(SUBTARGETS)
qmake_all: src/$(MAKEFILE) plugins/$(MAKEFILE)
( [ -d src ] && cd src ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
( [ -d plugins ] && cd plugins ; grep "^qmake_all:" $(MAKEFILE) && $(MAKE) -f $(MAKEFILE) qmake_all; ) || true
clean uninstall install uiclean mocclean lexclean yaccclean: qmake_all FORCE
clean uninstall uicables mocables install uiclean mocclean lexclean yaccclean: qmake_all FORCE
( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) $@; ) || true
( [ -d plugins ] && cd plugins ; $(MAKE) -f $(MAKEFILE) $@; ) || true
distclean: qmake_all FORCE

2
src/main.cpp
View File

@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */
#include <qapplication.h>
#include <qfont.h>
#include <qstring.h>

5
src/qgisapp.cpp
View File

@ -6,7 +6,7 @@
email : sherman at mrcc.com
Romans 3:23=>Romans 6:23=>Romans 10:9,10=>Romans 12
***************************************************************************/
/* $Id$ */
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
@ -15,6 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */
#include <dlfcn.h>
#include <qapplication.h>
@ -79,7 +80,7 @@ typedef QString name_t();
typedef QString description_t();
// version
static const char *qgisVersion = "0.0.12 pre 1 - July 4, 2003";
static const char *qgisVersion = "0.0.12 pre 2 - August 15, 2003";
static const int qgisVersionInt = 11;
// cursors
static unsigned char zoom_in_bits[] = {

2
src/qgisapp.h
View File

@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/*$Id$*/
/* $Id$ */
#ifndef QGISAPP_H
#define QGISAPP_H
class QCanvas;

1
src/qgsattributetable.cpp
View File

@ -15,6 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */
#include <qapplication.h>
#include <qcursor.h>
#include <qfont.h>

2
src/qgsattributetable.h
View File

@ -15,7 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */
#ifndef QGSATTRIBUTETABLE_H
#define QGSATTRIBUTETABLE_H

1
src/qgsshapefilelayer.cpp
View File

@ -15,6 +15,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */
#include <iostream>
#include <strstream>
#include <qapplication.h>

4
src/qgsshapefilelayer.h
View File

@ -5,7 +5,7 @@
copyright : (C) 2002 by Gary E.Sherman
email : sherman at mrcc.com
***************************************************************************/
/* $Id$ */
/***************************************************************************
* *
* This program is free software; you can redistribute it and/or modify *
@ -14,7 +14,7 @@
* (at your option) any later version. *
* *
***************************************************************************/
/* $Id$ */
#ifndef QGSSHAPEFILELAYER_H
#define QGSSHAPEFILELAYER_H
class QPainter;

21
src/src.pro
View File

@ -75,7 +75,21 @@ CONFIG += debug \
qt \
thread
TARGET = qgis
exists ( $(PGSQL)/bin/psql ){
# conditional tests for optional modules
#.............................
#PostgreSQL support
#.............................
contains (DEFINES, postgres){
message ("Checking PostgreSQL environment")
}
contains ( DEFINES, postgres ){
MYPGSQL=$$(PGSQL)
count(MYPGSQL, 1){
message ("PGSQL environment variable is defined")
message ( "Configuring to build with PostgreSQL support" )
LIBS += -L$(PGSQL)/lib -lpq++
INCLUDEPATH += $(PGSQL)/include
@ -90,3 +104,8 @@ exists ( $(PGSQL)/bin/psql ){
FORMS += qgsdbsourceselectbase.ui \
qgsnewconnectionbase.ui
}
count(MYPGSQL, 0){
message ("PGSQL environment variable is not defined. PostgreSQL excluded from build")
message ("To build with PostgreSQL support set PGSQL to point to your Postgres installation")
}
}