From c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 7 Apr 2012 23:22:08 +0200 Subject: gbuild: "use" vs. "add": Naming convention for gbuild methods: - "add" is used for stuff that is logically a part of the target (i.e. not registered at the Module, but defined in the target's makefile) - "use" is used for stuff that is logically a different target (i.e. it is registered at the Module, has it's own makefile, may be in a different module than the target) --- stoc/Library_bootstrap.mk | 4 ++-- stoc/Library_introspection.mk | 4 ++-- stoc/Library_invocadapt.mk | 4 ++-- stoc/Library_invocation.mk | 4 ++-- stoc/Library_javaloader.mk | 4 ++-- stoc/Library_javavm.mk | 4 ++-- stoc/Library_namingservice.mk | 4 ++-- stoc/Library_proxyfac.mk | 4 ++-- stoc/Library_reflection.mk | 4 ++-- stoc/Library_stocservices.mk | 4 ++-- 10 files changed, 20 insertions(+), 20 deletions(-) (limited to 'stoc') diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk index 490139bfa421..efdaf4e26177 100644 --- a/stoc/Library_bootstrap.mk +++ b/stoc/Library_bootstrap.mk @@ -48,11 +48,11 @@ $(eval $(call gb_Library_set_include,bootstrap,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_internal_bootstrap_api,bootstrap,\ +$(eval $(call gb_Library_use_internal_bootstrap_api,bootstrap,\ bootstrap \ )) -$(eval $(call gb_Library_add_linked_libs,bootstrap,\ +$(eval $(call gb_Library_use_libraries,bootstrap,\ cppu \ cppuhelper \ reg \ diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk index 1e9c97b42a01..2ef9c387a40a 100644 --- a/stoc/Library_introspection.mk +++ b/stoc/Library_introspection.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,introspection,\ +$(eval $(call gb_Library_use_internal_api,introspection,\ insp \ )) -$(eval $(call gb_Library_add_linked_libs,introspection,\ +$(eval $(call gb_Library_use_libraries,introspection,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk index 1c5905071bf7..356522cbfc78 100644 --- a/stoc/Library_invocadapt.mk +++ b/stoc/Library_invocadapt.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,invocadapt,\ +$(eval $(call gb_Library_use_internal_api,invocadapt,\ invadp \ )) -$(eval $(call gb_Library_add_linked_libs,invocadapt,\ +$(eval $(call gb_Library_use_libraries,invocadapt,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk index 92ac438477d2..b73e22c7b18e 100644 --- a/stoc/Library_invocation.mk +++ b/stoc/Library_invocation.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,invocation,\ +$(eval $(call gb_Library_use_internal_api,invocation,\ inv \ )) -$(eval $(call gb_Library_add_linked_libs,invocation,\ +$(eval $(call gb_Library_use_libraries,invocation,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk index 8c672d29f54d..8855eae4911a 100644 --- a/stoc/Library_javaloader.mk +++ b/stoc/Library_javaloader.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,javaloader,\ +$(eval $(call gb_Library_use_internal_api,javaloader,\ javaloader \ )) -$(eval $(call gb_Library_add_linked_libs,javaloader,\ +$(eval $(call gb_Library_use_libraries,javaloader,\ cppu \ cppuhelper \ jvmaccess \ diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk index 2095def49dda..6cfc674f6787 100644 --- a/stoc/Library_javavm.mk +++ b/stoc/Library_javavm.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,javavm,\ +$(eval $(call gb_Library_use_internal_api,javavm,\ jen \ )) -$(eval $(call gb_Library_add_linked_libs,javavm,\ +$(eval $(call gb_Library_use_libraries,javavm,\ cppu \ cppuhelper \ jvmaccess \ diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk index eaa4d7080c59..68747b08c595 100644 --- a/stoc/Library_namingservice.mk +++ b/stoc/Library_namingservice.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,namingservice,\ +$(eval $(call gb_Library_use_internal_api,namingservice,\ namingservice \ )) -$(eval $(call gb_Library_add_linked_libs,namingservice,\ +$(eval $(call gb_Library_use_libraries,namingservice,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk index fe1293beff29..ce3b23b2a830 100644 --- a/stoc/Library_proxyfac.mk +++ b/stoc/Library_proxyfac.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,proxyfac,\ +$(eval $(call gb_Library_use_internal_api,proxyfac,\ proxyfac \ )) -$(eval $(call gb_Library_add_linked_libs,proxyfac,\ +$(eval $(call gb_Library_use_libraries,proxyfac,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk index c56bf0a88a2b..c14aaad31b03 100644 --- a/stoc/Library_reflection.mk +++ b/stoc/Library_reflection.mk @@ -37,11 +37,11 @@ endif endif -$(eval $(call gb_Library_add_internal_api,reflection,\ +$(eval $(call gb_Library_use_internal_api,reflection,\ corefl \ )) -$(eval $(call gb_Library_add_linked_libs,reflection,\ +$(eval $(call gb_Library_use_libraries,reflection,\ cppu \ cppuhelper \ sal \ diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk index 6fb777ee65fd..6a0b5c667eef 100644 --- a/stoc/Library_stocservices.mk +++ b/stoc/Library_stocservices.mk @@ -42,11 +42,11 @@ $(eval $(call gb_Library_set_include,stocservices,\ $$(INCLUDE) \ )) -$(eval $(call gb_Library_add_internal_api,stocservices,\ +$(eval $(call gb_Library_use_internal_api,stocservices,\ stocserv \ )) -$(eval $(call gb_Library_add_linked_libs,stocservices,\ +$(eval $(call gb_Library_use_libraries,stocservices,\ cppu \ cppuhelper \ sal \ -- cgit