diff options
author | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-06 20:37:45 +0200 |
---|---|---|
committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-09-08 13:09:34 +0200 |
commit | b409f11f8ba2595e8f630c0b82ef8d919cb98148 (patch) | |
tree | 94d7b4641c0837f7ac2738f84462c83a17f1664a | |
parent | 707194e7b9263a33508905438281090bd201e34d (diff) |
rename: set_cxx_suffix -> set_generated_cxx_suffix; used for external libs
Change-Id: I023c6b35c2a65da566ff5bb3aea772c99c90dda3
-rw-r--r-- | boost/StaticLibrary_boostdatetime.mk | 2 | ||||
-rw-r--r-- | boost/StaticLibrary_boostthread.mk | 2 | ||||
-rw-r--r-- | clucene/Library_clucene.mk | 2 | ||||
-rw-r--r-- | libcdr/StaticLibrary_cdr.mk | 2 | ||||
-rw-r--r-- | libmspub/StaticLibrary_mspub.mk | 2 | ||||
-rw-r--r-- | libvisio/StaticLibrary_visio.mk | 2 | ||||
-rw-r--r-- | libwpd/StaticLibrary_wpd.mk | 2 | ||||
-rw-r--r-- | libwpg/StaticLibrary_wpg.mk | 2 | ||||
-rw-r--r-- | libwps/StaticLibrary_wps.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Executable.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/Library.mk | 2 | ||||
-rw-r--r-- | solenv/gbuild/LinkTarget.mk | 4 | ||||
-rw-r--r-- | solenv/gbuild/StaticLibrary.mk | 2 |
13 files changed, 14 insertions, 14 deletions
diff --git a/boost/StaticLibrary_boostdatetime.mk b/boost/StaticLibrary_boostdatetime.mk index 85ba8ffc0710..cdd2bb2dd12e 100644 --- a/boost/StaticLibrary_boostdatetime.mk +++ b/boost/StaticLibrary_boostdatetime.mk @@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostdatetime)) $(eval $(call gb_StaticLibrary_use_unpacked,boostdatetime,boost)) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,boostdatetime,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostdatetime,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostdatetime,\ UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \ diff --git a/boost/StaticLibrary_boostthread.mk b/boost/StaticLibrary_boostthread.mk index 1b4c8fe1bfd7..9a00cd96c5ff 100644 --- a/boost/StaticLibrary_boostthread.mk +++ b/boost/StaticLibrary_boostthread.mk @@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_set_warnings_not_errors,boostthread)) $(eval $(call gb_StaticLibrary_use_unpacked,boostthread,boost)) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,boostthread,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,boostthread,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostthread,\ UnpackedTarball/boost/libs/thread/src/win32/thread \ diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk index cd99bdb0d62d..d8874c479219 100644 --- a/clucene/Library_clucene.mk +++ b/clucene/Library_clucene.mk @@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,clucene,\ )) endif -$(eval $(call gb_Library_set_cxx_suffix,clucene,cpp)) +$(eval $(call gb_Library_set_generated_cxx_suffix,clucene,cpp)) $(eval $(call gb_Library_add_generated_exception_objects,clucene,\ UnpackedTarball/clucene/src/shared/CLucene/SharedHeader \ diff --git a/libcdr/StaticLibrary_cdr.mk b/libcdr/StaticLibrary_cdr.mk index d0f07a27e63f..6fb1a3cead3a 100644 --- a/libcdr/StaticLibrary_cdr.mk +++ b/libcdr/StaticLibrary_cdr.mk @@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_use_externals,cdrlib,\ zlib \ )) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,cdrlib,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,cdrlib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\ UnpackedTarball/cdr/src/lib/CDRCollector \ diff --git a/libmspub/StaticLibrary_mspub.mk b/libmspub/StaticLibrary_mspub.mk index 2d6ab4519f65..37c7c1decf5d 100644 --- a/libmspub/StaticLibrary_mspub.mk +++ b/libmspub/StaticLibrary_mspub.mk @@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_externals,mspublib,\ zlib \ )) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,mspublib,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,mspublib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,mspublib,\ UnpackedTarball/mspub/src/lib/ColorReference \ diff --git a/libvisio/StaticLibrary_visio.mk b/libvisio/StaticLibrary_visio.mk index c917b6f5fa36..0bba6b618e64 100644 --- a/libvisio/StaticLibrary_visio.mk +++ b/libvisio/StaticLibrary_visio.mk @@ -18,7 +18,7 @@ $(eval $(call gb_StaticLibrary_use_externals,visiolib,\ wpg \ )) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,visiolib,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,visiolib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,visiolib,\ UnpackedTarball/visio/src/lib/libvisio_utils \ diff --git a/libwpd/StaticLibrary_wpd.mk b/libwpd/StaticLibrary_wpd.mk index 283cddfa96f9..94642253ee9c 100644 --- a/libwpd/StaticLibrary_wpd.mk +++ b/libwpd/StaticLibrary_wpd.mk @@ -13,7 +13,7 @@ $(eval $(call gb_StaticLibrary_use_unpacked,wpdlib,wpd)) $(eval $(call gb_StaticLibrary_use_package,wpdlib,libwpd_inc)) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpdlib,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpdlib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\ UnpackedTarball/wpd/src/lib/libwpd_internal \ diff --git a/libwpg/StaticLibrary_wpg.mk b/libwpg/StaticLibrary_wpg.mk index 6ce7499877b8..faaa5a3b14c7 100644 --- a/libwpg/StaticLibrary_wpg.mk +++ b/libwpg/StaticLibrary_wpg.mk @@ -17,7 +17,7 @@ $(eval $(call gb_StaticLibrary_use_externals,wpglib,\ wpd \ )) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpglib,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpglib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpglib,\ UnpackedTarball/wpg/src/lib/WPG1Parser \ diff --git a/libwps/StaticLibrary_wps.mk b/libwps/StaticLibrary_wps.mk index 150d8cd98f05..b18b5833882d 100644 --- a/libwps/StaticLibrary_wps.mk +++ b/libwps/StaticLibrary_wps.mk @@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_externals,wpslib,\ wpd \ )) -$(eval $(call gb_StaticLibrary_set_cxx_suffix,wpslib,cpp)) +$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,wpslib,cpp)) $(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\ UnpackedTarball/wps/src/lib/libwps_internal \ diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 72e948149f4e..db901f079512 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -131,7 +131,7 @@ $(eval $(foreach method,\ add_sdi_headers \ add_nativeres \ set_warnings_not_errors \ - set_cxx_suffix \ + set_generated_cxx_suffix \ ,\ $(call gb_Executable_forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index 0c36e0aaef6d..4dc30b037849 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -218,7 +218,7 @@ $(eval $(foreach method,\ export_objects_list \ add_nativeres \ set_warnings_not_errors \ - set_cxx_suffix \ + set_generated_cxx_suffix \ ,\ $(call gb_Library__forward_to_Linktarget,$(method))\ )) diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 19e944cfce66..955b13d9e019 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -1129,8 +1129,8 @@ endef # # This is useful for external libraries. # -# gb_LinkTarget_set_cxx_suffix linktarget used-suffix -define gb_LinkTarget_set_cxx_suffix +# gb_LinkTarget_set_generated_cxx_suffix linktarget used-suffix +define gb_LinkTarget_set_generated_cxx_suffix gb_LinkTarget_CXX_SUFFIX_$(1) := $(2) endef diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk index 8b80dda01947..dd972fdba4be 100644 --- a/solenv/gbuild/StaticLibrary.mk +++ b/solenv/gbuild/StaticLibrary.mk @@ -127,7 +127,7 @@ $(eval $(foreach method,\ use_unpacked \ add_sdi_headers \ set_warnings_not_errors \ - set_cxx_suffix \ + set_generated_cxx_suffix \ ,\ $(call gb_StaticLibrary_forward_to_Linktarget,$(method))\ )) |