diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-04-07 23:22:08 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-04-08 01:05:52 +0200 |
| commit | c923f7d2c210dc7846767fc0ac6ece2a0d7812a8 (patch) | |
| tree | 4895fcbbf423daf410da5a8ef8e09ef8064c5c67 /solenv/gbuild/templates | |
| parent | a16060116346533923c607bd406d3fea511b41ec (diff) | |
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)
Diffstat (limited to 'solenv/gbuild/templates')
| -rw-r--r-- | solenv/gbuild/templates/CppunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Executable.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/JunitTest.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/templates/Library.mk | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/solenv/gbuild/templates/CppunitTest.mk b/solenv/gbuild/templates/CppunitTest.mk index 28e940688019..bb27513578b4 100644 --- a/solenv/gbuild/templates/CppunitTest.mk +++ b/solenv/gbuild/templates/CppunitTest.mk @@ -30,7 +30,7 @@ $(eval $(call gb_CppunitTest_CppunitTest,MODULE_NAME)) $(eval $(call gb_CppunitTest_add_exception_objects,MODULE_NAME, \ )) -$(eval $(call gb_CppunitTest_add_linked_libs,MODULE_NAME, \ +$(eval $(call gb_CppunitTest_use_libraries,MODULE_NAME, \ $(gb_STDLIBS) \ )) diff --git a/solenv/gbuild/templates/Executable.mk b/solenv/gbuild/templates/Executable.mk index 5a11ca65a055..9303e757b6fd 100644 --- a/solenv/gbuild/templates/Executable.mk +++ b/solenv/gbuild/templates/Executable.mk @@ -35,7 +35,7 @@ $(eval $(call gb_Executable_set_include,EXEC,\ # -Dfoo \ #)) -$(eval $(call gb_Executable_add_linked_libs,EXEC,\ +$(eval $(call gb_Executable_use_libraries,EXEC,\ $(gb_STDLIBS) \ )) diff --git a/solenv/gbuild/templates/JunitTest.mk b/solenv/gbuild/templates/JunitTest.mk index d4e515fa2d8e..9a086dac3b57 100644 --- a/solenv/gbuild/templates/JunitTest.mk +++ b/solenv/gbuild/templates/JunitTest.mk @@ -32,7 +32,7 @@ $(eval $(call gb_JunitTest_set_defs,MODULE_TYPE,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/MODULE/DOCUMENTPATH \ )) -$(eval $(call gb_JunitTest_add_jars,MODULE_TYPE,\ +$(eval $(call gb_JunitTest_use_jars,MODULE_TYPE,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk index 164617b28349..972ab8273428 100644 --- a/solenv/gbuild/templates/Library.mk +++ b/solenv/gbuild/templates/Library.mk @@ -50,7 +50,7 @@ $(eval $(call gb_Library_set_include,LIB,\ # add libraries to be linked to LIB; again these names need to be given as # specified in Repository.mk -$(eval $(call gb_Library_add_linked_libs,LIB,\ +$(eval $(call gb_Library_use_libraries,LIB,\ $(gb_STDLIBS) \ )) |