[Libreoffice-commits] .: 2 commits - connectivity/source

[Lionel Elie Mamane]

 connectivity/source/drivers/postgresql/makefile.mk |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 88b58e961324ff69feaec24fdc3fd03cd6f684ca
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Feb 2 21:34:38 2012 +0100

    pgsql-sdbc: move libpq link *first* in libs; hopefully will fix tinderboxes

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index d4df775..acf8b8c 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -155,13 +155,13 @@ LIB2OBJFILES= \
 
 
 SHL2STDLIBS= \
+        $(POSTGRESQL_LIB)	\
+        $(LIBPQ_LINK)		\
+        $(LIBPQ_DEP_LIBS)	\
         $(CPPULIB)		\
         $(CPPUHELPERLIB)	\
         $(SALLIB)		\
-        $(SALHELPERLIB)		\
-        $(POSTGRESQL_LIB)	\
-        $(LIBPQ_LINK)		\
-        $(LIBPQ_DEP_LIBS)
+        $(SALHELPERLIB)
 
 SHL2LIBS=	$(LIB2TARGET)
 SHL2DEF=	$(MISC)/$(SHL2TARGET).def
commit c39cec2f91205529cef237e6bae500bbaf169517
Author: Lionel Elie Mamane <lionel at mamane.lu>
Date:   Thu Feb 2 21:20:11 2012 +0100

    pgsql-sdbc: libpq dependencies *after* libpq seems to be the right after all

diff --git a/connectivity/source/drivers/postgresql/makefile.mk b/connectivity/source/drivers/postgresql/makefile.mk
index 8a831a6..d4df775 100644
--- a/connectivity/source/drivers/postgresql/makefile.mk
+++ b/connectivity/source/drivers/postgresql/makefile.mk
@@ -160,8 +160,8 @@ SHL2STDLIBS= \
         $(SALLIB)		\
         $(SALHELPERLIB)		\
         $(POSTGRESQL_LIB)	\
-        $(LIBPQ_DEP_LIBS)	\
-        $(LIBPQ_LINK)
+        $(LIBPQ_LINK)		\
+        $(LIBPQ_DEP_LIBS)
 
 SHL2LIBS=	$(LIB2TARGET)
 SHL2DEF=	$(MISC)/$(SHL2TARGET).def