no need for SRCDIR parameter here

automation/Package_packimages.mk

@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,automation_packimages,$(call gb_CustomTarget_ge
 
 $(eval $(call gb_Package_add_file,automation_packimages,bin/images_tt.zip,images_tt.zip))
 
-$(eval $(call gb_Package_add_customtarget,automation_packimages,automation/packimages,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,automation_packimages,automation/packimages))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,automation/packimages,\
     $(OUTDIR)/res/img/fps_officeen-US.ilst \

automation/Package_testtool.mk

@@ -39,7 +39,7 @@ $(eval $(call gb_Package_add_file,automation_testtool,bin/testtool.ini,testtool.
 
 endif
 
-$(eval $(call gb_Package_add_customtarget,automation_testtool,automation/source/testtool,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,automation_testtool,automation/source/testtool))
 
 $(eval $(call gb_CustomTarget_add_dependencies,automation/source/testtool,\
     automation/source/inc/rcontrol.hxx \

bean/Jar_officebean.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,officebean,SRCDIR))
+$(eval $(call gb_Jar_Jar,officebean))
 
 $(eval $(call gb_Jar_add_jars,officebean,\
 	$(OUTDIR)/bin/ridl.jar \

desktop/Package_branding.mk

@@ -25,6 +25,6 @@
 
 $(eval $(call gb_Package_Package,desktop_branding,$(WORKDIR)/CustomTarget/desktop/branding))
 
-$(eval $(call gb_Package_add_customtarget,desktop_branding,desktop/branding,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,desktop_branding,desktop/branding))
 
 # vim: set ts=4 sw=4 et:

desktop/Package_rcfile.mk

@@ -25,6 +25,6 @@
 
 $(eval $(call gb_Package_Package,desktop_rcfile,$(WORKDIR)/CustomTarget/win32/source/setup))
 
-$(eval $(call gb_Package_add_customtarget,desktop_rcfile,desktop/win32/source/setup,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,desktop_rcfile,desktop/win32/source/setup))
 
 # vim: set ts=4 sw=4 et:

filter/Configuration_filter.mk

@@ -65,7 +65,7 @@ $(call gb_Configuration_get_target,$(1)) : \
 $(call gb_Configuration_get_clean_target,$(1)) : $(6)
 $(if $(4),,$(error filter_Configuration__add_module: no input files))
 $(5) : \
-	$(addprefix $($(gb_Configuration_REPO_$(1)))/$(3)/,$(addsuffix .xcu,$(4)))
+	$(addprefix $(SRCDIR)/$(3)/,$(addsuffix .xcu,$(4)))
 $(call gb_XcuModuleTarget_get_outdir_target,$(2)) : $(5)
 $(call gb_Deliver_add_deliverable,\
 	$(call gb_XcuModuleTarget_get_outdir_target,$(2)),$(5),$(2))
@@ -266,7 +266,7 @@ endef
 
 ### the filter configuration ########################################
 
-$(eval $(call gb_Configuration_Configuration,fcfg_langpack,SRCDIR))
+$(eval $(call gb_Configuration_Configuration,fcfg_langpack))
 
 $(foreach lang,$(gb_Configuration_LANGS),$(eval \
  $(call gb_Zip_add_file,fcfg_langpack_$(lang),$(filter_XCU_filter))))

filter/Jar_XSLTFilter.mk

@@ -17,7 +17,7 @@
 # under the License.
 #***************************************************************
 
-$(eval $(call gb_Jar_Jar,XSLTFilter,SRCDIR))
+$(eval $(call gb_Jar_Jar,XSLTFilter))
 
 $(eval $(call gb_Jar_add_jars,XSLTFilter,\
 	$(OUTDIR)/bin/ridl.jar \

filter/Jar_XSLTValidate.mk

@@ -17,7 +17,7 @@
 # under the License.
 #***************************************************************
 
-$(eval $(call gb_Jar_Jar,XSLTValidate,SRCDIR))
+$(eval $(call gb_Jar_Jar,XSLTValidate))
 
 $(eval $(call gb_Jar_add_jars,XSLTValidate,\
 	$(OUTDIR)/bin/ridl.jar \

filter/Package_filter_generated.mk

@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Package_Package,filter_generated,$(WORKDIR)/CustomTarget/filter/source/svg))
 
-$(eval $(call gb_Package_add_customtarget,filter_generated,filter/source/svg,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,filter_generated,filter/source/svg))
 
 $(eval $(call gb_CustomTarget_add_dependencies,filter/source/svg,\
 	filter/source/svg/gentoken.pl \

i18npool/Package_generated.mk

@@ -29,7 +29,7 @@
 $(eval $(call gb_Package_Package,i18npool_generated,$(WORKDIR)/i18npool/source))
 
 
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/breakiterator,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/breakiterator))
 $(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/breakiterator,\
 	i18npool/source/breakiterator/data/*.txt \
 	i18npool/source/breakiterator/data/ja.dic \
@@ -40,7 +40,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/breakitera
 ))
 
 
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/collator,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/collator))
 $(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/collator,\
 	i18npool/source/collator/data/*.txt \
 ))
@@ -49,7 +49,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/collator,\
 ))
 
 
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/indexentry,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/indexentry))
 $(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/indexentry,\
 	i18npool/source/indexentry/data/*.txt \
 ))
@@ -58,7 +58,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/indexentry
 ))
 
 
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/localedata,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/localedata))
 $(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/localedata,\
 	i18npool/source/localedata/data/*.xml \
 ))
@@ -70,7 +70,7 @@ $(eval $(call gb_CustomTarget_add_outdir_dependencies,i18npool/source/localedata
 ))
 
 
-$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/textconversion,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,i18npool_generated,i18npool/source/textconversion))
 $(eval $(call gb_CustomTarget_add_dependencies,i18npool/source/textconversion,\
 	i18npool/source/textconversion/data/*.dic \
 ))

offapi/UnoApi_offapi.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,offapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,offapi,\
     udkapi \

offapi/UnoApi_types.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,types))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,types,\
     udkapi \

officecfg/Configuration_officecfg.mk

@@ -17,7 +17,7 @@
 # under the License.
 #***************************************************************
 
-$(eval $(call gb_Configuration_Configuration,registry,SRCDIR))
+$(eval $(call gb_Configuration_Configuration,registry))
 
 $(eval $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
 	org/openoffice/LDAP.xcs \

oovbaapi/UnoApi_oovbaapi.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,oovbaapi))
 
 $(eval $(call gb_UnoApiTarget_add_rdbfiles,oovbaapi,\
     udkapi \

qadevOOo/Jar_OOoRunner.mk

@@ -30,7 +30,7 @@
 #force debug information for OOoRunner
 gb_JavaClassSet_JAVACDEBUG:= -g
 
-$(eval $(call gb_Jar_Jar,OOoRunner,SRCDIR))
+$(eval $(call gb_Jar_Jar,OOoRunner))
 
 $(eval $(call gb_Jar_set_jarclasspath,OOoRunner,\
 	ridl.jar \

qadevOOo/Jar_OOoRunnerLight.mk

@@ -30,7 +30,7 @@
 #force debug information for OOoRunnerLight
 gb_JavaClassSet_JAVACDEBUG := -g
 
-$(eval $(call gb_Jar_Jar,OOoRunnerLight,SRCDIR))
+$(eval $(call gb_Jar_Jar,OOoRunnerLight))
 
 $(eval $(call gb_Jar_set_jarclasspath,OOoRunnerLight,\
 	ridl.jar \

scripting/Jar_HelloWorld.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,HelloWorld,SRCDIR))
+$(eval $(call gb_Jar_Jar,HelloWorld))
 
 $(eval $(call gb_Jar_add_jars,HelloWorld,\
 	$(OUTDIR)/bin/juh.jar \

scripting/Jar_Highlight.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,Highlight,SRCDIR))
+$(eval $(call gb_Jar_Jar,Highlight))
 
 $(eval $(call gb_Jar_add_jars,Highlight,\
 	$(OUTDIR)/bin/juh.jar \

scripting/Jar_MemoryUsage.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,MemoryUsage,SRCDIR))
+$(eval $(call gb_Jar_Jar,MemoryUsage))
 
 $(eval $(call gb_Jar_add_jars,MemoryUsage,\
 	$(OUTDIR)/bin/juh.jar \

scripting/Jar_ScriptFramework.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,ScriptFramework,SRCDIR))
+$(eval $(call gb_Jar_Jar,ScriptFramework))
 
 $(eval $(call gb_Jar_add_jars,ScriptFramework,\
 	$(OUTDIR)/bin/juh.jar \

scripting/Jar_ScriptProviderForBeanShell.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell,SRCDIR))
+$(eval $(call gb_Jar_Jar,ScriptProviderForBeanShell))
 
 $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
 	$(OUTDIR)/bin/juh.jar \

scripting/Jar_ScriptProviderForJava.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,ScriptProviderForJava,SRCDIR))
+$(eval $(call gb_Jar_Jar,ScriptProviderForJava))
 
 $(eval $(call gb_Jar_add_jars,ScriptProviderForJava,\
 	$(OUTDIR)/bin/juh.jar \

scripting/Jar_ScriptProviderForJavaScript.mk

@@ -26,7 +26,7 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript,SRCDIR))
+$(eval $(call gb_Jar_Jar,ScriptProviderForJavaScript))
 
 $(eval $(call gb_Jar_add_jars,ScriptProviderForJavaScript,\
 	$(OUTDIR)/bin/juh.jar \

solenv/gbuild/Configuration.mk

@@ -314,7 +314,7 @@ $(call gb_Configuration_get_target,%) :
 # cannot use target local variable for REPO because it's needed in prereq
 # last parameter may be used to turn off delivering of files
 define gb_Configuration_Configuration
-$(eval gb_Configuration_NODELIVER_$(1) := $(3))
+$(eval gb_Configuration_NODELIVER_$(1) := $(2))
 $(foreach lang,$(gb_Configuration_LANGS),$(eval \
 	$(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang)))))
 $(foreach lang,$(gb_Configuration_LANGS),$(eval \

solenv/gbuild/CustomTarget.mk

@@ -47,12 +47,12 @@ $(call gb_CustomTarget_get_clean_target,%) :
 		rm -f $(call gb_CustomTarget_get_target,$*))
 
 define gb_CustomTarget__get_makefile
-$(1)/$(2)/Makefile
+$(SRCDIR)/$(1)/Makefile
 endef
 
 define gb_CustomTarget_CustomTarget
 $(call gb_CustomTarget_get_target,$(1)) : \
-  $(call gb_CustomTarget__get_makefile,$($(2)),$(1))
+  $(call gb_CustomTarget__get_makefile,$(1))
 endef
 
 

solenv/gbuild/Jar.mk

@@ -85,7 +85,7 @@ $(call gb_Jar_get_target,$(1)) : MANIFEST :=
 $(call gb_Jar_get_target,$(1)) : JARCLASSPATH :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEROOTS :=
 $(call gb_Jar_get_target,$(1)) : PACKAGEFILES :=
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)),$(2))
+$(call gb_JavaClassSet_JavaClassSet,$(call gb_Jar_get_classsetname,$(1)))
 $(call gb_JavaClassSet_set_classpath,$(call gb_Jar_get_classsetname,$(1)),$(value XCLASSPATH))
 $(eval $(call gb_Module_register_target,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_clean_target,$(1))))
 $(call gb_Deliver_add_deliverable,$(call gb_Jar_get_outdir_target,$(1)),$(call gb_Jar_get_target,$(1)),$(1))

solenv/gbuild/JunitTest.mk

@@ -63,7 +63,7 @@ $(call gb_JunitTest_get_target,$(1)) : CLASSPATH := $(value XCLASSPATH)$(gb_CLAS
 $(call gb_JunitTest_get_target,$(1)) : CLASSES :=
 $(call gb_JunitTest_JunitTest_platform,$(1))
 
-$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)),$(2))
+$(call gb_JavaClassSet_JavaClassSet,$(call gb_JunitTest_get_classsetname,$(1)))
 $(call gb_JunitTest_get_target,$(1)) : $(call gb_JavaClassSet_get_target,$(call gb_JunitTest_get_classsetname,$(1)))
 $(eval $(call gb_Module_register_target,$(call gb_JunitTest_get_target,$(1)),$(call gb_JunitTest_get_clean_target,$(1))))
 endef

solenv/gbuild/Package.mk

@@ -74,7 +74,7 @@ endef
 define gb_Package_add_customtarget
 $(call gb_Package_get_preparation_target,$(1)) : $(call gb_CustomTarget_get_target,$(2))
 $(call gb_Package_get_clean_target,$(1)) : $(call gb_CustomTarget_get_clean_target,$(2))
-$(eval $(call gb_CustomTarget_CustomTarget,$(2),$(3)))
+$(eval $(call gb_CustomTarget_CustomTarget,$(2)))
 
 endef
 

swext/Configuration_mediawiki.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Configuration_Configuration,mediawiki,SRCDIR,nodeliver))
+$(eval $(call gb_Configuration_Configuration,mediawiki,nodeliver))
 
 $(eval $(call gb_Configuration_add_datas,mediawiki,swext/mediawiki/src/registry/data,\
 	org/openoffice/Office/ProtocolHandler.xcu \

swext/Jar_mediawiki.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,mediawiki,SRCDIR))
+$(eval $(call gb_Jar_Jar,mediawiki))
 
 $(eval $(call gb_Jar_set_packageroot,mediawiki,com))
 

tools/Package_reversemap.mk

@@ -25,7 +25,7 @@
 # instead of those above.
 
 $(eval $(call gb_Package_Package,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap))
-$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\
 	$(call gb_Executable_get_target_for_build,bestreversemap) \

udkapi/UnoApi_udkapi.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,udkapi))
 
 $(eval $(call gb_UnoApiTarget_set_include,udkapi,\
 	$$(INCLUDE) \

udkapi/UnoApi_uretypes.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types,SRCDIR))
+$(eval $(call gb_UnoApiTarget_UnoApiTarget,ure/types))
 
 $(eval $(call gb_UnoApiTarget_add_merge_rdbfiles,ure/types,\
     udkapi \

vcl/Package_afmhash.mk

@@ -25,6 +25,6 @@
 # instead of those above.
 
 $(eval $(call gb_Package_Package,vcl_afmhash,$(WORKDIR)/CustomTarget/vcl/unx/generic/fontmanager))
-$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,vcl_afmhash,vcl/unx/generic/fontmanager))
 
 # vim: set noet sw=4 ts=4:

vcl/Package_kde4moc.mk

@@ -25,6 +25,6 @@
 # instead of those above.
 
 $(eval $(call gb_Package_Package,vcl_kde4moc,$(WORKDIR)/CustomTarget/vcl/unx/kde4))
-$(eval $(call gb_Package_add_customtarget,vcl_kde4moc,vcl/unx/kde4,SRCDIR))
+$(eval $(call gb_Package_add_customtarget,vcl_kde4moc,vcl/unx/kde4))
 
 # vim: set noet sw=4 ts=4:

wizards/Jar_agenda.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,agenda,SRCDIR))
+$(eval $(call gb_Jar_Jar,agenda))
 
 $(eval $(call gb_Jar_add_jars,agenda,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_commonwizards.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,commonwizards,SRCDIR))
+$(eval $(call gb_Jar_Jar,commonwizards))
 
 $(eval $(call gb_Jar_add_jars,commonwizards,\
 	$(OUTDIR_FOR_BUILD)/bin/ridl.jar \

wizards/Jar_fax.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,fax,SRCDIR))
+$(eval $(call gb_Jar_Jar,fax))
 
 $(eval $(call gb_Jar_add_jars,fax,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_form.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,form,SRCDIR))
+$(eval $(call gb_Jar_Jar,form))
 
 $(eval $(call gb_Jar_add_jars,form,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_letter.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,letter,SRCDIR))
+$(eval $(call gb_Jar_Jar,letter))
 
 $(eval $(call gb_Jar_add_jars,letter,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_query.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,query,SRCDIR))
+$(eval $(call gb_Jar_Jar,query))
 
 $(eval $(call gb_Jar_add_jars,query,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_report.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,report,SRCDIR))
+$(eval $(call gb_Jar_Jar,report))
 
 $(eval $(call gb_Jar_add_jars,report,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_reportbuilder.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,reportbuilderwizard,SRCDIR))
+$(eval $(call gb_Jar_Jar,reportbuilderwizard))
 
 $(eval $(call gb_Jar_add_jars,reportbuilderwizard,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_table.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,table,SRCDIR))
+$(eval $(call gb_Jar_Jar,table))
 
 $(eval $(call gb_Jar_add_jars,table,\
 	$(OUTDIR)/bin/ridl.jar \

wizards/Jar_web.mk

@@ -26,7 +26,7 @@
 #
 #*************************************************************************
 
-$(eval $(call gb_Jar_Jar,web,SRCDIR))
+$(eval $(call gb_Jar_Jar,web))
 
 $(eval $(call gb_Jar_add_jars,web,\
 	$(OUTDIR)/bin/ridl.jar \

writerfilter/Package_writerfilter_generated.mk

@@ -30,7 +30,7 @@ $(eval $(call \
 	gb_Package_Package,writerfilter_generated,$(WORKDIR)/CustomTarget/writerfilter/source))
 
 $(eval $(call \
-	gb_Package_add_customtarget,writerfilter_generated,writerfilter/source,SRCDIR))
+	gb_Package_add_customtarget,writerfilter_generated,writerfilter/source))
 
 $(eval $(call \
 	gb_CustomTarget_add_outdir_dependencies,writerfilter/source,\

xmerge/Jar_XMergeBridge.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,XMergeBridge,SRCDIR))
+$(eval $(call gb_Jar_Jar,XMergeBridge))
 
 $(eval $(call gb_Jar_set_componentfile,XMergeBridge,xmerge/source/bridge/XMergeBridge,OOO))
 

xmerge/Jar_aportisdoc.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,aportisdoc,SRCDIR))
+$(eval $(call gb_Jar_Jar,aportisdoc))
 
 $(eval $(call gb_Jar_add_packagefile,aportisdoc,META-INF/converter.xml,$(SRCDIR)/xmerge/source/aportisdoc/converter.xml))
 

xmerge/Jar_htmlsoff.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,htmlsoff,SRCDIR))
+$(eval $(call gb_Jar_Jar,htmlsoff))
 
 $(eval $(call gb_Jar_add_packagefile,htmlsoff,META-INF/converter.xml,$(SRCDIR)/xmerge/source/htmlsoff/converter.xml))
 $(eval $(call gb_Jar_add_packagefile,htmlsoff,htmltosoff.xsl,$(SRCDIR)/xmerge/source/htmlsoff/htmltosoff.xsl))

xmerge/Jar_pexcel.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,pexcel,SRCDIR))
+$(eval $(call gb_Jar_Jar,pexcel))
 
 $(eval $(call gb_Jar_add_packagefile,pexcel,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pexcel/converter.xml))
 

xmerge/Jar_pocketword.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,pocketword,SRCDIR))
+$(eval $(call gb_Jar_Jar,pocketword))
 
 $(eval $(call gb_Jar_add_packagefile,pocketword,META-INF/converter.xml,$(SRCDIR)/xmerge/source/pocketword/converter.xml))
 

xmerge/Jar_xmerge.mk

@@ -27,7 +27,7 @@
 # instead of those above.
 #
 
-$(eval $(call gb_Jar_Jar,xmerge,SRCDIR))
+$(eval $(call gb_Jar_Jar,xmerge))
 
 $(eval $(call gb_Jar_set_manifest,xmerge,$(SRCDIR)/xmerge/source/xmerge/xmerge.mf))