connectivity/source/drivers/kab/makefile.mk | 4 ++--
shell/source/backends/kdebe/makefile.mk | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit f6eba1a27a4ffac50ab06a733e6eee1f5c7800ca
Author: Petr Mladek <pmla...@suse.cz>
Date: Fri Apr 13 16:52:59 2012 +0200
fix library link order to work with link --as-needed
diff --git a/connectivity/source/drivers/kab/makefile.mk
b/connectivity/source/drivers/kab/makefile.mk
index c7f7b9a..9494037 100644
--- a/connectivity/source/drivers/kab/makefile.mk
+++ b/connectivity/source/drivers/kab/makefile.mk
@@ -111,14 +111,14 @@ SHL2VERSIONMAP=$(TARGET2).map
SHL2TARGET= $(TARGET2)$(KAB_MAJOR)
SHL2OBJS=$(SLO2FILES)
-SHL2LINKFLAGS+=$(KAB_LIB)
SHL2STDLIBS=\
$(CPPULIB) \
$(CPPUHELPERLIB) \
$(SALLIB) \
$(SALHELPERLIB) \
$(DBTOOLSLIB) \
- $(COMPHELPERLIB)
+ $(COMPHELPERLIB) \
+ $(KAB_LIB)
SHL2DEPN=
SHL2IMPLIB= i$(TARGET2)
diff --git a/shell/source/backends/kdebe/makefile.mk
b/shell/source/backends/kdebe/makefile.mk
index b1b12ad..265a3b6 100644
--- a/shell/source/backends/kdebe/makefile.mk
+++ b/shell/source/backends/kdebe/makefile.mk
@@ -63,11 +63,12 @@ SHL1OBJS=$(SLOFILES)
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
SHL1IMPLIB=i$(SHL1TARGET)
-SHL1LINKFLAGS+=$(KDE_LIBS) -lkio
SHL1STDLIBS= \
$(CPPUHELPERLIB) \
$(CPPULIB) \
- $(SALLIB)
+ $(SALLIB) \
+ $(KDE_LIBS) \
+ -lkio
SHL1DEF=$(MISC)$/$(SHL1TARGET).def
DEF1NAME=$(SHL1TARGET)
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
