diff options
| author | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-30 21:09:43 +0100 |
|---|---|---|
| committer | Lionel Elie Mamane <lionel@mamane.lu> | 2011-11-30 21:10:58 +0100 |
| commit | 05b53b1b8e500b31bef1db737303725a168379da (patch) | |
| tree | c5e3caf21c6168faf3bb0d814bcf90c92a30d884 /connectivity | |
| parent | 5510127e89d6971a219ce3664e4631d6c6dda2b1 (diff) | |
postgresql-sdbc: review build rules
Diffstat (limited to 'connectivity')
| -rw-r--r-- | connectivity/source/drivers/postgresql/makefile.mk | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk index 4f2dffd8296b..e49898166e56 100644 --- a/connectivity/source/drivers/postgresql/makefile.mk +++ b/connectivity/source/drivers/postgresql/makefile.mk @@ -97,14 +97,14 @@ SHL1DEF= $(MISC)$/$(SHL1TARGET).def DEF1NAME= $(SHL1TARGET) SHL1VERSIONMAP=$(SOLARENV)$/src$/reg-component.map -# use the static version +# 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 "$(GUI)"=="WNT" -POSTGRESQL_LIB=libpq.lib #wsock32.lib advapi32.lib +LIBPQ_LINK=libpq.lib #wsock32.lib advapi32.lib .ELSE -POSTGRESQL_LIB=-lpq #-lcrypt +LIBPQ_LINK=-lpq #-lcrypt .ENDIF SHL2TARGET=postgresql-sdbc-impl.uno LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib @@ -148,7 +148,8 @@ SHL2STDLIBS= \ $(CPPUHELPERLIB) \ $(SALLIB) \ $(SALHELPERLIB) \ - $(POSTGRESQL_LIB) + $(POSTGRESQL_LIB) \ + $(LIBPQ_LINK) SHL2LIBS= $(LIB2TARGET) SHL2DEF= $(MISC)$/$(SHL2TARGET).def |