diff options
| -rw-r--r-- | Repository.mk | 6 | ||||
| -rw-r--r-- | RepositoryFixes.mk | 6 | ||||
| -rw-r--r-- | cppu/Library_affine_uno_uno.mk (renamed from cppu/Library_affine_uno.mk) | 8 | ||||
| -rw-r--r-- | cppu/Library_log_uno_uno.mk (renamed from cppu/Library_log_uno.mk) | 10 | ||||
| -rw-r--r-- | cppu/Library_unsafe_uno_uno.mk (renamed from cppu/Library_unsafe_uno.mk) | 8 | ||||
| -rw-r--r-- | cppu/Module_cppu.mk | 6 |
6 files changed, 19 insertions, 25 deletions
diff --git a/Repository.mk b/Repository.mk index 57a513b4542d..8d6f10c1bf4b 100644 --- a/Repository.mk +++ b/Repository.mk @@ -448,12 +448,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ )) $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_URE,ure, \ - affine_uno \ + affine_uno_uno \ $(if $(ENABLE_JAVA),java_uno) \ $(if $(ENABLE_JAVA),juh) \ $(if $(ENABLE_JAVA),juhx) \ - log_uno \ - unsafe_uno \ + log_uno_uno \ + unsafe_uno_uno \ $(if $(URELIBS),urelibs) \ $(if $(filter MSC,$(COM)),$(if $(filter INTEL,$(CPUNAME)),msci,mscx),gcc3)_uno \ $(if $(filter $(OS),WNT), \ diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk index df735f1b9dce..7ae03d9fda98 100644 --- a/RepositoryFixes.mk +++ b/RepositoryFixes.mk @@ -47,9 +47,7 @@ endif # Make has no support for 'or' clauses in conditionals, # we use a filter expression instead. ifneq (,$(filter SOLARIS GCC,$(OS) $(COM))) -gb_Library_FILENAMES := $(patsubst affine_uno:libaffine_uno%,affine_uno:libaffine_uno_uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES)) -gb_Library_FILENAMES := $(patsubst log_uno:liblog_uno%,log_uno:liblog_uno_uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst purpenvhelper:libpurpen%,purpenvhelper:libuno_purpen%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES)) @@ -65,14 +63,10 @@ ifneq ($(OS),ANDROID) gb_Library_FILENAMES := $(patsubst unobootstrapprotector:libuno%,unobootstrapprotector:uno%,$(gb_Library_FILENAMES)) gb_Library_FILENAMES := $(patsubst unoexceptionprotector:libuno%,unoexceptionprotector:uno%,$(gb_Library_FILENAMES)) endif -gb_Library_FILENAMES := $(patsubst unsafe_uno:libunsafe_uno%,unsafe_uno:libunsafe_uno_uno%,$(gb_Library_FILENAMES)) endif ifeq ($(OS),WNT) -gb_Library_DLLFILENAMES := $(patsubst affine_uno:affine_uno%,affine_uno:affine_uno_uno%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst log_uno:log_uno%,log_uno:log_uno_uno%,$(gb_Library_DLLFILENAMES)) -gb_Library_DLLFILENAMES := $(patsubst unsafe_uno:unsafe_uno%,unsafe_uno:unsafe_uno_uno%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES)) gb_Library_DLLFILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILENAMES)) diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno_uno.mk index 80d2fe8e9c91..2df3ab9def25 100644 --- a/cppu/Library_affine_uno.mk +++ b/cppu/Library_affine_uno_uno.mk @@ -8,17 +8,17 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,affine_uno)) +$(eval $(call gb_Library_Library,affine_uno_uno)) -$(eval $(call gb_Library_use_udk_api,affine_uno)) +$(eval $(call gb_Library_use_udk_api,affine_uno_uno)) -$(eval $(call gb_Library_use_libraries,affine_uno,\ +$(eval $(call gb_Library_use_libraries,affine_uno_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_exception_objects,affine_uno,\ +$(eval $(call gb_Library_add_exception_objects,affine_uno_uno,\ cppu/source/AffineBridge/AffineBridge \ )) diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno_uno.mk index dcc94743cafd..62d306ffa358 100644 --- a/cppu/Library_log_uno.mk +++ b/cppu/Library_log_uno_uno.mk @@ -8,20 +8,20 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,log_uno)) +$(eval $(call gb_Library_Library,log_uno_uno)) -$(eval $(call gb_Library_use_external,log_uno,boost_headers)) +$(eval $(call gb_Library_use_external,log_uno_uno,boost_headers)) -$(eval $(call gb_Library_use_udk_api,log_uno)) +$(eval $(call gb_Library_use_udk_api,log_uno_uno)) -$(eval $(call gb_Library_use_libraries,log_uno,\ +$(eval $(call gb_Library_use_libraries,log_uno_uno,\ cppu \ purpenvhelper \ sal \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_exception_objects,log_uno,\ +$(eval $(call gb_Library_add_exception_objects,log_uno_uno,\ cppu/source/LogBridge/LogBridge \ )) diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno_uno.mk index b55e0388875c..b6bdad62793a 100644 --- a/cppu/Library_unsafe_uno.mk +++ b/cppu/Library_unsafe_uno_uno.mk @@ -8,17 +8,17 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,unsafe_uno)) +$(eval $(call gb_Library_Library,unsafe_uno_uno)) -$(eval $(call gb_Library_use_udk_api,unsafe_uno)) +$(eval $(call gb_Library_use_udk_api,unsafe_uno_uno)) -$(eval $(call gb_Library_use_libraries,unsafe_uno,\ +$(eval $(call gb_Library_use_libraries,unsafe_uno_uno,\ purpenvhelper \ sal \ $(gb_UWINAPI) \ )) -$(eval $(call gb_Library_add_exception_objects,unsafe_uno,\ +$(eval $(call gb_Library_add_exception_objects,unsafe_uno_uno,\ cppu/source/UnsafeBridge/UnsafeBridge \ )) diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk index 897295cb03b3..90c9d514f60d 100644 --- a/cppu/Module_cppu.mk +++ b/cppu/Module_cppu.mk @@ -13,11 +13,11 @@ $(eval $(call gb_Module_Module,cppu)) $(eval $(call gb_Module_add_targets,cppu,\ InternalUnoApi_cppu_qa_cppumaker_types \ InternalUnoApi_cppu_qa_types \ - Library_affine_uno \ + Library_affine_uno_uno \ Library_cppu \ - Library_log_uno \ + Library_log_uno_uno \ Library_purpenvhelper \ - Library_unsafe_uno \ + Library_unsafe_uno_uno \ )) $(eval $(call gb_Module_add_check_targets,cppu,\ |