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) --- configmgr/JunitTest_configmgr_unoapi.mk | 2 +- configmgr/Library_configmgr.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'configmgr') diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk index e1abbb331cab..70b570ca60fb 100644 --- a/configmgr/JunitTest_configmgr_unoapi.mk +++ b/configmgr/JunitTest_configmgr_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,configmgr_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk index 2210871bd9a4..13cbdd854165 100644 --- a/configmgr/Library_configmgr.mk +++ b/configmgr/Library_configmgr.mk @@ -63,12 +63,12 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \ configmgr/source/xmldata \ )) -$(eval $(call gb_Library_add_api,configmgr, \ +$(eval $(call gb_Library_use_api,configmgr, \ offapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,configmgr, \ +$(eval $(call gb_Library_use_libraries,configmgr, \ comphelper \ cppu \ cppuhelper \ -- cgit