extensions/CustomTarget_so_activex_idl.mk | 8 ++++----
extensions/WinResTarget_activex.mk | 4 +---
2 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 0a560f993fb8917a5e2a96d546679484ca8c98e2
Author: Matúš Kukan <matus.ku...@gmail.com>
Date: Wed Apr 4 12:15:37 2012 +0200
fix so_activex_idl, part one
diff --git a/extensions/CustomTarget_so_activex_idl.mk
b/extensions/CustomTarget_so_activex_idl.mk
index e389f5b..80d8089 100644
--- a/extensions/CustomTarget_so_activex_idl.mk
+++ b/extensions/CustomTarget_so_activex_idl.mk
@@ -41,10 +41,10 @@ $(EXAI)/so_activex.tlb : \
$(call gb_Helper_abbreviate_dirs_native, \
midl.exe \
-tlb $@ \
- -h so_activex.h \
- -iid so_activex_i.c \
- -dlldata so_activex_dll.c \
- -proxy so_activex_p.c \
+ -h $(EXAI)/so_activex.h \
+ -iid $(EXAI)/so_activex_i.c \
+ -dlldata $(EXAI)/so_activex_dll.c \
+ -proxy $(EXAI)/so_activex_p.c \
-Oicf \
$(INCLUDE) \
$<)
diff --git a/extensions/WinResTarget_activex.mk
b/extensions/WinResTarget_activex.mk
index bad7a0b..5e297a5 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -44,8 +44,6 @@ $(eval $(call gb_WinResTarget_set_defs,activex_res,\
-DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(call
gb_Helper_convert_native,$(SRCDIR)),../../..,$(call
gb_Helper_convert_native,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)))
\
))
-# I suppose this dep is not really necessary, because it should always
-# be fulfilled anyway. But it cannot hurt to have it...
-$(call gb_WinResTarget_get_target,activex_res) :
$(WORKDIR)/CustomTarget/extensions/source/activex/idl
+$(call gb_WinResTarget_get_target,activex_res) :
$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb
# vim:set shiftwidth=4 softtabstop=4 expandtab:
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
