normalize variable names in gbuild user makefiles

Variables should have module name as prefix to prevent collisions.

accessibility/CustomTarget_bridge.mk

@@ -27,26 +27,24 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge))
 
-ACBR := $(call gb_CustomTarget_get_workdir,accessibility/bridge)
-
 $(call gb_CustomTarget_get_target,accessibility/bridge) : \
-    $(ACBR)/org/openoffice/java/accessibility/Build.java
+    $(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java
 
 ifeq ($(PRODUCT),)
-ac_DEBUGSWITCH := true
-ac_PRODUCTSWITCH := false
+accessibility_DEBUG := true
+accessibility_PRODUCT := false
 else
-ac_DEBUGSWITCH := false
-ac_PRODUCTSWITCH := true
+accessibility_DEBUG := false
+accessibility_PRODUCT := true
 endif
 
-$(ACBR)/org/openoffice/java/accessibility/Build.java :
+$(call gb_CustomTarget_get_workdir,accessibility/bridge)/org/openoffice/java/accessibility/Build.java :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	mkdir -p $(dir $@) && (\
         echo package org.openoffice.java.accessibility\; && \
         echo public class Build \{ && \
-        echo public static final boolean DEBUG = $(ac_DEBUGSWITCH)\; && \
-        echo public static final boolean PRODUCT = $(ac_PRODUCTSWITCH)\; && \
+        echo public static final boolean DEBUG = $(accessibility_DEBUG)\; && \
+        echo public static final boolean PRODUCT = $(accessibility_PRODUCT)\; && \
         echo \} \
         ) > $@
 

accessibility/CustomTarget_bridge_inc.mk

@@ -27,12 +27,11 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,accessibility/bridge/inc))
 
-ACBI := $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)
-
 $(call gb_CustomTarget_get_target,accessibility/bridge/inc) : \
-    $(ACBI)/WindowsAccessBridgeAdapter.h
+    $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/WindowsAccessBridgeAdapter.h
 
-$(ACBI)/WindowsAccessBridgeAdapter.h :| $(ACBI)/.dir \
+$(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/WindowsAccessBridgeAdapter.h :| \
+        $(call gb_CustomTarget_get_workdir,accessibility/bridge/inc)/.dir \
         $(call gb_Jar_get_target,java_uno_accessbridge)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVH,1)
 	cd $(call gb_JavaClassSet_get_classdir,$(call gb_Jar_get_classsetname,java_uno_accessbridge)) && \

clucene/CustomTarget_source.mk

@@ -28,15 +28,15 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,clucene/source))
 
-CLSO := $(call gb_CustomTarget_get_workdir,clucene/source)
+clucene_DIR := $(call gb_CustomTarget_get_workdir,clucene/source)
 
-$(call gb_CustomTarget_get_target,clucene/source) : $(CLSO)/done
+$(call gb_CustomTarget_get_target,clucene/source) : $(clucene_DIR)/done
 
 # FIXME: do not hardcode the path here
 ifeq ($(OS_FOR_BUILD),WNT)
-cl_FIXED_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+clucene_FIXED_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 else
-cl_FIXED_TARFILE_LOCATION := $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
+clucene_FIXED_TARFILE_LOCATION := $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
 endif
 
 ifeq ($(OS),WNT)
@@ -57,7 +57,7 @@ endif
 
 # clucene-multimap-put.patch was proposed upstream, see
 # <http://sourceforge.net/mailarchive/message.php?msg_id=29143260>:
-$(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \
+$(clucene_DIR)/done : $(clucene_FIXED_TARFILE_LOCATION) \
 		$(_CLUCENE_CONFIG_H) $(CLUCENE_CONFIG_H)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TAR,1)
 	$(call gb_Helper_abbreviate_dirs, \
@@ -69,16 +69,16 @@ $(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \
 	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch && \
 	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch && \
 	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-multimap-put.patch && \
-	for i in `find $(CLSO)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done)
+	for i in `find $(clucene_DIR)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done)
 	#FIXME ?, our rules expect .cxx
 ifneq ($(OS),WNT)
 	#dirent.h is a problem, move it around
-	mkdir -p $(CLSO)/inc/internal/CLucene/util
-	mv $(CLSO)/src/shared/CLucene/util/dirent.h $(CLSO)/inc/internal/CLucene/util
+	mkdir -p $(clucene_DIR)/inc/internal/CLucene/util
+	mv $(clucene_DIR)/src/shared/CLucene/util/dirent.h $(clucene_DIR)/inc/internal/CLucene/util
 endif
 	#To generate these, run cmake for each sufficiently different platform, customize and stick into configs
-	cp $(CLUCENE_CONFIG_H) $(CLSO)/src/shared/CLucene/clucene-config.h
-	cp $(_CLUCENE_CONFIG_H) $(CLSO)/src/shared/CLucene/_clucene-config.h
+	cp $(CLUCENE_CONFIG_H) $(clucene_DIR)/src/shared/CLucene/clucene-config.h
+	cp $(_CLUCENE_CONFIG_H) $(clucene_DIR)/src/shared/CLucene/_clucene-config.h
 	touch $@
 
 # vim: set noet sw=4 ts=4:

desktop/CustomTarget_soffice.mk

@@ -27,11 +27,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,desktop/soffice))
 
-DESO := $(call gb_CustomTarget_get_workdir,desktop/soffice)
+$(call gb_CustomTarget_get_target,desktop/soffice) : \
+	$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh
 
-$(call gb_CustomTarget_get_target,desktop/soffice) : $(DESO)/soffice.sh
-
-$(DESO)/soffice.sh : $(SRCDIR)/desktop/scripts/soffice.sh | $(DESO)/.dir
+$(call gb_CustomTarget_get_workdir,desktop/soffice)/soffice.sh : \
+		$(SRCDIR)/desktop/scripts/soffice.sh \
+		| $(call gb_CustomTarget_get_workdir,desktop/soffice)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 ifneq ($(JITC_PROCESSOR_TYPE),)
 	sed -e "s/^#@JITC_PROCESSOR_TYPE_EXPORT@/export JITC_PROCESSOR_TYPE=$(JITC_PROCESSOR_TYPE)/" $< > $@

desktop/Executable_unopkg.bin.mk

@@ -26,21 +26,21 @@
 # instead of those above.
 
 ifeq ($(OS),WNT)
-unopkgbin := unopkg_bin
+desktop_UNOPKGBIN := unopkg_bin
 else
-unopkgbin := unopkg.bin
+desktop_UNOPKGBIN := unopkg.bin
 endif
 
-$(eval $(call gb_Executable_Executable,$(unopkgbin)))
+$(eval $(call gb_Executable_Executable,$(desktop_UNOPKGBIN)))
 
-$(eval $(call gb_Executable_set_targettype_gui,$(unopkgbin),YES))
+$(eval $(call gb_Executable_set_targettype_gui,$(desktop_UNOPKGBIN),YES))
 
-$(eval $(call gb_Executable_set_include,$(unopkgbin),\
+$(eval $(call gb_Executable_set_include,$(desktop_UNOPKGBIN),\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/source/inc \
 ))
 
-$(eval $(call gb_Executable_use_libraries,$(unopkgbin),\
+$(eval $(call gb_Executable_use_libraries,$(desktop_UNOPKGBIN),\
     comphelper \
     sal \
     tl \
@@ -48,15 +48,15 @@ $(eval $(call gb_Executable_use_libraries,$(unopkgbin),\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_cobjects,$(unopkgbin),\
+$(eval $(call gb_Executable_add_cobjects,$(desktop_UNOPKGBIN),\
     desktop/source/pkgchk/unopkg/unopkg_main \
 ))
 
 ifeq ($(OS),WNT)
 
-# the resulting executable is called $(unopkgbin).exe, copy it to $(unopkgbin)
-$(eval $(call gb_Package_Package,$(unopkgbin),$(OUTDIR)/bin))
-$(eval $(call gb_Package_add_file,$(unopkgbin),bin/unopkg.bin,$(unopkgbin).exe))
+# the resulting executable is called $(desktop_UNOPKGBIN).exe, copy it to $(desktop_UNOPKGBIN)
+$(eval $(call gb_Package_Package,$(desktop_UNOPKGBIN),$(OUTDIR)/bin))
+$(eval $(call gb_Package_add_file,$(desktop_UNOPKGBIN),bin/unopkg.bin,$(desktop_UNOPKGBIN).exe))
 
 endif
 

embeddedobj/Library_emboleobj.mk

@@ -27,13 +27,7 @@
 
 $(eval $(call gb_Library_Library,emboleobj))
 
-ifeq ($(OS),WNT)
-emboleobj_suffix := .windows
-else
-emboleobj_suffix :=
-endif
-
-$(eval $(call gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj$(emboleobj_suffix)))
+$(eval $(call gb_Library_set_componentfile,emboleobj,embeddedobj/source/msole/emboleobj$(if $(filter WNT,$(OS)),.windows)))
 
 $(eval $(call gb_Library_set_include,emboleobj,\
 	-I$(SRCDIR)/embeddedobj/source/inc \

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) \
 		$<)

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:

filter/CustomTarget_svg.mk

@@ -27,23 +27,22 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,filter/source/svg))
 
-FISS := $(call gb_CustomTarget_get_workdir,filter/source/svg)
+filter_SVGSRC := $(SRCDIR)/filter/source/svg
+filter_SVGWORK := $(call gb_CustomTarget_get_workdir,filter/source/svg)
 
-SRCDIR_FILTER := $(SRCDIR)/filter/source/svg
-WORKDIR_FILTER := $(FISS)
+filter_SRC_svg_Tokens := $(filter_SVGSRC)/tokens.txt
+filter_SRC_svg_GenToken := $(filter_SVGSRC)/gentoken.pl
+filter_SRC_svg_PresentationEngine := $(filter_SVGSRC)/presentation_engine.js
+filter_SRC_svg_Js2Hxx := $(filter_SVGSRC)/js2hxx.py
 
-filter_SRC_svg_Tokens := $(SRCDIR_FILTER)/tokens.txt
-filter_SRC_svg_GenToken := $(SRCDIR_FILTER)/gentoken.pl
-filter_SRC_svg_PresentationEngine := $(SRCDIR_FILTER)/presentation_engine.js
-filter_SRC_svg_Js2Hxx := $(SRCDIR_FILTER)/js2hxx.py
-
-filter_GEN_svg_Tokens_gperf := $(WORKDIR_FILTER)/tokens.gperf
-filter_GEN_svg_Tokens_hxx := $(WORKDIR_FILTER)/tokens.hxx
-filter_GEN_svg_Tokens_cxx := $(WORKDIR_FILTER)/tokens.cxx
-filter_GEN_svg_Script_hxx := $(WORKDIR_FILTER)/svgscript.hxx
+filter_GEN_svg_Tokens_gperf := $(filter_SVGWORK)/tokens.gperf
+filter_GEN_svg_Tokens_hxx := $(filter_SVGWORK)/tokens.hxx
+filter_GEN_svg_Tokens_cxx := $(filter_SVGWORK)/tokens.cxx
+filter_GEN_svg_Script_hxx := $(filter_SVGWORK)/svgscript.hxx
 
 $(filter_GEN_svg_Tokens_gperf) : \
-			$(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) | $(FISS)/.dir
+			$(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) \
+			| $(filter_SVGWORK)/.dir
 	$(call gb_Output_announce,$@,build,GPF,3)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(filter_SRC_svg_GenToken) $(filter_SRC_svg_Tokens) \
@@ -60,7 +59,8 @@ $(filter_GEN_svg_Tokens_cxx) : $(filter_GEN_svg_Tokens_gperf)
 			 > $(filter_GEN_svg_Tokens_cxx))
 
 $(filter_GEN_svg_Script_hxx) : \
-			$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) | $(FISS)/.dir
+			$(filter_SRC_svg_PresentationEngine) $(filter_SRC_svg_Js2Hxx) \
+			| $(filter_SVGWORK)/.dir
 	$(call gb_Output_announce,$@,build,PY ,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(gb_PYTHON) $(filter_SRC_svg_Js2Hxx) \

i18npool/CustomTarget_breakiterator.mk

@@ -28,75 +28,80 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,i18npool/breakiterator))
 
-IPBI := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
+i18npool_BIDIR := $(call gb_CustomTarget_get_workdir,i18npool/breakiterator)
 
 $(call gb_CustomTarget_get_target,i18npool/breakiterator) : \
-	$(IPBI)/dict_ja.cxx $(IPBI)/dict_zh.cxx $(IPBI)/OpenOffice_dat.c
+	$(i18npool_BIDIR)/dict_ja.cxx $(i18npool_BIDIR)/dict_zh.cxx $(i18npool_BIDIR)/OpenOffice_dat.c
 
-$(IPBI)/dict_%.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic \
-		$(call gb_Executable_get_target_for_build,gendict) | $(IPBI)/.dir
+$(i18npool_BIDIR)/dict_%.cxx : \
+		$(SRCDIR)/i18npool/source/breakiterator/data/%.dic \
+		$(call gb_Executable_get_target_for_build,gendict) \
+		| $(i18npool_BIDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DIC,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		$(call gb_Helper_execute,gendict) $< $@ $(patsubst $(IPBI)/dict_%.cxx,%,$@))
+		$(call gb_Helper_execute,gendict) $< $@ $(patsubst $(i18npool_BIDIR)/dict_%.cxx,%,$@))
 
 ifeq ($(SYSTEM_GENBRK),)
-GENBRKTARGET := $(call gb_Executable_get_target_for_build,genbrk)
-GENBRK := $(call gb_Helper_execute,genbrk)
+i18npool_GENBRKTARGET := $(call gb_Executable_get_target_for_build,genbrk)
+i18npool_GENBRK := $(call gb_Helper_execute,genbrk)
 else
-GENBRKTARGET :=
-GENBRK := $(SYSTEM_GENBRK)
+i18npool_GENBRKTARGET :=
+i18npool_GENBRK := $(SYSTEM_GENBRK)
 endif
 
 ifeq ($(SYSTEM_GENCCODE),)
-GENCCODETARGET := $(call gb_Executable_get_target_for_build,genccode)
-GENCCODE := $(call gb_Helper_execute,genccode)
+i18npool_GENCCODETARGET := $(call gb_Executable_get_target_for_build,genccode)
+i18npool_GENCCODE := $(call gb_Helper_execute,genccode)
 else
-GENCCODETARGET :=
-GENCCODE := $(SYSTEM_GENCCODE)
+i18npool_GENCCODETARGET :=
+i18npool_GENCCODE := $(SYSTEM_GENCCODE)
 endif
 
 ifeq ($(SYSTEM_GENCMN),)
-GENCMNTARGET := $(call gb_Executable_get_target_for_build,gencmn)
-GENCMN := $(call gb_Helper_execute,gencmn)
+i18npool_GENCMNTARGET := $(call gb_Executable_get_target_for_build,gencmn)
+i18npool_GENCMN := $(call gb_Helper_execute,gencmn)
 else
-GENCMNTARGET :=
-GENCMN := $(SYSTEM_GENCMN)
+i18npool_GENCMNTARGET :=
+i18npool_GENCMN := $(SYSTEM_GENCMN)
 endif
 
-BRKFILES := $(subst .txt,.brk,$(notdir \
+i18npool_BRKFILES := $(subst .txt,.brk,$(notdir \
 	$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt)))
 
 # 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
 # The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools,
 # so the output (OpenOffice_dat.c) is changed here to include a pragma to disable the warnings.
 # Output of gencmn is redirected to OpenOffice_tmp.c with the -t switch.
-$(IPBI)/OpenOffice_dat.c : $(patsubst %.brk,$(IPBI)/%_brk.c,$(BRKFILES)) $(GENCMNTARGET)
+$(i18npool_BIDIR)/OpenOffice_dat.c : \
+		$(patsubst %.brk,$(i18npool_BIDIR)/%_brk.c,$(i18npool_BRKFILES)) \
+		$(i18npool_GENCMNTARGET)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CMN,1)
 	$(call gb_Helper_abbreviate_dirs,\
 		RESPONSEFILE=$(shell $(gb_MKTEMP)) && \
-		$(foreach brk,$(BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \
-		$(GENCMN) -n OpenOffice -t tmp -S -d $(IPBI)/ 0 $${RESPONSEFILE} && \
+		$(foreach brk,$(i18npool_BRKFILES),echo '$(brk)' >> $${RESPONSEFILE} && ) \
+		$(i18npool_GENCMN) -n OpenOffice -t tmp -S -d $(i18npool_BIDIR)/ 0 $${RESPONSEFILE} && \
 		rm -f $${RESPONSEFILE} && \
 		echo '#ifdef _MSC_VER' > $@ && \
 		echo '#pragma warning( disable : 4229 4668 )' >> $@ && \
 		echo '#endif' >> $@ && \
 		cat $(subst _dat,_tmp,$@) >> $@)
 
-$(IPBI)/%_brk.c : $(IPBI)/%.brk $(GENCCODETARGET)
+$(i18npool_BIDIR)/%_brk.c : $(i18npool_BIDIR)/%.brk $(i18npool_GENCCODETARGET)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CCD,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		$(GENCCODE) -n OpenOffice -d $(IPBI)/ $< \
+		$(i18npool_GENCCODE) -n OpenOffice -d $(i18npool_BIDIR)/ $< \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
-$(IPBI)/%.brk : $(IPBI)/%.txt $(GENBRKTARGET)
+$(i18npool_BIDIR)/%.brk : $(i18npool_BIDIR)/%.txt $(i18npool_GENBRKTARGET)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRK,1)
 	$(call gb_Helper_abbreviate_dirs,\
-		$(GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
+		$(i18npool_GENBRK) -r $< -o $@ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 # fdo#31271 ")" reclassified in more recent Unicode Standards / ICU 4.4
 # Prepend set empty as of Unicode Version 6.1 / ICU 4.9, which bails out if used.
 # NOTE: strips every line with _word_ 'Prepend', including $Prepend
-$(IPBI)/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(IPBI)/.dir
+$(i18npool_BIDIR)/%.txt : \
+	$(SRCDIR)/i18npool/source/breakiterator/data/%.txt | $(i18npool_BIDIR)/.dir
 ifeq ($(ICU_RECLASSIFIED_CLOSE_PARENTHESIS),YES)
 ifeq ($(ICU_RECLASSIFIED_PREPEND_SET_EMPTY),YES)
 	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#;/\<Prepend\>/d" $< > $@

i18npool/CustomTarget_collator.mk

@@ -28,22 +28,25 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,i18npool/collator))
 
-IPCO := $(call gb_CustomTarget_get_workdir,i18npool/collator)
-TXTLIST := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt))
+i18npool_CODIR := $(call gb_CustomTarget_get_workdir,i18npool/collator)
+i18npool_COTXTS := $(notdir $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt))
 
 $(call gb_CustomTarget_get_target,i18npool/collator) : \
-	$(IPCO)/lrl_include.hxx $(foreach txt,$(TXTLIST), \
-		$(patsubst %.txt,$(IPCO)/collator_%.cxx,$(txt)))
+	$(i18npool_CODIR)/lrl_include.hxx $(foreach txt,$(i18npool_COTXTS), \
+		$(patsubst %.txt,$(i18npool_CODIR)/collator_%.cxx,$(txt)))
 
-$(IPCO)/collator_%.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt \
-		$(call gb_Executable_get_target_for_build,gencoll_rule) | $(IPCO)/.dir
+$(i18npool_CODIR)/collator_%.cxx : \
+		$(SRCDIR)/i18npool/source/collator/data/%.txt \
+		$(call gb_Executable_get_target_for_build,gencoll_rule) \
+		| $(i18npool_CODIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLR,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(call gb_Helper_execute,gencoll_rule) $< $@ $*)
 
-$(IPCO)/lrl_include.hxx : $(SRCDIR)/i18npool/source/collator/data | $(IPCO)/.dir
+$(i18npool_CODIR)/lrl_include.hxx : \
+		$(SRCDIR)/i18npool/source/collator/data | $(i18npool_CODIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
-	echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(TXTLIST), \
+	echo '#define LOCAL_RULE_LANGS "$(sort $(foreach txt,$(i18npool_COTXTS), \
 		$(firstword $(subst _, ,$(txt)))))"' > $@
 
 # vim: set noet sw=4 ts=4:

i18npool/CustomTarget_indexentry.mk

@@ -28,14 +28,14 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,i18npool/indexentry))
 
-IPIE := $(call gb_CustomTarget_get_workdir,i18npool/indexentry)
-
 $(call gb_CustomTarget_get_target,i18npool/indexentry) : \
-	$(patsubst %.txt,$(IPIE)/%.cxx,$(notdir \
+	$(patsubst %.txt,$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx,$(notdir \
 		$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt)))
 
-$(IPIE)/%.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt \
-		$(call gb_Executable_get_target_for_build,genindex_data) | $(IPIE)/.dir
+$(call gb_CustomTarget_get_workdir,i18npool/indexentry)/%.cxx : \
+		$(SRCDIR)/i18npool/source/indexentry/data/%.txt \
+		$(call gb_Executable_get_target_for_build,genindex_data) \
+		| $(call gb_CustomTarget_get_workdir,i18npool/indexentry)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IND,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(call gb_Helper_execute,genindex_data) $< $@.tmp $* && \

i18npool/CustomTarget_localedata.mk

@@ -28,32 +28,33 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,i18npool/localedata))
 
-IPLD := $(call gb_CustomTarget_get_workdir,i18npool/localedata)
+i18npool_LDDIR := $(call gb_CustomTarget_get_workdir,i18npool/localedata)
 
 $(call gb_CustomTarget_get_target,i18npool/localedata) : \
-	$(patsubst %.xml,$(IPLD)/localedata_%.cxx, \
+	$(patsubst %.xml,$(i18npool_LDDIR)/localedata_%.cxx, \
 		$(notdir $(wildcard $(SRCDIR)/i18npool/source/localedata/data/*.xml)))
 
-$(IPLD)/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml \
-		$(IPLD)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
+$(i18npool_LDDIR)/localedata_%.cxx : \
+		$(SRCDIR)/i18npool/source/localedata/data/%.xml \
+		$(i18npool_LDDIR)/saxparser.rdb $(call gb_Executable_get_target_for_build,saxparser)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SAX,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(call gb_Helper_execute,saxparser) $* $< $@.tmp \
-			$(call gb_Helper_make_url,$(IPLD)/saxparser.rdb) \
+			$(call gb_Helper_make_url,$(i18npool_LDDIR)/saxparser.rdb) \
 			$(call gb_Helper_make_url,$(OUTDIR_FOR_BUILD)/bin/types.rdb) \
 			-env:LO_LIB_DIR=$(call gb_Helper_make_url,$(gb_Helper_OUTDIR_FOR_BUILDLIBDIR)) \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null 2>&1) && \
 		sed 's/\(^.*get[^;]*$$\)/SAL_DLLPUBLIC_EXPORT \1/' $@.tmp > $@ && \
 		rm $@.tmp)
 
-$(IPLD)/saxparser.rdb : $(IPLD)/saxparser.input \
+$(i18npool_LDDIR)/saxparser.rdb : $(i18npool_LDDIR)/saxparser.input \
 		$(gb_XSLTPROCTARGET) $(SOLARENV)/bin/packcomponents.xslt
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RDB,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(gb_XSLTPROC) --nonet --stringparam prefix $(OUTDIR_FOR_BUILD)/xml/ \
 			-o $@ $(SOLARENV)/bin/packcomponents.xslt $<)
 
-$(IPLD)/saxparser.input :| $(IPLD)/.dir
+$(i18npool_LDDIR)/saxparser.input :| $(i18npool_LDDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '<list><filename>component/sax/source/expatwrap/expwrap.component</filename></list>' > $@
 

i18npool/CustomTarget_textconversion.mk

@@ -28,14 +28,14 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,i18npool/textconversion))
 
-IPTC := $(call gb_CustomTarget_get_workdir,i18npool/textconversion)
-
 $(call gb_CustomTarget_get_target,i18npool/textconversion) : \
-	$(patsubst %.dic,$(IPTC)/%.cxx,$(notdir \
+	$(patsubst %.dic,$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx,$(notdir \
 		$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic)))
 
-$(IPTC)/%.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic \
-		$(call gb_Executable_get_target_for_build,genconv_dict) | $(IPTC)/.dir
+$(call gb_CustomTarget_get_workdir,i18npool/textconversion)/%.cxx : \
+		$(SRCDIR)/i18npool/source/textconversion/data/%.dic \
+		$(call gb_Executable_get_target_for_build,genconv_dict) \
+		| $(call gb_CustomTarget_get_workdir,i18npool/textconversion)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CDC,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(call gb_Helper_execute,genconv_dict) $* $< $@.tmp && \

jurt/CustomTarget_jnilib.mk

@@ -27,11 +27,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,jurt/util))
 
-JUJL := $(call gb_CustomTarget_get_workdir,jurt/util)
+$(call gb_CustomTarget_get_target,jurt/util) : \
+	$(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib
 
-$(call gb_CustomTarget_get_target,jurt/util) : $(JUJL)/libjpipe.jnilib
-
-$(JUJL)/libjpipe.jnilib : $(call gb_Library_get_target,jpipe) | $(JUJL)/.dir
+$(call gb_CustomTarget_get_workdir,jurt/util)/libjpipe.jnilib : \
+		$(call gb_Library_get_target,jpipe) \
+		| $(call gb_CustomTarget_get_workdir,jurt/util)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MCB,1)
 	cd $(dir $@) && $(SOLARENV)/bin/macosx-create-bundle $<
 

jurt/CustomTarget_test_urp.mk

@@ -27,26 +27,28 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,jurt/test/com/sun/star/lib/uno/protocols/urp))
 
-JUTU := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp)
+jurt_TESTURP := $(call gb_CustomTarget_get_workdir,jurt/test/com/sun/star/lib/uno/protocols/urp)
 
-$(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(JUTU)/done
+$(call gb_CustomTarget_get_target,jurt/test/com/sun/star/lib/uno/protocols/urp) : $(jurt_TESTURP)/done
 
-$(JUTU)/done : $(JUTU)/registry.rdb $(OUTDIR)/bin/types.rdb \
+$(jurt_TESTURP)/done : $(jurt_TESTURP)/registry.rdb $(OUTDIR)/bin/types.rdb \
 		$(call gb_Executable_get_target_for_build,javamaker)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
-	$(call gb_Helper_execute,javamaker -BUCR -O$(JUTU) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
+	$(call gb_Helper_execute,javamaker -BUCR -O$(jurt_TESTURP) -nD $< -X$(OUTDIR)/bin/types.rdb) && \
 	touch $@
 
 # TODO: would it be possible to reuse UnoApiTarget for this?
-$(JUTU)/registry.rdb : $(JUTU)/interfaces.urd \
+$(jurt_TESTURP)/registry.rdb : $(jurt_TESTURP)/interfaces.urd \
 		$(call gb_Executable_get_target_for_build,regmerge)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),RGM,1)
 	rm -f $@ && \
 	$(call gb_Helper_execute,regmerge $@ /UCR $<)
 
-$(JUTU)/interfaces.urd : $(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \
-		$(call gb_Executable_get_target_for_build,idlc) | $(JUTU)/urd/.dir
+$(jurt_TESTURP)/interfaces.urd : \
+		$(SRCDIR)/jurt/test/com/sun/star/lib/uno/protocols/urp/interfaces.idl \
+		$(call gb_Executable_get_target_for_build,idlc) \
+		| $(jurt_TESTURP)/urd/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),IDL,1)
-	$(call gb_Helper_execute,idlc -O$(JUTU) -I$(OUTDIR)/idl -cid -we $<)
+	$(call gb_Helper_execute,idlc -O$(jurt_TESTURP) -I$(OUTDIR)/idl -cid -we $<)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

jvmfwk/CustomTarget_jreproperties.mk

@@ -27,12 +27,11 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,jvmfwk/jreproperties))
 
-JFJP := $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)
+$(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class
 
-$(call gb_CustomTarget_get_target,jvmfwk/jreproperties) : $(JFJP)/JREProperties.class
-
-$(JFJP)/JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
-		| $(JFJP)/.dir
+$(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/JREProperties.class : \
+		$(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
+		| $(call gb_CustomTarget_get_workdir,jvmfwk/jreproperties)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JCS,1)
 	$(call gb_Helper_abbreviate_dirs, \
 	cd $(dir $@) && $(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^)

jvmfwk/Package_rcfiles.mk

@@ -33,28 +33,28 @@ $(eval $(call gb_Package_add_file,jvmfwk_rcfiles,bin/javasettingsunopkginstall.x
 # the same directory as dynamic libraries (either bin or lib):
 
 ifeq ($(GUI),WNT)
-my_Package_jvmfwk_rcfiles_dir = bin
+jvmfwk_Package_RCFILESDIR := bin
 else
-my_Package_jvmfwk_rcfiles_dir = lib
+jvmfwk_Package_RCFILESDIR := lib
 endif
 
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(my_Package_jvmfwk_rcfiles_dir)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(my_Package_jvmfwk_rcfiles_dir)/jvmfwk3),source/jvmfwk3rc))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/sunjavaplugin),plugins/sunmajor/pluginlib/sunjavapluginrc))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(call gb_Helper_get_rcfile,$(jvmfwk_Package_RCFILESDIR)/jvmfwk3),source/jvmfwk3rc))
 
 ifeq ($(GUI),UNX)
 ifeq ($(OS),FREEBSD)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_freebsd.xml))
 else ifeq ($(OS),MACOSX)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_macosx.xml))
 else ifeq ($(OS),LINUX)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
 else ifeq ($(OS),AIX)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_linux.xml))
 else
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_unx.xml))
 endif
 else ifeq ($(GUI),WNT)
-$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(my_Package_jvmfwk_rcfiles_dir)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
+$(eval $(call gb_Package_add_file,jvmfwk_rcfiles,$(jvmfwk_Package_RCFILESDIR)/javavendors.xml,distributions/OpenOfficeorg/javavendors_wnt.xml))
 else
 $(call gb_Output_error,Unsupported platform)
 endif

officecfg/CustomTarget_registry.mk

@@ -26,37 +26,34 @@
 ## instead of those above.
 ##
 
-OCDIR := $(SRCDIR)/officecfg/registry
-include $(OCDIR)/files.mk
+include $(SRCDIR)/officecfg/registry/files.mk
 
 $(eval $(call gb_CustomTarget_CustomTarget,officecfg/registry))
 
-OCRG := $(call gb_CustomTarget_get_workdir,officecfg/registry)
-
 $(call gb_CustomTarget_get_target,officecfg/registry) : \
-	$(foreach i,$(officecfg_FILES),$(OCRG)/$(i).hxx)
+	$(foreach i,$(officecfg_FILES),$(call gb_CustomTarget_get_workdir,officecfg/registry)/$(i).hxx)
 
-define oc_target
-$(OCRG)/$(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \
-            $(OCDIR)/schema/org/openoffice/$(if $(1),$(1)/$(if $(2),$(2)/))%.xcs \
-            $(OCDIR)/cppheader.xsl | $(gb_XSLTPROCTARGET)
+define officecfg_TARGET
+$(call gb_CustomTarget_get_workdir,officecfg/registry)/$(if $(1),$(1)/$(if $(2),$(2)/))%.hxx: \
+            $(SRCDIR)/officecfg/registry/schema/org/openoffice/$(if $(1),$(1)/$(if $(2),$(2)/))%.xcs \
+            $(SRCDIR)/officecfg/registry/cppheader.xsl | $(gb_XSLTPROCTARGET)
 	$$(call gb_Output_announce,$$(subst $(WORKDIR)/,,$$@),$(true),XSL,1)
 	$$(call gb_Helper_abbreviate_dirs, \
         mkdir -p $$(dir $$@) && \
         $$(gb_XSLTPROC) --nonet --stringparam ns1 \
             $(if $(1), \
                 $(1) --stringparam ns2 $(if $(2),$(2) --stringparam ns3)) $$* \
-            -o $$@ $(OCDIR)/cppheader.xsl $$<)
+            -o $$@ $(SRCDIR)/officecfg/registry/cppheader.xsl $$<)
 
 endef
 
 # Sort longer paths before their prefixes, as at least GNU Make 3.81 on Mac OS X
 # appears to let % span sub-directories, so that the above rule would produce
 # unexpected results; sorting this way seems to avoid the problem:
-$(eval $(call oc_target,Office,DataAccess))
-$(eval $(call oc_target,Office,OOoImprovement))
-$(eval $(call oc_target,Office,UI))
-$(eval $(call oc_target,Office))
-$(eval $(call oc_target,TypeDetection))
-$(eval $(call oc_target,ucb))
-$(eval $(call oc_target))
+$(eval $(call officecfg_TARGET,Office,DataAccess))
+$(eval $(call officecfg_TARGET,Office,OOoImprovement))
+$(eval $(call officecfg_TARGET,Office,UI))
+$(eval $(call officecfg_TARGET,Office))
+$(eval $(call officecfg_TARGET,TypeDetection))
+$(eval $(call officecfg_TARGET,ucb))
+$(eval $(call officecfg_TARGET))

packimages/CustomTarget_images.mk

@@ -27,43 +27,45 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,packimages/images))
 
-PIIM := $(call gb_CustomTarget_get_workdir,packimages/images)
+packimages_DIR := $(call gb_CustomTarget_get_workdir,packimages/images)
 
 # Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially
 # (Tango fallbacks to Industrial for the missing icons)
-CUSTOM_PREFERRED_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango
-CUSTOM_PREFERRED_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial
+packimages_CUSTOM_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango
+packimages_CUSTOM_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial
 
 $(call gb_CustomTarget_get_target,packimages/images) : \
-	$(PIIM)/images.zip $(PIIM)/images_brand.zip $(foreach theme,$(WITH_THEMES),\
-		$(PIIM)/images_$(theme).zip)
+	$(packimages_DIR)/images.zip $(packimages_DIR)/images_brand.zip $(foreach theme,$(WITH_THEMES),\
+		$(packimages_DIR)/images_$(theme).zip)
 
-$(PIIM)/images.zip : $(PIIM)/sorted.lst $(PIIM)/commandimagelist.ilst
+$(packimages_DIR)/images.zip : \
+		$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
-			-m $(SRCDIR)/icon-themes/galaxy -c $(PIIM) \
-			-l $(PIIM) -l $(OUTDIR)/res/img -s $< -o $@ \
+			-m $(SRCDIR)/icon-themes/galaxy -c $(packimages_DIR) \
+			-l $(packimages_DIR) -l $(OUTDIR)/res/img -s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
-$(PIIM)/images_%.zip : $(PIIM)/sorted.lst $(PIIM)/commandimagelist.ilst
+$(packimages_DIR)/images_%.zip : \
+		$(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \
 			-m $(SRCDIR)/icon-themes/galaxy -c $(SRCDIR)/icon-themes/$* \
-			$(CUSTOM_PREFERRED_FALLBACK_1) $(CUSTOM_PREFERRED_FALLBACK_2) \
-			-l $(PIIM) -l $(OUTDIR)/res/img -s $< -o $@ \
+			$(packimages_CUSTOM_FALLBACK_1) $(packimages_CUSTOM_FALLBACK_2) \
+			-l $(packimages_DIR) -l $(OUTDIR)/res/img -s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
 
 # make sure to have one to keep packing happy
-$(PIIM)/images_brand.zip :| $(PIIM)/.dir
+$(packimages_DIR)/images_brand.zip :| $(packimages_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2)
 	touch $@
 
 # commandimagelist.ilst and sorted.lst are phony to rebuild everything each time
-.PHONY : $(PIIM)/commandimagelist.ilst $(PIIM)/sorted.lst
+.PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst
 
-$(PIIM)/commandimagelist.ilst :| $(PIIM)/.dir
+$(packimages_DIR)/commandimagelist.ilst :| $(packimages_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \
@@ -72,7 +74,8 @@ $(PIIM)/commandimagelist.ilst :| $(PIIM)/.dir
 		$(PERL) $(SOLARENV)/bin/diffmv.pl $@.$(INPATH) $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),2> /dev/null))
 
-$(PIIM)/sorted.lst : $(SRCDIR)/packimages/pack/image-sort.lst | $(PIIM)/.dir
+$(packimages_DIR)/sorted.lst : \
+		$(SRCDIR)/packimages/pack/image-sort.lst | $(packimages_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
 		$(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@)

ridljar/CustomTarget_javamaker.mk

@@ -27,14 +27,15 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,ridljar/javamaker))
 
-RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
+ridljar_DIR := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
 
-$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(RJJM)/done
+$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(ridljar_DIR)/done
 
-$(RJJM)/done : $(OUTDIR)/bin/udkapi.rdb \
-		$(call gb_Executable_get_target_for_build,javamaker) | $(RJJM)/.dir
+$(ridljar_DIR)/done : $(OUTDIR)/bin/udkapi.rdb \
+		$(call gb_Executable_get_target_for_build,javamaker) \
+		| $(ridljar_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	$(call gb_Helper_execute,javamaker -BUCR -O$(RJJM)/class $<) && touch $@)
+	$(call gb_Helper_execute,javamaker -BUCR -O$(ridljar_DIR)/class $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

sal/CustomTarget_generated.mk

@@ -27,28 +27,28 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,sal/generated))
 
-SAUT := $(call gb_CustomTarget_get_workdir,sal/generated)
+sal_DIR := $(call gb_CustomTarget_get_workdir,sal/generated)
 
 $(call gb_CustomTarget_get_target,sal/generated) : \
-	$(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \
-	$(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h)
+	$(sal_DIR)/rtlbootstrap.mk $(sal_DIR)/sal/udkversion.h \
+	$(if $(filter-out $(COM),MSC),$(sal_DIR)/sal/typesizes.h)
 
 # FIXME: rtlbootstrap.mk is empty on cygwin
 ifeq ($(COM),MSC)
-$(SAUT)/rtlbootstrap.mk :| $(SAUT)/.dir
+$(sal_DIR)/rtlbootstrap.mk :| $(sal_DIR)/.dir
 	touch $@
 else
-$(SAUT)/rtlbootstrap.mk : $(SAUT)/sal/typesizes.h | $(SAUT)/.dir
+$(sal_DIR)/rtlbootstrap.mk : $(sal_DIR)/sal/typesizes.h | $(sal_DIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	(echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(SAUT)/bootstrap.cxx && \
-	$(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(SAUT) -I$(SRCDIR)/sal/rtl/source \
-		-I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx > $@.tmp && \
+	(echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(sal_DIR)/bootstrap.cxx && \
+	$(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(sal_DIR) -I$(SRCDIR)/sal/rtl/source \
+		-I$(SRCDIR)/sal/inc $(sal_DIR)/bootstrap.cxx > $@.tmp && \
 	cat $@.tmp | grep '^RTL_' | sed -e 's/"//g' > $@ && \
-	rm $(SAUT)/bootstrap.cxx $@.tmp)
+	rm $(sal_DIR)/bootstrap.cxx $@.tmp)
 endif
 
-$(SAUT)/sal/typesizes.h :| $(SAUT)/sal/.dir
+$(sal_DIR)/sal/typesizes.h :| $(sal_DIR)/sal/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '/* This file is autogenerated from configure script data */' > $@
 	echo >> $@
@@ -69,7 +69,7 @@ endif
 
 include $(SRCDIR)/solenv/inc/udkversion.mk
 
-$(SAUT)/sal/udkversion.h :| $(SAUT)/sal/.dir
+$(sal_DIR)/sal/udkversion.h :| $(sal_DIR)/sal/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo '#ifndef _SAL_UDKVERSION_H_'           >  $@
 	echo '#define _SAL_UDKVERSION_H_'           >> $@

sal/Executable_osl_process_child.mk

@@ -41,18 +41,20 @@ $(eval $(call gb_Executable_add_exception_objects,osl_process_child,\
 # Also this batch file is required by sal_osl_process.
 # See qa/osl/process/osl_process.cxx:675
 ifeq ($(OS),WNT)
-BATCH_FILE:=batch.bat
+sal_BATCH_FILE := batch.bat
 else
-BATCH_FILE:=batch.sh
+sal_BATCH_FILE := batch.sh
 endif
 
-$(call gb_Executable_get_target,osl_process_child): $(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE)
+$(call gb_Executable_get_target,osl_process_child) : \
+	$(WORKDIR)/LinkTarget/Executable/$(sal_BATCH_FILE)
 
-$(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE): $(SRCDIR)/sal/qa/osl/process/$(BATCH_FILE)
+$(WORKDIR)/LinkTarget/Executable/$(sal_BATCH_FILE) : \
+		$(SRCDIR)/sal/qa/osl/process/$(sal_BATCH_FILE)
 	mkdir -p $(dir $@) && \
 	$(call gb_Deliver_deliver,$<,$@)
 
-$(call gb_Executable_get_clean_target,osl_process_child): 
-	rm -f $(WORKDIR)/LinkTarget/Executable/$(BATCH_FILE)
+$(call gb_Executable_get_clean_target,osl_process_child) :
+	rm -f $(WORKDIR)/LinkTarget/Executable/$(sal_BATCH_FILE)
 
 # vim: set noet sw=4 ts=4:

sc/Library_vbaobj.mk

@@ -135,10 +135,10 @@ $(eval $(call gb_Library_add_exception_objects,vbaobj,\
 
 #http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50255
 ifeq ($(COM)-$(OS)-$(CPUNAME),GCC-LINUX-INTEL)
-gccthunkBroken := $(shell expr $(gb_CCVER) \>= 40500 \& $(gb_CCVER) \< 40602)
+sc_gccthunkBroken := $(shell expr $(gb_CCVER) \>= 40500 \& $(gb_CCVER) \< 40602)
 endif
 
-ifeq ($(gccthunkBroken),1)
+ifeq ($(sc_gccthunkBroken),1)
 $(eval $(call gb_Library_add_cxxobjects,vbaobj,\
     sc/source/ui/vba/vbasheetobjects \
     , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \

sdext/CustomTarget_pdfimport.mk

@@ -27,12 +27,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,sdext/pdfimport))
 
-SEPI := $(call gb_CustomTarget_get_workdir,sdext/pdfimport)
+$(call gb_CustomTarget_get_target,sdext/pdfimport) : \
+	$(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx
 
-$(call gb_CustomTarget_get_target,sdext/pdfimport) : $(SEPI)/hash.cxx
-
-$(SEPI)/hash.cxx : $(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \
-		| $(SEPI)/.dir
+$(call gb_CustomTarget_get_workdir,sdext/pdfimport)/hash.cxx : \
+		$(SRCDIR)/sdext/source/pdfimport/wrapper/keyword_list \
+		| $(call gb_CustomTarget_get_workdir,sdext/pdfimport)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
 	$(GPERF) -C -t -l -L C++ -m 20 -Z PdfKeywordHash -k'4-5,$$' $< > $@
 

sdext/CustomTarget_presenter.mk

@@ -27,16 +27,14 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,sdext/source/presenter/help/en-US/com.sun.PresenterScreen))
 
-SEPR := $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)
-
 $(call gb_CustomTarget_get_target,sdext/source/presenter/help/en-US/com.sun.PresenterScreen) : \
-	$(SEPR)/presenter.xhp
+	$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp
 
 include $(SRCDIR)/sdext/platform.mk
 
-$(SEPR)/presenter.xhp : \
+$(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/presenter.xhp : \
 		$(SRCDIR)/sdext/source/presenter/help/en-US/com.sun.PresenterScreen/presenter.xhp \
-		| $(SEPR)/.dir
+		| $(call gb_CustomTarget_get_workdir,sdext/source/presenter/help/en-US/com.sun.PresenterScreen)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),SED,1)
 	sed "s/PLATFORMID/$(sdext_PLATFORM)/" < $< > $@
 

smoketest/CppunitTest_smoketest.mk

@@ -39,15 +39,15 @@ $(eval $(call gb_CppunitTest_use_libraries,smoketest,\
 ))
 
 ifeq ($(OS),MACOSX)
-my_soffice:=path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
+smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/LibreOffice.app/Contents/MacOS/soffice
 else
-my_soffice:=path:$(DEVINSTALLDIR)/opt/program/soffice
+smoketest_SOFFICE := path:$(DEVINSTALLDIR)/opt/program/soffice
 endif
 
 $(eval $(call gb_CppunitTest_use_ure,smoketest))
 
 $(eval $(call gb_CppunitTest_add_arguments,smoketest,\
-	-env:arg-soffice=$(my_soffice) \
+	-env:arg-soffice=$(smoketest_SOFFICE) \
 	-env:arg-user=$(WORKDIR)/CustomTarget/smoketest \
 	-env:arg-env=$(gb_Helper_LIBRARY_PATH_VAR)"$$$${$(gb_Helper_LIBRARY_PATH_VAR)+=$$$$$(gb_Helper_LIBRARY_PATH_VAR)}" \
 	-env:arg-testarg.smoketest.doc=$(OUTDIR)/bin/smoketestdoc.sxw \

svx/Executable_gengal.bin.mk

@@ -27,15 +27,15 @@
 #*************************************************************************
 
 ifeq ($(OS),WNT)
-gengalbin := gengal
+svx_GENGALBIN := gengal
 else
-gengalbin := gengal.bin
+svx_GENGALBIN := gengal.bin
 endif
 
 
-$(eval $(call gb_Executable_Executable,$(gengalbin)))
+$(eval $(call gb_Executable_Executable,$(svx_GENGALBIN)))
 
-$(eval $(call gb_Executable_set_include,$(gengalbin),\
+$(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
     $$(INCLUDE) \
     -I$(SRCDIR)/svx/inc/ \
     -I$(SRCDIR)/svx/inc/pch \
@@ -44,11 +44,11 @@ $(eval $(call gb_Executable_set_include,$(gengalbin),\
     -I$(OUTDIR)/inc/offapi \
 ))
 
-$(eval $(call gb_Executable_add_cxxflags,$(gengalbin),\
+$(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\
     $$(CXXFLAGS) \
 ))
 
-$(eval $(call gb_Executable_use_libraries,$(gengalbin),\
+$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
     sal \
     tl \
     svl \
@@ -61,16 +61,16 @@ $(eval $(call gb_Executable_use_libraries,$(gengalbin),\
     $(gb_STDLIBS) \
 ))
 
-$(eval $(call gb_Executable_add_exception_objects,$(gengalbin),\
+$(eval $(call gb_Executable_add_exception_objects,$(svx_GENGALBIN),\
     svx/source/gengal/gengal \
 ))
 
-$(eval $(call gb_Executable_use_static_libraries,$(gengalbin),\
+$(eval $(call gb_Executable_use_static_libraries,$(svx_GENGALBIN),\
     vclmain \
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_use_libraries,$(gengalbin),\
+$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
     kernel32 \
     msvcrt \
     $(gb_Library_win32_OLDNAMES) \
@@ -80,7 +80,7 @@ $(eval $(call gb_Executable_use_libraries,$(gengalbin),\
 endif
 
 ifeq ($(OS),LINUX)
-$(eval $(call gb_Executable_use_libraries,$(gengalbin),\
+$(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
     dl \
     pthread \
 ))

swext/Extension_wiki-publisher.mk

@@ -27,32 +27,30 @@
 # instead of those above.
 #
 
-WIKISRC := $(SRCDIR)/swext/mediawiki
-
 $(eval $(call gb_Extension_Extension,wiki-publisher,swext/mediawiki/src))
 
 ifneq ($(SYSTEM_APACHE_COMMONS),YES)
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar)) 
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar)) 
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar)) 
-$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar)) 
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-codec-1.3.jar,$(OUTDIR)/bin/commons-codec-1.3.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-httpclient-3.1.jar,$(OUTDIR)/bin/commons-httpclient-3.1.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-lang-2.3.jar,$(OUTDIR)/bin/commons-lang-2.3.jar))
+$(eval $(call gb_Extension_add_file,wiki-publisher,commons-logging-1.1.1.jar,$(OUTDIR)/bin/commons-logging-1.1.1.jar))
 endif
 $(eval $(call gb_Extension_add_file,wiki-publisher,Addons.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))
-$(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,OptionsDialog.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
-$(eval $(call gb_Extension_add_file,wiki-publisher,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
-$(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
-$(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Paths.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,ProtocolHandler.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,Types.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcs,$(SRCDIR)/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
 $(eval $(call gb_Extension_add_file,wiki-publisher,WikiExtension.xcu,$(WORKDIR)/XcuMergeTarget/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
 $(eval $(call gb_Extension_add_file,wiki-publisher,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
-$(eval $(call gb_Extension_add_file,wiki-publisher,components.rdb,$(WIKISRC)/src/components.rdb))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
-$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,components.rdb,$(SRCDIR)/swext/mediawiki/src/components.rdb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/EditSetting.xdl,$(SRCDIR)/swext/mediawiki/dialogs/EditSetting.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Settings.xdl,$(SRCDIR)/swext/mediawiki/dialogs/Settings.xdl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/Module1.xba,$(SRCDIR)/swext/mediawiki/dialogs/Module1.xba))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/script.xlb,$(SRCDIR)/swext/mediawiki/dialogs/script.xlb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/dialog.xlb,$(SRCDIR)/swext/mediawiki/dialogs/dialog.xlb))
+$(eval $(call gb_Extension_add_file,wiki-publisher,WikiEditor/SendToMediaWiki.xdl,$(SRCDIR)/swext/mediawiki/dialogs/SendToMediaWiki.xdl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/cmarkup.xsl,$(OUTDIR)/bin/xslt/export/xsltml/cmarkup.xsl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/entities.xsl,$(OUTDIR)/bin/xslt/export/xsltml/entities.xsl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/glayout.xsl,$(OUTDIR)/bin/xslt/export/xsltml/glayout.xsl))
@@ -60,16 +58,16 @@ $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/mmltex.xsl,$(OUTD
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/scripts.xsl,$(OUTDIR)/bin/xslt/export/xsltml/scripts.xsl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tables.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tables.xsl))
 $(eval $(call gb_Extension_add_file,wiki-publisher,filter/math/tokens.xsl,$(OUTDIR)/bin/xslt/export/xsltml/tokens.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
-$(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html))
-$(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
-$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(SRCDIR)/swext/mediawiki/help/wikisend.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(SRCDIR)/swext/mediawiki/help/wikiformats.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(SRCDIR)/swext/mediawiki/help/wikiaccount.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(SRCDIR)/swext/mediawiki/help/wiki.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(SRCDIR)/swext/mediawiki/help/wikisettings.xhp))
+$(eval $(call gb_Extension_add_file,wiki-publisher,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Extension_add_file,wiki-publisher,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott))
+$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisend.xhp,$(SRCDIR)/swext/mediawiki/help/wikisend.xhp))
+$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiformats.xhp,$(SRCDIR)/swext/mediawiki/help/wikiformats.xhp))
+$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikiaccount.xhp,$(SRCDIR)/swext/mediawiki/help/wikiaccount.xhp))
+$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wiki.xhp,$(SRCDIR)/swext/mediawiki/help/wiki.xhp))
+$(eval $(call gb_Extension_localize_help,wiki-publisher,help/lang/com.sun.wiki-publisher/wikisettings.xhp,$(SRCDIR)/swext/mediawiki/help/wikisettings.xhp))

swext/Zip_mediawiki_develop.mk

@@ -27,35 +27,33 @@
 # instead of those above.
 #
 
-WIKISRC := $(SRCDIR)/swext/mediawiki
-
 $(eval $(call gb_Zip_Zip,mediawiki_develop,$(WORKDIR)/Zip/mediawiki_develop))
 
-$(eval $(call gb_Zip_add_file,mediawiki_develop,Addons.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Addons.xcu)) 
-$(eval $(call gb_Zip_add_file,mediawiki_develop,Filter.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,OptionsDialog.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,Paths.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Paths.xcu))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,ProtocolHandler.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,Types.xcu,$(WIKISRC)/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcs,$(WIKISRC)/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(WIKISRC)/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,description.xml,$(WIKISRC)/src/description.xml))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Addons.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Addons.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Filter.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Filter.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,OptionsDialog.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/OptionsDialog.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Paths.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Paths.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,ProtocolHandler.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/ProtocolHandler.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,Types.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/TypeDetection/Types.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcs,$(SRCDIR)/swext/mediawiki/src/registry/schema/org/openoffice/Office/Custom/WikiExtension.xcs))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiExtension.xcu,$(SRCDIR)/swext/mediawiki/src/registry/data/org/openoffice/Office/Custom/WikiExtension.xcu))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,description.xml,$(SRCDIR)/swext/mediawiki/src/description.xml))
 $(eval $(call gb_Zip_add_file,mediawiki_develop,mediawiki.jar,$(OUTDIR)/bin/mediawiki.jar))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(WIKISRC)/src/manifest.xml))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,components.rdb,$(WIKISRC)/src/components.rdb))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(WIKISRC)/dialogs/EditSetting.xdl))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(WIKISRC)/dialogs/Settings.xdl))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(WIKISRC)/dialogs/Module1.xba))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/script.xlb,$(WIKISRC)/dialogs/script.xlb))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/dialog.xlb,$(WIKISRC)/dialogs/dialog.xlb))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/SendToMediaWiki.xdl,$(WIKISRC)/dialogs/SendToMediaWiki.xdl))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,filter/odt2mediawiki.xsl,$(WIKISRC)/src/filter/odt2mediawiki.xsl))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,description-en-US.txt,$(WIKISRC)/src/description-en-US.txt))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(WIKISRC)/help/wikisend.xhp))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(WIKISRC)/help/wikiformats.xhp))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(WIKISRC)/help/wikiaccount.xhp))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(WIKISRC)/help/wiki.xhp))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(WIKISRC)/help/wikisettings.xhp))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,license/THIRDPARTYLICENSEREADME.html,$(WIKISRC)/src/THIRDPARTYLICENSEREADME.html))
-$(eval $(call gb_Zip_add_file,mediawiki_develop,templates/MediaWiki/mediawiki.ott,$(WIKISRC)/src/filter/mediawiki.ott))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,META-INF/manifest.xml,$(SRCDIR)/swext/mediawiki/src/manifest.xml))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,components.rdb,$(SRCDIR)/swext/mediawiki/src/components.rdb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/EditSetting.xdl,$(SRCDIR)/swext/mediawiki/dialogs/EditSetting.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Settings.xdl,$(SRCDIR)/swext/mediawiki/dialogs/Settings.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/Module1.xba,$(SRCDIR)/swext/mediawiki/dialogs/Module1.xba))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/script.xlb,$(SRCDIR)/swext/mediawiki/dialogs/script.xlb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/dialog.xlb,$(SRCDIR)/swext/mediawiki/dialogs/dialog.xlb))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,WikiEditor/SendToMediaWiki.xdl,$(SRCDIR)/swext/mediawiki/dialogs/SendToMediaWiki.xdl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,filter/odt2mediawiki.xsl,$(SRCDIR)/swext/mediawiki/src/filter/odt2mediawiki.xsl))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,description-en-US.txt,$(SRCDIR)/swext/mediawiki/src/description-en-US.txt))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisend.xhp,$(SRCDIR)/swext/mediawiki/help/wikisend.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiformats.xhp,$(SRCDIR)/swext/mediawiki/help/wikiformats.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikiaccount.xhp,$(SRCDIR)/swext/mediawiki/help/wikiaccount.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wiki.xhp,$(SRCDIR)/swext/mediawiki/help/wiki.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,help/en-US/com.sun.wiki-publisher/wikisettings.xhp,$(SRCDIR)/swext/mediawiki/help/wikisettings.xhp))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,license/THIRDPARTYLICENSEREADME.html,$(SRCDIR)/swext/mediawiki/src/THIRDPARTYLICENSEREADME.html))
+$(eval $(call gb_Zip_add_file,mediawiki_develop,templates/MediaWiki/mediawiki.ott,$(SRCDIR)/swext/mediawiki/src/filter/mediawiki.ott))
 

tools/CustomTarget_reversemap.mk

@@ -25,12 +25,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap))
 
-TLRM := $(call gb_CustomTarget_get_workdir,tools/reversemap)
+$(call gb_CustomTarget_get_target,tools/reversemap) : \
+	$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx
 
-$(call gb_CustomTarget_get_target,tools/reversemap) : $(TLRM)/reversemap.hxx
-
-$(TLRM)/reversemap.hxx : $(call gb_Executable_get_target_for_build,bestreversemap) \
-		| $(TLRM)/.dir
+$(call gb_CustomTarget_get_workdir,tools/reversemap)/reversemap.hxx : \
+		$(call gb_Executable_get_target_for_build,bestreversemap) \
+		| $(call gb_CustomTarget_get_workdir,tools/reversemap)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
 	$(call gb_Helper_execute,bestreversemap > $@)
 

unoil/CustomTarget_climaker.mk

@@ -29,17 +29,18 @@ include $(SRCDIR)/unoil/climaker/version.txt
 
 $(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker))
 
-UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker)
+unoil_CLIDIR := $(call gb_CustomTarget_get_workdir,unoil/climaker)
 
 $(call gb_CustomTarget_get_target,unoil/climaker) : \
-	$(UICM)/cli_oootypes.dll \
-	$(UICM)/cli_oootypes.config \
-	$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
+	$(unoil_CLIDIR)/cli_oootypes.dll \
+	$(unoil_CLIDIR)/cli_oootypes.config \
+	$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
 
-$(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
+$(unoil_CLIDIR)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
 		$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
 		$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
-		$(call gb_Executable_get_target_for_build,climaker) | $(UICM)/.dir
+		$(call gb_Executable_get_target_for_build,climaker) \
+		| $(unoil_CLIDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
 	$(call gb_Helper_abbreviate_dirs, \
 	$(call gb_Helper_execute,climaker \
@@ -53,14 +54,16 @@ $(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
 		--keyfile $(OUTDIR)/bin/cliuno.snk \
 		$(OUTDIR)/bin/offapi.rdb) > /dev/null)
 
-$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \
-		$(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir
+$(unoil_CLIDIR)/cli_oootypes.config : \
+		$(SRCDIR)/unoil/climaker/cli_oootypes_config \
+		$(SRCDIR)/unoil/climaker/version.txt | $(unoil_CLIDIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs, \
 	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
 
-$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \
-		$(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
+$(unoil_CLIDIR)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : \
+		$(unoil_CLIDIR)/cli_oootypes.config \
+		$(unoil_CLIDIR)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
 	$(call gb_Helper_abbreviate_dirs, \
 	al -out:$@ \

unoil/CustomTarget_javamaker.mk

@@ -27,16 +27,17 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker))
 
-UIJM := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
+unoil_JAVADIR := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
 
-$(call gb_CustomTarget_get_target,unoil/javamaker) : $(UIJM)/done
+$(call gb_CustomTarget_get_target,unoil/javamaker) : $(unoil_JAVADIR)/done
 
-$(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
-		$(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir
+$(unoil_JAVADIR)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
+		$(call gb_Executable_get_target_for_build,javamaker) \
+		| $(unoil_JAVADIR)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs, \
-	rm -r $(UIJM) && \
-	$(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
+	rm -r $(unoil_JAVADIR) && \
+	$(call gb_Helper_execute,javamaker -BUCR -O$(unoil_JAVADIR) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
 	touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:

vcl/CustomTarget_afm_hash.mk

@@ -25,11 +25,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,vcl/generic/fontmanager))
 
-VCFM := $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)
+$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : \
+	$(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp
 
-$(call gb_CustomTarget_get_target,vcl/generic/fontmanager) : $(VCFM)/afm_hash.hpp
-
-$(VCFM)/afm_hash.hpp : $(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list | $(VCFM)/.dir
+$(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/afm_hash.hpp : \
+		$(SRCDIR)/vcl/generic/fontmanager/afm_keyword_list \
+		| $(call gb_CustomTarget_get_workdir,vcl/generic/fontmanager)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),GPF,1)
 	$(GPERF) -C -t -l -L C++ -m 20 -Z AfmKeywordHash -k '1,4,6,$$' $< | sed -e "s/(char\*)0/(char\*)0, NOPE/g" | grep -v "^#line" > $@
 

vcl/CustomTarget_kde4_moc.mk

@@ -27,11 +27,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde4))
 
-VCKM := $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)
+$(call gb_CustomTarget_get_target,vcl/unx/kde4) : \
+	$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc
 
-$(call gb_CustomTarget_get_target,vcl/unx/kde4) : $(VCKM)/KDEXLib.moc
-
-$(VCKM)/KDEXLib.moc : $(SRCDIR)/vcl/unx/kde4/KDEXLib.hxx | $(VCKM)/.dir
+$(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/KDEXLib.moc : \
+		$(SRCDIR)/vcl/unx/kde4/KDEXLib.hxx \
+		| $(call gb_CustomTarget_get_workdir,vcl/unx/kde4)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
 	$(MOC4) $< -o $@
 

vcl/CustomTarget_kde_moc.mk

@@ -27,13 +27,12 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,vcl/unx/kde/fpicker))
 
-VCKF := $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)
-
 $(call gb_CustomTarget_get_target,vcl/unx/kde/fpicker) : \
-	$(VCKF)/kdefilepicker.moc.cxx
+	$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx
 
-$(VCKF)/kdefilepicker.moc.cxx : \
-		$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx | $(VCKF)/.dir
+$(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/kdefilepicker.moc.cxx :\
+		$(SRCDIR)/vcl/unx/kde/fpicker/kdefilepicker.hxx \
+		| $(call gb_CustomTarget_get_workdir,vcl/unx/kde/fpicker)/.dir
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MOC,1)
 	$(MOC) -o $@ $<