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) --- javaunohelper/Jar_juh.mk | 2 +- javaunohelper/Library_juh.mk | 4 ++-- javaunohelper/Library_juhx.mk | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'javaunohelper') diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk index ef319babff97..6ed9d239df8f 100644 --- a/javaunohelper/Jar_juh.mk +++ b/javaunohelper/Jar_juh.mk @@ -27,7 +27,7 @@ $(eval $(call gb_Jar_Jar,juh)) -$(eval $(call gb_Jar_add_jars,juh,\ +$(eval $(call gb_Jar_use_jars,juh,\ $(OUTDIR)/bin/jurt.jar \ $(OUTDIR)/bin/ridl.jar \ $(OUTDIR)/bin/unoil.jar \ diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk index 7c34479548da..c72efbe70f4a 100644 --- a/javaunohelper/Library_juh.mk +++ b/javaunohelper/Library_juh.mk @@ -36,11 +36,11 @@ $(eval $(call gb_Library_set_include,juh,\ -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \ )) -$(eval $(call gb_Library_add_api,juh,\ +$(eval $(call gb_Library_use_api,juh,\ udkapi \ )) -$(eval $(call gb_Library_add_linked_libs,juh,\ +$(eval $(call gb_Library_use_libraries,juh,\ sal \ $(gb_STDLIBS) \ )) diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk index fe066b45065b..cd21583ef9ff 100644 --- a/javaunohelper/Library_juhx.mk +++ b/javaunohelper/Library_juhx.mk @@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,juhx,\ -I$(WORKDIR)/CustomTarget/javaunohelper/cppumaker \ )) -$(eval $(call gb_Library_add_linked_libs,juhx,\ +$(eval $(call gb_Library_use_libraries,juhx,\ cppu \ cppuhelper \ jvmaccess \ -- cgit v1.2.3