summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-09-16 14:41:28 +0100
committerCaolán McNamara <caolanm@redhat.com>2011-09-16 14:41:28 +0100
commit63cf6aab02aa32b993c98feee5e9bdd0f9567c92 (patch)
treecf3d92d4d40364fd7aa81760e5195cf59660dccd /desktop
parentd9056accada40839e6bfd2bb38bad9bdeee742ca (diff)
ooopathutils_hack linked_libs -> ooopathutils linked_static_libs
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Executable_guiloader.mk4
-rw-r--r--desktop/Executable_officeloader.mk4
-rw-r--r--desktop/Executable_soffice.mk4
-rw-r--r--desktop/Executable_unoinfo.mk4
4 files changed, 8 insertions, 8 deletions
diff --git a/desktop/Executable_guiloader.mk b/desktop/Executable_guiloader.mk
index 478cb1d82c54..a645b68f0179 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 7f1898ef8e91..d10d44fd9ca5 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 050f1e0db07d..3916c40890f7 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 50da655d5208..f1fe830d29e3 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,\