From 7dc8c952be0595ef0fb161bd524aaff0d3f791d2 Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Wed, 24 Apr 2013 16:46:01 +0200
Subject: extensions: rename WinResTarget target to match source file

Change-Id: I8e528f76d08f7a0d7acec05dcf306cd78b95a885
---
 extensions/Library_npsoplugin.mk      |  6 +++---
 extensions/Library_so_activex.mk      |  2 +-
 extensions/Library_so_activex_x64.mk  |  2 +-
 extensions/WinResTarget_activex.mk    | 10 +++++-----
 extensions/WinResTarget_npsoplugin.mk |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'extensions')

diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 4ea79472d648..8df812ecb4ed 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -116,10 +116,10 @@ $(eval $(call gb_Library_add_ldflags,npsoplugin,\
 endif
 
 # Trick to get rid of the default.res to avoid duplicate VERSION
-# resource: Set NATIVERES for npsoplugin to be *only* npsoplugin_res
+# resource: Set NATIVERES for npsoplugin to be *only* nsplugin_oo
 
-$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,npsoplugin_res))
-$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,npsoplugin_res))
+$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,nsplugin_oo))
+$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,nsplugin_oo))
 
 endif # GUI=WNT
 
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 80571d8764bf..646081253827 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_set_include,so_activex,\
 
 $(eval $(call gb_Library_use_sdk_api,so_activex))
 
-$(eval $(call gb_Library_add_nativeres,so_activex,activex_res))
+$(eval $(call gb_Library_add_nativeres,so_activex,so_activex))
 
 $(eval $(call gb_Library_add_exception_objects,so_activex,\
 	extensions/source/activex/so_activex \
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 96ee19de3a90..cc76b7f24047 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\
 
 $(eval $(call gb_Library_use_sdk_api,so_activex_x64))
 
-$(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
+$(eval $(call gb_Library_add_nativeres,so_activex_x64,so_activex))
 
 $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
 	CustomTarget/extensions/source/activex/so_activex \
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index aab7a6c88b67..3d383dfb8e97 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -28,21 +28,21 @@
 # instead of those above.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,activex_res))
+$(eval $(call gb_WinResTarget_WinResTarget,so_activex))
 
-$(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\
+$(eval $(call gb_WinResTarget_use_custom_headers,so_activex,\
     extensions/source/activex/idl \
 ))
 
 ifneq ($(ENABLE_DBGUTIL),TRUE)
-$(eval $(call gb_WinResTarget_add_defs,activex_res,\
+$(eval $(call gb_WinResTarget_add_defs,so_activex,\
 	-DPRODUCT \
 ))
 endif
 
-$(eval $(call gb_WinResTarget_set_rcfile,activex_res,extensions/source/activex/so_activex))
+$(eval $(call gb_WinResTarget_set_rcfile,so_activex,extensions/source/activex/so_activex))
 
-$(eval $(call gb_WinResTarget_add_defs,activex_res,\
+$(eval $(call gb_WinResTarget_add_defs,so_activex,\
 	$$(DEFS) \
 	-DSO_ACTIVEX_TLB=\"$(subst /,\\\\,$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb\") \
 ))
diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk
index 9a8b5d4284e9..cca787a9b6b9 100644
--- a/extensions/WinResTarget_npsoplugin.mk
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -28,8 +28,8 @@
 # instead of those above.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res))
+$(eval $(call gb_WinResTarget_WinResTarget,nsplugin_oo))
 
-$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo))
+$(eval $(call gb_WinResTarget_set_rcfile,nsplugin_oo,extensions/source/nsplugin/source/nsplugin_oo))
 
 # vim:set noet sw=4 ts=4:
-- 
cgit