rename: set_cxx_suffix -> set_generated_cxx_suffix; used for external libs
Change-Id: I023c6b35c2a65da566ff5bb3aea772c99c90dda3
This commit is contained in:
@@ -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_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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostdatetime,\
|
||||||
UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
|
UnpackedTarball/boost/libs/date_time/src/gregorian/date_generators \
|
||||||
|
@@ -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_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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,boostthread,\
|
||||||
UnpackedTarball/boost/libs/thread/src/win32/thread \
|
UnpackedTarball/boost/libs/thread/src/win32/thread \
|
||||||
|
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_use_libraries,clucene,\
|
|||||||
))
|
))
|
||||||
endif
|
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,\
|
$(eval $(call gb_Library_add_generated_exception_objects,clucene,\
|
||||||
UnpackedTarball/clucene/src/shared/CLucene/SharedHeader \
|
UnpackedTarball/clucene/src/shared/CLucene/SharedHeader \
|
||||||
|
@@ -20,7 +20,7 @@ $(eval $(call gb_StaticLibrary_use_externals,cdrlib,\
|
|||||||
zlib \
|
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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,cdrlib,\
|
||||||
UnpackedTarball/cdr/src/lib/CDRCollector \
|
UnpackedTarball/cdr/src/lib/CDRCollector \
|
||||||
|
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_externals,mspublib,\
|
|||||||
zlib \
|
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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,mspublib,\
|
||||||
UnpackedTarball/mspub/src/lib/ColorReference \
|
UnpackedTarball/mspub/src/lib/ColorReference \
|
||||||
|
@@ -18,7 +18,7 @@ $(eval $(call gb_StaticLibrary_use_externals,visiolib,\
|
|||||||
wpg \
|
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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,visiolib,\
|
||||||
UnpackedTarball/visio/src/lib/libvisio_utils \
|
UnpackedTarball/visio/src/lib/libvisio_utils \
|
||||||
|
@@ -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_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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpdlib,\
|
||||||
UnpackedTarball/wpd/src/lib/libwpd_internal \
|
UnpackedTarball/wpd/src/lib/libwpd_internal \
|
||||||
|
@@ -17,7 +17,7 @@ $(eval $(call gb_StaticLibrary_use_externals,wpglib,\
|
|||||||
wpd \
|
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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpglib,\
|
||||||
UnpackedTarball/wpg/src/lib/WPG1Parser \
|
UnpackedTarball/wpg/src/lib/WPG1Parser \
|
||||||
|
@@ -19,7 +19,7 @@ $(eval $(call gb_StaticLibrary_use_externals,wpslib,\
|
|||||||
wpd \
|
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,\
|
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,wpslib,\
|
||||||
UnpackedTarball/wps/src/lib/libwps_internal \
|
UnpackedTarball/wps/src/lib/libwps_internal \
|
||||||
|
@@ -131,7 +131,7 @@ $(eval $(foreach method,\
|
|||||||
add_sdi_headers \
|
add_sdi_headers \
|
||||||
add_nativeres \
|
add_nativeres \
|
||||||
set_warnings_not_errors \
|
set_warnings_not_errors \
|
||||||
set_cxx_suffix \
|
set_generated_cxx_suffix \
|
||||||
,\
|
,\
|
||||||
$(call gb_Executable_forward_to_Linktarget,$(method))\
|
$(call gb_Executable_forward_to_Linktarget,$(method))\
|
||||||
))
|
))
|
||||||
|
@@ -218,7 +218,7 @@ $(eval $(foreach method,\
|
|||||||
export_objects_list \
|
export_objects_list \
|
||||||
add_nativeres \
|
add_nativeres \
|
||||||
set_warnings_not_errors \
|
set_warnings_not_errors \
|
||||||
set_cxx_suffix \
|
set_generated_cxx_suffix \
|
||||||
,\
|
,\
|
||||||
$(call gb_Library__forward_to_Linktarget,$(method))\
|
$(call gb_Library__forward_to_Linktarget,$(method))\
|
||||||
))
|
))
|
||||||
|
@@ -1129,8 +1129,8 @@ endef
|
|||||||
#
|
#
|
||||||
# This is useful for external libraries.
|
# This is useful for external libraries.
|
||||||
#
|
#
|
||||||
# gb_LinkTarget_set_cxx_suffix linktarget used-suffix
|
# gb_LinkTarget_set_generated_cxx_suffix linktarget used-suffix
|
||||||
define gb_LinkTarget_set_cxx_suffix
|
define gb_LinkTarget_set_generated_cxx_suffix
|
||||||
gb_LinkTarget_CXX_SUFFIX_$(1) := $(2)
|
gb_LinkTarget_CXX_SUFFIX_$(1) := $(2)
|
||||||
|
|
||||||
endef
|
endef
|
||||||
|
@@ -127,7 +127,7 @@ $(eval $(foreach method,\
|
|||||||
use_unpacked \
|
use_unpacked \
|
||||||
add_sdi_headers \
|
add_sdi_headers \
|
||||||
set_warnings_not_errors \
|
set_warnings_not_errors \
|
||||||
set_cxx_suffix \
|
set_generated_cxx_suffix \
|
||||||
,\
|
,\
|
||||||
$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
|
$(call gb_StaticLibrary_forward_to_Linktarget,$(method))\
|
||||||
))
|
))
|
||||||
|
Reference in New Issue
Block a user