diff options
-rw-r--r-- | external/graphite/StaticLibrary_graphite.mk | 2 | ||||
-rw-r--r-- | external/hunspell/StaticLibrary_hunspell.mk | 2 | ||||
-rw-r--r-- | external/mythes/StaticLibrary_mythes.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Executable.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 5 | ||||
-rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 1 | ||||
-rw-r--r-- | vcl/Executable_tdefilepicker.mk | 2 |
8 files changed, 4 insertions, 12 deletions
diff --git a/external/graphite/StaticLibrary_graphite.mk b/external/graphite/StaticLibrary_graphite.mk index 4f645666197d..b0ec4cc50682 100644 --- a/external/graphite/StaticLibrary_graphite.mk +++ b/external/graphite/StaticLibrary_graphite.mk @@ -33,7 +33,7 @@ endif $(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,graphite,cpp)) -$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,graphite,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,graphite,\ UnpackedTarball/graphite/src/$(if $(filter GCC,$(COM)),direct,call)_machine \ UnpackedTarball/graphite/src/gr_char_info \ UnpackedTarball/graphite/src/gr_face \ diff --git a/external/hunspell/StaticLibrary_hunspell.mk b/external/hunspell/StaticLibrary_hunspell.mk index d69e5a5a3adc..895d28e29968 100644 --- a/external/hunspell/StaticLibrary_hunspell.mk +++ b/external/hunspell/StaticLibrary_hunspell.mk @@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_add_defs,hunspell,\ -DOPENOFFICEORG \ )) -$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,hunspell,\ UnpackedTarball/hunspell/src/hunspell/affentry \ UnpackedTarball/hunspell/src/hunspell/affixmgr \ UnpackedTarball/hunspell/src/hunspell/csutil \ diff --git a/external/mythes/StaticLibrary_mythes.mk b/external/mythes/StaticLibrary_mythes.mk index d955b6a025e7..34411479e63c 100644 --- a/external/mythes/StaticLibrary_mythes.mk +++ b/external/mythes/StaticLibrary_mythes.mk @@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,mythes,mythes)) $(eval $(call gb_StaticLibrary_set_warnings_not_errors,mythes)) -$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,mythes,\ +$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mythes,\ UnpackedTarball/mythes/mythes \ )) diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index afe4ddf51c47..4d0041eb7cf0 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -107,7 +107,6 @@ $(eval $(foreach method,\ add_scanners \ add_exception_objects \ add_generated_cobjects \ - add_generated_cxxobjects \ add_generated_exception_objects \ add_cflags \ add_cxxflags \ diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 18640d6437d4..9f94b8d6fcad 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -182,7 +182,6 @@ $(eval $(foreach method,\ add_exception_objects \ add_x64_generated_exception_objects \ add_generated_cobjects \ - add_generated_cxxobjects \ add_generated_exception_objects \ use_library_objects \ add_grammar \ diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 5d192df299cb..4ef1bf954965 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1346,11 +1346,6 @@ $(foreach obj,$(2),$(call gb_LinkTarget_add_generated_c_object,$(1),$(obj),$(3), $(foreach obj,$(2),$(eval $(call gb_GenCObject_get_target,$(obj)) : CXXOBJECT_X64 := YES)) endef -# call gb_LinkTarget_add_generated_cxxobjects,linktarget,sourcefiles,cxxflags,linktargetmakefilename -define gb_LinkTarget_add_generated_cxxobjects -$(foreach obj,$(2),$(call gb_LinkTarget_add_generated_cxx_object,$(1),$(obj),$(3))) -endef - # call gb_LinkTarget_add_generated_exception_object,linktarget,sourcefile,linktargetmakefilename,cxxflags define gb_LinkTarget_add_generated_exception_object $(call gb_LinkTarget_add_generated_cxx_object,$(1),$(2),$(gb_LinkTarget_EXCEPTIONFLAGS) $(call gb_LinkTarget__get_cxxflags,$(3)) $(4)) diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 849c0b51a5ad..10f45cd960c9 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -82,7 +82,6 @@ $(eval $(foreach method,\ add_x64_generated_exception_objects \ add_generated_cobjects \ add_x64_generated_cobjects \ - add_generated_cxxobjects \ add_generated_exception_objects \ add_cflags \ add_cxxflags \ diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk index fcbf55f10797..c779059bed2b 100644 --- a/vcl/Executable_tdefilepicker.mk +++ b/vcl/Executable_tdefilepicker.mk @@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_exception_objects,tdefilepicker,\ vcl/unx/kde/fpicker/kdemodalityfilter \ )) -$(eval $(call gb_Executable_add_generated_cxxobjects,tdefilepicker,\ +$(eval $(call gb_Executable_add_generated_exception_objects,tdefilepicker,\ CustomTarget/vcl/unx/kde/fpicker/kdefilepicker.moc \ )) |