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 /jvmfwk | |
| 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 'jvmfwk')
| -rw-r--r-- | jvmfwk/Executable_javaldx.mk | 2 | ||||
| -rw-r--r-- | jvmfwk/Library_jvmfwk.mk | 6 | ||||
| -rw-r--r-- | jvmfwk/Library_sunjavaplugin.mk | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk index 49252f62f42e..9f5e080d6c81 100644 --- a/jvmfwk/Executable_javaldx.mk +++ b/jvmfwk/Executable_javaldx.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Executable_Executable,javaldx)) -$(eval $(call gb_Executable_add_linked_libs,javaldx,\ +$(eval $(call gb_Executable_use_libraries,javaldx,\ jvmfwk \ sal \ $(gb_STDLIBS) \ diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk index 5b424d0aa58c..f1b67784ad2d 100644 --- a/jvmfwk/Library_jvmfwk.mk +++ b/jvmfwk/Library_jvmfwk.mk @@ -37,18 +37,18 @@ $(eval $(call gb_Library_add_defs,jvmfwk,\ -DJVMFWK_DLLIMPLEMENTATION \ )) -$(eval $(call gb_Library_add_api,jvmfwk,\ +$(eval $(call gb_Library_use_api,jvmfwk,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ +$(eval $(call gb_Library_use_libraries,jvmfwk,\ cppuhelper \ sal \ $(gb_STDLIBS) \ )) ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,jvmfwk,\ +$(eval $(call gb_Library_use_libraries,jvmfwk,\ advapi32 \ )) endif diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk index d1d2af4fe649..7d25d8d603f3 100644 --- a/jvmfwk/Library_sunjavaplugin.mk +++ b/jvmfwk/Library_sunjavaplugin.mk @@ -37,11 +37,11 @@ $(eval $(call gb_Library_add_defs,sunjavaplugin,\ )) endif -$(eval $(call gb_Library_add_api,sunjavaplugin,\ +$(eval $(call gb_Library_use_api,sunjavaplugin,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ +$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ cppu \ cppuhelper \ sal \ @@ -50,13 +50,13 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ )) ifeq ($(OS),ANDROID) -$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ +$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ lo-bootstrap \ )) endif ifeq ($(GUI),WNT) -$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\ +$(eval $(call gb_Library_use_libraries,sunjavaplugin,\ advapi32 \ uwinapi \ )) |