summaryrefslogtreecommitdiffstats
path: root/extensions/WinResTarget_activex.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-03-04 09:57:54 +0100
committerDavid Tardon <dtardon@redhat.com>2012-03-04 10:32:52 +0100
commit09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c (patch)
tree4799a0d716ad8d23bf7efcfb1fd6ba97e84fee9e /extensions/WinResTarget_activex.mk
parentuse custom target for copying sources (diff)
downloadcore-09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c.tar.gz
core-09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c.zip
fix building of so_activex (fdo#46847)
Diffstat (limited to 'extensions/WinResTarget_activex.mk')
-rw-r--r--extensions/WinResTarget_activex.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index fd7879cb6652..7b9c1374f639 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -39,11 +39,13 @@ endif
$(eval $(call gb_WinResTarget_add_file,activex_res,extensions/source/activex/so_activex))
-$(SRCDIR)/extensions/source/activex/so_activex.rc: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb
-
$(eval $(call gb_WinResTarget_set_defs,activex_res,\
$$(DEFS) \
- -DMISC=$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) \
+ -DSO_ACTIVEX_TLB_DIR=$(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) : $(call gb_Package_get_target,extensions_so_activex_idl)
+
# vim:set shiftwidth=4 softtabstop=4 expandtab: