diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-05-09 23:15:42 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-05-10 10:47:44 +0200 |
| commit | a9550f63cd7a7e064901b2c997375ed384781eea (patch) | |
| tree | b35a7bf6077c5b40390cbde11dffe30ef90d57c9 /extensions | |
| parent | error handling in SortTree custom action (diff) | |
| download | core-a9550f63cd7a7e064901b2c997375ed384781eea.tar.gz core-a9550f63cd7a7e064901b2c997375ed384781eea.zip | |
normalize variable names in gbuild user makefiles
Variables should have module name as prefix to prevent collisions.
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/CustomTarget_so_activex_idl.mk | 17 | ||||
| -rw-r--r-- | extensions/CustomTarget_so_activex_x64.mk | 17 |
2 files changed, 17 insertions, 17 deletions
diff --git a/extensions/CustomTarget_so_activex_idl.mk b/extensions/CustomTarget_so_activex_idl.mk index ac567038b690..bc5c02ffd5a1 100644 --- a/extensions/CustomTarget_so_activex_idl.mk +++ b/extensions/CustomTarget_so_activex_idl.mk @@ -27,24 +27,25 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex/idl)) -EXAI := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl) +extensions_AXIDLDIR := $(call gb_CustomTarget_get_workdir,extensions/source/activex/idl) $(call gb_CustomTarget_get_target,extensions/source/activex/idl) : \ - $(EXAI)/so_activex.tlb + $(extensions_AXIDLDIR)/so_activex.tlb # XXX: I presume that the "$(COM)"=="GCC" case in the original # extensions/source/activex/msidl/makefile.mk was for the # use-mingw-on-windows case and thus is not interesting for us. -$(EXAI)/so_activex.tlb : \ - $(SRCDIR)/extensions/source/activex/so_activex.idl | $(EXAI)/.dir +$(extensions_AXIDLDIR)/so_activex.tlb : \ + $(SRCDIR)/extensions/source/activex/so_activex.idl \ + | $(extensions_AXIDLDIR)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1) $(call gb_Helper_abbreviate_dirs, \ midl.exe \ -tlb $@ \ - -h $(EXAI)/so_activex.h \ - -iid $(EXAI)/so_activex_i.c \ - -dlldata $(EXAI)/so_activex_dll.c \ - -proxy $(EXAI)/so_activex_p.c \ + -h $(extensions_AXIDLDIR)/so_activex.h \ + -iid $(extensions_AXIDLDIR)/so_activex_i.c \ + -dlldata $(extensions_AXIDLDIR)/so_activex_dll.c \ + -proxy $(extensions_AXIDLDIR)/so_activex_p.c \ -Oicf \ $(INCLUDE) \ $<) diff --git a/extensions/CustomTarget_so_activex_x64.mk b/extensions/CustomTarget_so_activex_x64.mk index 88b07b19d9e8..8e72c7a4cbc2 100644 --- a/extensions/CustomTarget_so_activex_x64.mk +++ b/extensions/CustomTarget_so_activex_x64.mk @@ -27,17 +27,16 @@ $(eval $(call gb_CustomTarget_CustomTarget,extensions/source/activex)) -EXSA := $(call gb_CustomTarget_get_workdir,extensions/source/activex) - $(call gb_CustomTarget_get_target,extensions/source/activex) : \ - $(EXSA)/SOActionsApproval.cxx \ - $(EXSA)/SOActiveX.cxx \ - $(EXSA)/SOComWindowPeer.cxx \ - $(EXSA)/SODispatchInterceptor.cxx \ - $(EXSA)/StdAfx2.cxx \ - $(EXSA)/so_activex.cxx \ + $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActionsApproval.cxx \ + $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOActiveX.cxx \ + $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SOComWindowPeer.cxx \ + $(call gb_CustomTarget_get_workdir,extensions/source/activex)/SODispatchInterceptor.cxx \ + $(call gb_CustomTarget_get_workdir,extensions/source/activex)/StdAfx2.cxx \ + $(call gb_CustomTarget_get_workdir,extensions/source/activex)/so_activex.cxx \ -$(EXSA)/% : $(SRCDIR)/extensions/source/activex/% +$(call gb_CustomTarget_get_workdir,extensions/source/activex)/% : \ + $(SRCDIR)/extensions/source/activex/% cp $< $@ # vim:set shiftwidth=4 tabstop=4 noexpandtab: |