diff options
| author | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-12 04:51:49 +0100 |
|---|---|---|
| committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-12-12 04:53:03 +0100 |
| commit | 58b49d96ad2be04253c3aa7b76144322bb5439ce (patch) | |
| tree | 9c8acfa03232d2670600b2a8f5eddfd81cbf2869 /connectivity | |
| parent | 557bf7ae88901b0be44a6b5c139842bead3c3461 (diff) | |
Some more postgresql fixes
1. The --enable-extension-integration affects only packaging
2. OUTDIR_FOR_BUILD is for native build in case of crosscompiling
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 91184d872db0..29f2029915f6 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -77,6 +77,18 @@ PQ_SDBC_MINOR=8 PQ_SDBC_MICRO=2 PQ_SDBC_VERSION=$(PQ_SDBC_MAJOR).$(PQ_SDBC_MINOR).$(PQ_SDBC_MICRO) +.IF "$(SYSTEM_POSTGRESQL)"=="YES" +LIBPQ_LINK=-lpq +.ELSE #SYSTEM_POSTGRESQL==NO +.IF "$(GUI)$(COM)"=="WNTMSC" +LIBPQ_LINK=$(OUTDIR)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib +.ELSE +LIBPQ_LINK=$(OUTDIR)/lib/libpq.a +.ENDIF +POSTGRESQL_INC=-I$(OUTDIR)/inc/postgresql +POSTGRESQL_LIB= +.ENDIF + CFLAGS+=$(POSTGRESQL_INC) \ -DPQ_SDBC_MAJOR=$(PQ_SDBC_MAJOR) \ -DPQ_SDBC_MINOR=$(PQ_SDBC_MINOR) \ @@ -97,22 +109,6 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map -# use the static version on Windows? -# LEM 17/11/2011: removed everything except libpq proper; -# as per instructions in libpq documentation. -# If it turns out the rest was needed, reenable it. -.IF "$(SYSTEM_POSTGRESQL)"=="YES" -LIBPQ_LINK=-lpq -.ELSE #SYSTEM_POSTGRESQL==NO -.IF "$(GUI)$(COM)"=="WNTMSC" -LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.lib ws2_32.lib secur32.lib advapi32.lib shell32.lib -.ELSE -LIBPQ_LINK=$(OUTDIR_FOR_BUILD)/lib/libpq.a -.ENDIF -POSTGRESQL_INC=-I$(OUTDIR_FOR_BUILD)/inc/postgresql -POSTGRESQL_LIB= -.ENDIF - SHL2TARGET=postgresql-sdbc-impl.uno LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib LIB2OBJFILES= \ |