mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
changes to support libpq++ at postgresql 7.3
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@173 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
gsherman
parent
2771ebb0ab
commit
2313e97c71
29
Makefile
29
Makefile
@ -1,15 +1,13 @@
|
||||
#############################################################################
|
||||
# Makefile for building: qgis
|
||||
# Generated by qmake (1.03a) on: Sat Nov 30 12:46:47 2002
|
||||
# Generated by qmake (1.04a) (Qt 3.1.1) on: Mon Jan 20 21:17:56 2003
|
||||
# Project: qgis.pro
|
||||
# Template: subdirs
|
||||
# Command: $(QMAKE) qgis.pro
|
||||
# Command: $(QMAKE) -o Makefile qgis.pro
|
||||
#############################################################################
|
||||
|
||||
MAKEFILE = Makefile
|
||||
QMAKE = qmake
|
||||
SUBDIRS = src \
|
||||
plugins
|
||||
DEL_FILE = rm -f
|
||||
SUBTARGETS = \
|
||||
sub-src \
|
||||
@ -20,29 +18,30 @@ first: all
|
||||
all: Makefile $(SUBTARGETS)
|
||||
|
||||
src/$(MAKEFILE):
|
||||
cd src && $(QMAKE) -o $(MAKEFILE)
|
||||
cd src && $(QMAKE) -o $(MAKEFILE)
|
||||
sub-src: src/$(MAKEFILE) FORCE
|
||||
cd src && $(MAKE) -f $(MAKEFILE)
|
||||
|
||||
plugins/$(MAKEFILE):
|
||||
cd plugins && $(QMAKE) -o $(MAKEFILE)
|
||||
cd plugins && $(QMAKE) -o $(MAKEFILE)
|
||||
sub-plugins: plugins/$(MAKEFILE) FORCE
|
||||
cd plugins && $(MAKE) -f $(MAKEFILE)
|
||||
|
||||
Makefile: qgis.pro $(QTDIR)/mkspecs/default/qmake.conf
|
||||
$(QMAKE) qgis.pro
|
||||
$(QMAKE) -o Makefile qgis.pro
|
||||
qmake: qmake_all
|
||||
@$(QMAKE) qgis.pro
|
||||
@$(QMAKE) -o Makefile qgis.pro
|
||||
|
||||
all: $(SUBTARGETS)
|
||||
qmake_all: src/$(MAKEFILE) plugins/$(MAKEFILE)
|
||||
for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; grep "^qmake_all:" $(MAKEFILE) 2>/dev/null >/dev/null && $(MAKE) -f $(MAKEFILE) qmake_all || true; fi; ) ; done
|
||||
|
||||
clean: qmake_all FORCE
|
||||
for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) -f $(MAKEFILE) clean; fi; ) ; done
|
||||
uninstall install uiclean mocclean: qmake_all FORCE
|
||||
for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) -f $(MAKEFILE) $@; fi; ) ; done
|
||||
( [ -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
|
||||
( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) $@; ) || true
|
||||
( [ -d plugins ] && cd plugins ; $(MAKE) -f $(MAKEFILE) $@; ) || true
|
||||
distclean: qmake_all FORCE
|
||||
for i in $(SUBDIRS); do ( if [ -d $$i ]; then cd $$i ; $(MAKE) -f $(MAKEFILE) $@ ; $(DEL_FILE) $(MAKEFILE) ; fi; ) ; done
|
||||
( [ -d src ] && cd src ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
|
||||
( [ -d plugins ] && cd plugins ; $(MAKE) -f $(MAKEFILE) $@; $(DEL_FILE) $(MAKEFILE); ) || true
|
||||
|
||||
FORCE:
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
TEMPLATE = lib
|
||||
CONFIG += debug
|
||||
CONFIG += qt thread debug
|
||||
SOURCES = qgistestplugin.cpp
|
||||
HEADERS = qgisplugin.h \
|
||||
qgisplugingui.h \
|
||||
|
||||
28
src/Makefile
28
src/Makefile
@ -1,9 +1,9 @@
|
||||
#############################################################################
|
||||
# Makefile for building: qgis
|
||||
# Generated by qmake (1.03a) on: Mon Jan 6 20:24:51 2003
|
||||
# Generated by qmake (1.04a) (Qt 3.1.1) on: Mon Jan 20 21:17:56 2003
|
||||
# Project: src.pro
|
||||
# Template: app
|
||||
# Command: $(QMAKE) src.pro
|
||||
# Command: $(QMAKE) -o Makefile src.pro
|
||||
#############################################################################
|
||||
|
||||
####### Compiler, tools and options
|
||||
@ -12,14 +12,14 @@ CC = gcc
|
||||
CXX = g++
|
||||
LEX = flex
|
||||
YACC = yacc
|
||||
CFLAGS = -pipe -Wall -W -g -D_REENTRANT -DPGDB -DQT_THREAD_SUPPORT
|
||||
CXXFLAGS = -pipe -Wall -W -g -D_REENTRANT -DPGDB -DQT_THREAD_SUPPORT
|
||||
CFLAGS = -pipe -Wall -W -g -D_REENTRANT -DPGDB -DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT="" -DQT_THREAD_SUPPORT
|
||||
CXXFLAGS = -pipe -Wall -W -g -D_REENTRANT -DPGDB -DHAVE_NAMESPACE_STD -DHAVE_CXX_STRING_HEADER -DDLLIMPORT="" -DQT_THREAD_SUPPORT
|
||||
LEXFLAGS =
|
||||
YACCFLAGS= -d
|
||||
INCPATH = -I$(PGSQL)/include -I$(QTDIR)/include -I$(QTDIR)/mkspecs/default
|
||||
INCPATH = -I$(QTDIR)/mkspecs/default -I. -I$(PGSQL)/include -I$(QTDIR)/include
|
||||
LINK = g++
|
||||
LFLAGS =
|
||||
LIBS = $(SUBLIBS) -Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(PGSQL)/lib -lpq++ -lgdal -lqt-mt -lpthread -lXext -lX11 -lm
|
||||
LIBS = $(SUBLIBS) -Wl,-rpath,$(QTDIR)/lib -L$(QTDIR)/lib -L/usr/X11R6/lib -L$(PGSQL)/lib -L$/usr/local/lib -lpq++ -lgdal -lqt-mt -lXext -lX11 -lm -lpthread
|
||||
AR = ar cqs
|
||||
RANLIB =
|
||||
MOC = $(QTDIR)/bin/moc
|
||||
@ -33,7 +33,9 @@ COPY_DIR = $(COPY) -pR
|
||||
DEL_FILE = rm -f
|
||||
SYMLINK = ln -sf
|
||||
DEL_DIR = rmdir
|
||||
MOVE = mv
|
||||
MOVE = mv -f
|
||||
CHK_DIR_EXISTS= test -d
|
||||
MKDIR = mkdir -p
|
||||
|
||||
####### Output directory
|
||||
|
||||
@ -220,12 +222,12 @@ $(MOC):
|
||||
( cd $(QTDIR)/src/moc ; $(MAKE) )
|
||||
|
||||
Makefile: src.pro $(QTDIR)/mkspecs/default/qmake.conf
|
||||
$(QMAKE) src.pro
|
||||
$(QMAKE) -o Makefile src.pro
|
||||
qmake:
|
||||
@$(QMAKE) src.pro
|
||||
@$(QMAKE) -o Makefile src.pro
|
||||
|
||||
dist:
|
||||
@mkdir -p .tmp/qgis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/qgis/ && $(COPY_FILE) --parents qgsdbsourceselectbase.ui.h qgisappbase.ui.h qgsabout.ui.h .tmp/qgis/ && ( cd `dirname .tmp/qgis` && $(TAR) qgis.tar qgis && $(GZIP) qgis.tar ) && $(MOVE) `dirname .tmp/qgis`/qgis.tar.gz . && $(DEL_DIR) .tmp/qgis
|
||||
@mkdir -p .tmp/qgis && $(COPY_FILE) --parents $(SOURCES) $(HEADERS) $(FORMS) $(DIST) .tmp/qgis/ && $(COPY_FILE) --parents qgsdbsourceselectbase.ui.h qgisappbase.ui.h qgsabout.ui.h .tmp/qgis/ && ( cd `dirname .tmp/qgis` && $(TAR) qgis.tar qgis && $(GZIP) qgis.tar ) && $(MOVE) `dirname .tmp/qgis`/qgis.tar.gz . && $(DEL_FILE) -r .tmp/qgis
|
||||
|
||||
mocclean:
|
||||
-$(DEL_FILE) $(OBJMOC)
|
||||
@ -234,6 +236,8 @@ mocclean:
|
||||
uiclean:
|
||||
-$(DEL_FILE) $(UICIMPLS) $(UICDECLS)
|
||||
|
||||
yaccclean:
|
||||
lexclean:
|
||||
clean: mocclean uiclean
|
||||
-$(DEL_FILE) $(OBJECTS)
|
||||
-$(DEL_FILE) *~ core *.core
|
||||
@ -400,7 +404,9 @@ qgsattributetable.o: qgsattributetable.cpp qgsattributetable.h
|
||||
qgsattributetabledisplay.o: qgsattributetabledisplay.cpp qgsattributetabledisplay.h \
|
||||
qgsattributetablebase.h
|
||||
|
||||
qgsrenderer.o: qgsrenderer.cpp
|
||||
qgsrenderer.o: qgsrenderer.cpp qgsrenderitem.h \
|
||||
qgsrenderer.h \
|
||||
qgssymbol.h
|
||||
|
||||
qgsrenderitem.o: qgsrenderitem.cpp qgssymbol.h \
|
||||
qgsrenderitem.h
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
######################################################################
|
||||
TARGET = qgis
|
||||
TEMPLATE = app
|
||||
LIBS += -L$(PGSQL)/lib -lpq++ -lgdal
|
||||
LIBS += -L$(PGSQL)/lib -L$/usr/local/lib -lpq++ -lgdal
|
||||
INCLUDEPATH += $(PGSQL)/include
|
||||
CONFIG += qt thread debug
|
||||
DEFINES += PGDB
|
||||
DEFINES += PGDB HAVE_NAMESPACE_STD HAVE_CXX_STRING_HEADER DLLIMPORT=""
|
||||
# Input
|
||||
HEADERS += qgsdbsourceselectbase.ui.h \
|
||||
qgisapp.h \
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user