summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2013-07-17 13:16:27 +0200
committerBjörn Michaelsen <bjoern.michaelsen@canonical.com>2013-07-17 12:18:47 +0000
commit69f0c2cfd6747e32ca050599405c556247434c77 (patch)
tree6910cad63956469d4cf6668413e83a40f360a951
parentremove last user of gb_Library_add_noexeception_object (diff)
downloadcore-69f0c2cfd6747e32ca050599405c556247434c77.tar.gz
core-69f0c2cfd6747e32ca050599405c556247434c77.zip
remove last users of gb_Executable_add_noexception_object
Change-Id: Iddee238aa800ecfee8f97a7132b38b6446e0b2a4 Reviewed-on: https://gerrit.libreoffice.org/4953 Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com> Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
-rw-r--r--desktop/Executable_sbase.mk2
-rw-r--r--desktop/Executable_scalc.mk2
-rw-r--r--desktop/Executable_sdraw.mk2
-rw-r--r--desktop/Executable_simpress.mk2
-rw-r--r--desktop/Executable_smath.mk2
-rw-r--r--desktop/Executable_soffice.mk2
-rw-r--r--desktop/Executable_sweb.mk2
-rw-r--r--desktop/Executable_swriter.mk2
-rw-r--r--desktop/Executable_unoinfo.mk2
-rw-r--r--desktop/Executable_unopkg.mk2
-rw-r--r--pyuno/Executable_python_wrapper.mk2
-rw-r--r--shell/Executable_regsvrex.mk2
12 files changed, 12 insertions, 12 deletions
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 4a35040fde80..77d0c47b478c 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,sbase,\
$(call gb_Executable_get_target,sbase) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,sbase,\
+$(eval $(call gb_Executable_add_exception_objects,sbase,\
desktop/win32/source/applauncher/sbase \
))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 66ee9c66a6af..8c8cb42c7b06 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,scalc,\
$(call gb_Executable_get_target,scalc) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,scalc,\
+$(eval $(call gb_Executable_add_exception_objects,scalc,\
desktop/win32/source/applauncher/scalc \
))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index b5529701adbc..e3a4eef5debe 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,sdraw,\
$(call gb_Executable_get_target,sdraw) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,sdraw,\
+$(eval $(call gb_Executable_add_exception_objects,sdraw,\
desktop/win32/source/applauncher/sdraw \
))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 18c1544f2a5a..4d0648e1302a 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,simpress,\
$(call gb_Executable_get_target,simpress) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,simpress,\
+$(eval $(call gb_Executable_add_exception_objects,simpress,\
desktop/win32/source/applauncher/simpress \
))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index bb83a18f2584..627ceb46b11f 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,smath,\
$(call gb_Executable_get_target,smath) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,smath,\
+$(eval $(call gb_Executable_add_exception_objects,smath,\
desktop/win32/source/applauncher/smath \
))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 3d3c39d1c587..15b93f626faa 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_use_static_libraries,soffice,\
winextendloaderenv \
))
-$(eval $(call gb_Executable_add_noexception_objects,soffice,\
+$(eval $(call gb_Executable_add_exception_objects,soffice,\
desktop/win32/source/officeloader/officeloader \
))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 6140f0a00402..901007cb5cc3 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,sweb,\
$(call gb_Executable_get_target,sweb) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,sweb,\
+$(eval $(call gb_Executable_add_exception_objects,sweb,\
desktop/win32/source/applauncher/sweb \
))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index a5ac288141f6..cedefd06f058 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Executable_add_libs,swriter,\
$(call gb_Executable_get_target,swriter) : \
$(call gb_CxxObject_get_target,desktop/win32/source/applauncher/launcher)
-$(eval $(call gb_Executable_add_noexception_objects,swriter,\
+$(eval $(call gb_Executable_add_exception_objects,swriter,\
desktop/win32/source/applauncher/swriter \
))
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index c7bb5b7cb6c5..032b1a74cf21 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -13,7 +13,7 @@ $(eval $(call gb_Executable_use_static_libraries,unoinfo,\
ooopathutils \
))
-$(eval $(call gb_Executable_add_noexception_objects,unoinfo,\
+$(eval $(call gb_Executable_add_exception_objects,unoinfo,\
desktop/win32/source/unoinfo \
))
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index e3a833e21ec2..bc7b17b2819c 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Executable_use_static_libraries,unopkg,\
winextendloaderenv \
))
-$(eval $(call gb_Executable_add_noexception_objects,unopkg,\
+$(eval $(call gb_Executable_add_exception_objects,unopkg,\
desktop/win32/source/guiloader/genericloader \
))
diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python_wrapper.mk
index 7003a71a7fd9..39ff28324174 100644
--- a/pyuno/Executable_python_wrapper.mk
+++ b/pyuno/Executable_python_wrapper.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Executable_use_static_libraries,pyuno/python,\
ooopathutils \
))
-$(eval $(call gb_Executable_add_noexception_objects,pyuno/python,\
+$(eval $(call gb_Executable_add_exception_objects,pyuno/python,\
pyuno/zipcore/python \
))
diff --git a/shell/Executable_regsvrex.mk b/shell/Executable_regsvrex.mk
index 77949e892686..6072c166d9a3 100644
--- a/shell/Executable_regsvrex.mk
+++ b/shell/Executable_regsvrex.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Executable_Executable,regsvrex))
-$(eval $(call gb_Executable_add_noexception_objects,regsvrex,\
+$(eval $(call gb_Executable_add_exception_objects,regsvrex,\
shell/source/tools/regsvrex/regsvrex \
))