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) --- extensions/Library_so_activex_x64.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'extensions/Library_so_activex_x64.mk') diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index 3839f9e0c1a7..723c66787f33 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -32,7 +32,7 @@ $(eval $(call gb_Library_Library,so_activex_x64)) $(eval $(call gb_Library_set_x64,so_activex_x64,YES)) -$(eval $(call gb_Library_add_custom_headers,so_activex_x64,extensions/source/activex/idl)) +$(eval $(call gb_Library_use_custom_headers,so_activex_x64,extensions/source/activex/idl)) $(eval $(call gb_Library_set_include,so_activex_x64,\ $$(INCLUDE) \ @@ -40,7 +40,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) -$(eval $(call gb_Library_add_api,so_activex_x64,\ +$(eval $(call gb_Library_use_api,so_activex_x64,\ offapi \ udkapi \ )) @@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ /DEF:$(call gb_Helper_convert_native,$(SRCDIR)/extensions/source/activex/so_activex.def) \ )) -$(eval $(call gb_Library_add_linked_libs,so_activex_x64,\ +$(eval $(call gb_Library_use_libraries,so_activex_x64,\ uuid \ advapi32 \ ole32 \ -- cgit