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) --- unotools/JunitTest_unotools_complex.mk | 2 +- unotools/Library_utl.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'unotools') diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk index 43a41d711e50..065ebcc5da14 100644 --- a/unotools/JunitTest_unotools_complex.mk +++ b/unotools/JunitTest_unotools_complex.mk @@ -32,7 +32,7 @@ $(eval $(call gb_JunitTest_set_defs,unotools_complex,\ $$(DEFS) \ )) -$(eval $(call gb_JunitTest_add_jars,unotools_complex,\ +$(eval $(call gb_JunitTest_use_jars,unotools_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk index 98fad08b46f7..c6892994501f 100644 --- a/unotools/Library_utl.mk +++ b/unotools/Library_utl.mk @@ -47,14 +47,14 @@ $(eval $(call gb_Library_add_defs,utl,\ -DUNOTOOLS_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,utl,\ +$(eval $(call gb_Library_use_api,utl,\ offapi \ udkapi \ )) # add libraries to be linked to utl; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,utl,\ +$(eval $(call gb_Library_use_libraries,utl,\ comphelper \ cppu \ cppuhelper \ -- cgit