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) --- forms/JunitTest_forms_complex.mk | 2 +- forms/JunitTest_forms_unoapi.mk | 2 +- forms/Library_frm.mk | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'forms') diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk index c61af34e7571..736ca41a1c58 100644 --- a/forms/JunitTest_forms_complex.mk +++ b/forms/JunitTest_forms_complex.mk @@ -28,7 +28,7 @@ $(eval $(call gb_JunitTest_JunitTest,forms_complex)) -$(eval $(call gb_JunitTest_add_jars,forms_complex,\ +$(eval $(call gb_JunitTest_use_jars,forms_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk index b23f2f645b7d..ea4cb505a78b 100644 --- a/forms/JunitTest_forms_unoapi.mk +++ b/forms/JunitTest_forms_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,forms_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/forms/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,forms_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,forms_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk index 64005600f545..126bc5f339f2 100644 --- a/forms/Library_frm.mk +++ b/forms/Library_frm.mk @@ -33,13 +33,13 @@ $(eval $(call gb_Library_set_include,frm,\ -I$(SRCDIR)/forms/source/solar/inc \ )) -$(eval $(call gb_Library_add_api,frm,\ +$(eval $(call gb_Library_use_api,frm,\ offapi \ oovbaapi \ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,frm,\ +$(eval $(call gb_Library_use_libraries,frm,\ comphelper \ cppu \ cppuhelper \ -- cgit