diff options
| author | David Tardon <dtardon@redhat.com> | 2012-03-04 09:57:54 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-04 10:32:52 +0100 |
| commit | 09888c688ebfdd43a5cb1e44b6c9776eedcf5c3c (patch) | |
| tree | 4799a0d716ad8d23bf7efcfb1fd6ba97e84fee9e /extensions/Library_so_activex.mk | |
| parent | e358dc89fe45fe198b2fe420db5100098b6a3cfa (diff) | |
fix building of so_activex (fdo#46847)
Diffstat (limited to 'extensions/Library_so_activex.mk')
| -rw-r--r-- | extensions/Library_so_activex.mk | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 292b7e130a90..235bcbe39f6d 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -30,22 +30,13 @@ $(eval $(call gb_Library_Library,so_activex)) -$(SRCDIR)/extensions/source/activex/so_activex.cxx: $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb - -$(WORKDIR)/CustomTarget/so_activex/so_activex.tlb: $(SRCDIR)/extensions/source/activex/so_activex.idl - mkdir -p $(WORKDIR)/CustomTarget/so_activex - midl.exe -out $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/so_activex) -Oicf $(call gb_Helper_convert_native,$<) \ - $(foreach i,$(SOLARINC_FOR_BUILD), $(patsubst -I,/I,$(i))) - -$(call gb_Library_get_clean_target,so_activex) : extensions_activex_idlclean - -.PHONY: extensions_activex_idlclean -extensions_activex_idlclean: - rm -rf $(WORKDIR)/CustomTarget/so_activex +$(eval $(call gb_Library_add_package_headers,so_activex,\ + extensions_so_activex_idl \ +)) $(eval $(call gb_Library_set_include,so_activex,\ $$(INCLUDE) \ - -I$(WORKDIR)/CustomTarget/so_activex \ + -I$(WORKDIR)/CustomTarget/extensions/source/activex/idl \ $(foreach i,$(ATL_INCLUDE), -I$(i)) \ )) |