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 /toolkit | |
| 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 'toolkit')
| -rw-r--r-- | toolkit/JunitTest_toolkit_unoapi.mk | 2 | ||||
| -rw-r--r-- | toolkit/Library_tk.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk index 94d2e0d5cb10..12eb369d3668 100644 --- a/toolkit/JunitTest_toolkit_unoapi.mk +++ b/toolkit/JunitTest_toolkit_unoapi.mk @@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,toolkit_unoapi,\ -Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/toolkit/qa/unoapi/testdocuments \ )) -$(eval $(call gb_JunitTest_add_jars,toolkit_unoapi,\ +$(eval $(call gb_JunitTest_use_jars,toolkit_unoapi,\ $(OUTDIR)/bin/OOoRunner.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/test.jar \ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 60432985d0c2..0518e7a6dacc 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,tk,\ +$(eval $(call gb_Library_use_api,tk,\ udkapi \ offapi \ )) -$(eval $(call gb_Library_add_linked_libs,tk,\ +$(eval $(call gb_Library_use_libraries,tk,\ comphelper \ cppu \ cppuhelper \ @@ -142,7 +142,7 @@ endif ifneq ($(GUIBASE),headless) ifneq (,$(filter LINUX DRAGONFLY OPENBSD FREEBSD NETBSD, $(OS))) -$(eval $(call gb_Library_add_linked_libs,tk,\ +$(eval $(call gb_Library_use_libraries,tk,\ X11 \ )) endif |