[Libreoffice-commits] .: extensions/Executable_nsplugin.mk extensions/Library_npsoplugin.mk

[Matus Kukan]

 extensions/Executable_nsplugin.mk |    8 ++++----
 extensions/Library_npsoplugin.mk  |    5 ++++-
 2 files changed, 8 insertions(+), 5 deletions(-)

New commits:
commit 9af656af19eb465b3d45b43fb281ad541fa9b32c
Author: Matúš Kukan <matus.ku...@gmail.com>
Date:   Tue Jan 10 18:28:11 2012 +0100

    pathutils-obj is in static library ooopathutils

diff --git a/extensions/Executable_nsplugin.mk 
b/extensions/Executable_nsplugin.mk
index 6bc58fb..383db00 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -56,14 +56,14 @@ $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
 ))
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Executable_add_ldflags,nsplugin,\
-       $(OUTDIR)/lib/pathutils-obj.obj \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,nsplugin,\
        extensions/source/nsplugin/source/nsp_windows \
 ))
 
+$(eval $(call gb_Executable_add_linked_static_libs,nsplugin,\
+       ooopathutils \
+))
+
 $(eval $(call gb_Executable_add_linked_libs,nsplugin,\
        ws2_32 \
        shell32 \
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index f542f59..1a30d13 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -59,10 +59,13 @@ endif # GUI=UNX
 ifeq ($(GUI),WNT)
 
 $(eval $(call gb_Library_add_ldflags,npsoplugin,\
-       $(OUTDIR)/lib/pathutils-obj.obj \
        $(OUTDIR)/lib/npwin.obj \
 ))
 
+$(eval $(call gb_Library_add_linked_static_libs,npsoplugin,\
+       ooopathutils \
+))
+
 $(eval $(call gb_Library_add_linked_libs,npsoplugin,\
        ws2_32 \
        shell32 \

_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits