diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-12-18 01:42:41 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-12-18 01:42:41 +0100 |
| commit | c439bc7a4aa0a4e01e0d01e09c5869619240c040 (patch) | |
| tree | 2ac41f7eec165c1c8adf5508f09d17ec7e1039e9 /extensions | |
| parent | 1841baf54f053c54969d0164185e2366f9efb3fd (diff) | |
extensions: tweak activex makefiles
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/Library_so_activex.mk | 11 | ||||
| -rw-r--r-- | extensions/Library_so_activex_x64.mk | 17 |
2 files changed, 14 insertions, 14 deletions
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk index 732b2713e077..f4d0d2f4f90e 100644 --- a/extensions/Library_so_activex.mk +++ b/extensions/Library_so_activex.mk @@ -37,6 +37,12 @@ $(WORKDIR)/CustomTarget/so_activex/so_activex.tlb: $(SRCDIR)/extensions/source/a 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_set_include,so_activex,\ $$(INCLUDE) \ -I$(WORKDIR)/CustomTarget/so_activex \ @@ -83,9 +89,4 @@ $(eval $(call gb_Library_add_libs,so_activex,\ )) endif -$(call gb_Library_get_clean_target,so_activex): idlclean - -idlclean: - rm -rf $(WORKDIR)/CustomTarget/so_activex - # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk index eab054d1dae1..f7cfa0b2a257 100644 --- a/extensions/Library_so_activex_x64.mk +++ b/extensions/Library_so_activex_x64.mk @@ -48,17 +48,18 @@ $(eval $(call gb_Library_add_api,so_activex_x64,\ $(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res)) -$(WORKDIR)/extensions/source/activex/%.cxx: $(SRCDIR)/extensions/source/activex/%.cxx +$(WORKDIR)/CustomTarget/extensions/source/activex/%.cxx : \ + $(SRCDIR)/extensions/source/activex/%.cxx mkdir -p $(dir $@) cp $< $@ $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\ - extensions/source/activex/so_activex \ - extensions/source/activex/SOActiveX \ - extensions/source/activex/SOComWindowPeer \ - extensions/source/activex/SODispatchInterceptor \ - extensions/source/activex/SOActionsApproval \ - extensions/source/activex/StdAfx2 \ + CustomTarget/extensions/source/activex/so_activex \ + CustomTarget/extensions/source/activex/SOActiveX \ + CustomTarget/extensions/source/activex/SOComWindowPeer \ + CustomTarget/extensions/source/activex/SODispatchInterceptor \ + CustomTarget/extensions/source/activex/SOActionsApproval \ + CustomTarget/extensions/source/activex/StdAfx2 \ )) $(eval $(call gb_Library_add_ldflags,so_activex_x64,\ @@ -85,6 +86,4 @@ $(eval $(call gb_Library_add_libs,so_activex_x64,\ )) endif -$(call gb_Library_get_clean_target,so_activex_x64): idlclean - # vim:set shiftwidth=4 softtabstop=4 expandtab: |