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 /bean | |
| 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 'bean')
| -rw-r--r-- | bean/Jar_officebean.mk | 2 | ||||
| -rw-r--r-- | bean/JunitTest_bean_complex.mk | 2 | ||||
| -rw-r--r-- | bean/Library_officebean.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk index 1d03e5cf4cb6..1b897a6d3bef 100644 --- a/bean/Jar_officebean.mk +++ b/bean/Jar_officebean.mk @@ -29,7 +29,7 @@ $(eval $(call gb_Jar_Jar,officebean)) -$(eval $(call gb_Jar_add_jars,officebean,\ +$(eval $(call gb_Jar_use_jars,officebean,\ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ $(OUTDIR)/bin/jurt.jar \ diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk index f443d39fe1a4..5eec323a3472 100644 --- a/bean/JunitTest_bean_complex.mk +++ b/bean/JunitTest_bean_complex.mk @@ -29,7 +29,7 @@ $(eval $(call gb_JunitTest_JunitTest,bean_complex)) -$(eval $(call gb_JunitTest_add_jars,bean_complex,\ +$(eval $(call gb_JunitTest_use_jars,bean_complex,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk index bef4ac271d21..8cafec328542 100644 --- a/bean/Library_officebean.mk +++ b/bean/Library_officebean.mk @@ -46,7 +46,7 @@ endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,officebean,\ +$(eval $(call gb_Library_use_libraries,officebean,\ jawt \ )) @@ -63,7 +63,7 @@ $(eval $(call gb_Library_add_ldflags,officebean,\ endif -$(eval $(call gb_Library_add_linked_libs,officebean,\ +$(eval $(call gb_Library_use_libraries,officebean,\ $(gb_STDLIBS) \ )) |