[Libreoffice-commits] .: desktop/Executable_guiloader.mk desktop/Executable_officeloader.mk desktop/Executable_soffice.mk desktop/Executable_unoinfo.mk
Caolán McNamara
caolan at kemper.freedesktop.org
Fri Sep 16 06:42:22 PDT 2011
desktop/Executable_guiloader.mk | 4 ++--
desktop/Executable_officeloader.mk | 4 ++--
desktop/Executable_soffice.mk | 4 ++--
desktop/Executable_unoinfo.mk | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 63cf6aab02aa32b993c98feee5e9bdd0f9567c92
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Sep 16 14:41:28 2011 +0100
ooopathutils_hack linked_libs -> ooopathutils linked_static_libs
diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk
index 478cb1d..a645b68 100644
--- a/desktop/Executable_guiloader.mk
+++ b/desktop/Executable_guiloader.mk
@@ -34,8 +34,8 @@ $(eval $(call gb_Executable_set_include,guiloader,\
-I$(SRCDIR)/desktop/inc/pch \
))
-$(eval $(call gb_Executable_add_linked_libs,guiloader,\
- ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,guiloader,\
+ ooopathutils \
))
$(eval $(call gb_Executable_add_noexception_objects,guiloader,\
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index 7f1898e..d10d44f 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -63,8 +63,8 @@ endif
ifeq ($(GUI),WNT)
-$(eval $(call gb_Executable_add_linked_libs,officeloader,\
- ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,officeloader,\
+ ooopathutils \
))
$(eval $(call gb_Executable_add_noexception_objects,officeloader,\
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 050f1e0..3916c40 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -44,8 +44,8 @@ $(eval $(call gb_Executable_add_cobjects,soffice,\
desktop/source/app/main.c \
))
-$(eval $(call gb_Executable_add_linked_libs,soffice,\
- ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,soffice,\
+ ooopathutils \
))
ifeq ($(COM),MSC)
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index 50da655..f1fe830 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -32,8 +32,8 @@ $(eval $(call gb_Executable_set_include,unoinfo,\
-I$(SRCDIR)/desktop/inc/pch \
))
-$(eval $(call gb_Executable_add_linked_libs,unoinfo,\
- ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,unoinfo,\
+ ooopathutils \
))
$(eval $(call gb_Executable_add_noexception_objects,unoinfo,\
More information about the Libreoffice-commits
mailing list