Repository.mk | 3 --- automation/Package_packimages.mk | 2 +- automation/Package_testtool.mk | 2 +- bean/Jar_officebean.mk | 2 +- desktop/Package_branding.mk | 2 +- desktop/Package_rcfile.mk | 2 +- filter/Configuration_filter.mk | 4 ++-- filter/Jar_XSLTFilter.mk | 2 +- filter/Jar_XSLTValidate.mk | 2 +- filter/Package_filter_generated.mk | 2 +- i18npool/Package_generated.mk | 10 +++++----- offapi/UnoApi_offapi.mk | 2 +- offapi/UnoApi_types.mk | 2 +- officecfg/Configuration_officecfg.mk | 2 +- oovbaapi/UnoApi_oovbaapi.mk | 2 +- qadevOOo/Jar_OOoRunner.mk | 2 +- qadevOOo/Jar_OOoRunnerLight.mk | 2 +- scripting/Jar_HelloWorld.mk | 2 +- scripting/Jar_Highlight.mk | 2 +- scripting/Jar_MemoryUsage.mk | 2 +- scripting/Jar_ScriptFramework.mk | 2 +- scripting/Jar_ScriptProviderForBeanShell.mk | 2 +- scripting/Jar_ScriptProviderForJava.mk | 2 +- scripting/Jar_ScriptProviderForJavaScript.mk | 2 +- solenv/gbuild/Configuration.mk | 11 +++-------- solenv/gbuild/CustomTarget.mk | 12 +++--------- solenv/gbuild/Helper.mk | 13 ------------- solenv/gbuild/Jar.mk | 2 +- solenv/gbuild/JavaClassSet.mk | 9 ++------- solenv/gbuild/JunitTest.mk | 2 +- solenv/gbuild/Package.mk | 2 +- solenv/gbuild/UnoApiTarget.mk | 4 ---- swext/Configuration_mediawiki.mk | 2 +- swext/Jar_mediawiki.mk | 2 +- tools/Package_reversemap.mk | 2 +- udkapi/UnoApi_udkapi.mk | 2 +- udkapi/UnoApi_uretypes.mk | 2 +- vcl/Package_afmhash.mk | 2 +- vcl/Package_kde4moc.mk | 2 +- wizards/Jar_agenda.mk | 2 +- wizards/Jar_commonwizards.mk | 2 +- wizards/Jar_fax.mk | 2 +- wizards/Jar_form.mk | 2 +- wizards/Jar_letter.mk | 2 +- wizards/Jar_query.mk | 2 +- wizards/Jar_report.mk | 2 +- wizards/Jar_reportbuilder.mk | 2 +- wizards/Jar_table.mk | 2 +- wizards/Jar_web.mk | 2 +- writerfilter/Package_writerfilter_generated.mk | 2 +- xmerge/Jar_XMergeBridge.mk | 2 +- xmerge/Jar_aportisdoc.mk | 2 +- xmerge/Jar_htmlsoff.mk | 2 +- xmerge/Jar_pexcel.mk | 2 +- xmerge/Jar_pocketword.mk | 2 +- xmerge/Jar_xmerge.mk | 2 +- 56 files changed, 63 insertions(+), 99 deletions(-)
New commits: commit c77a9254dde41f222bc65af957c91fa5bc166103 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Oct 22 16:54:01 2011 +0200 no need for SRCDIR parameter here diff --git a/automation/Package_packimages.mk b/automation/Package_packimages.mk index f768372..1299cb8 100644 --- a/automation/Package_packimages.mk +++ b/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 \ diff --git a/automation/Package_testtool.mk b/automation/Package_testtool.mk index b2f0076..ea88754 100644 --- a/automation/Package_testtool.mk +++ b/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 \ diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk index ab38fd2..1d03e5c 100644 --- a/bean/Jar_officebean.mk +++ b/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 \ diff --git a/desktop/Package_branding.mk b/desktop/Package_branding.mk index c1956cd..9e00e23 100644 --- a/desktop/Package_branding.mk +++ b/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: diff --git a/desktop/Package_rcfile.mk b/desktop/Package_rcfile.mk index 49abab0..4186864 100644 --- a/desktop/Package_rcfile.mk +++ b/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: diff --git a/filter/Configuration_filter.mk b/filter/Configuration_filter.mk index 07301dc..c8e5593 100644 --- a/filter/Configuration_filter.mk +++ b/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)))) diff --git a/filter/Jar_XSLTFilter.mk b/filter/Jar_XSLTFilter.mk index 4bd5d2a..d68b353 100644 --- a/filter/Jar_XSLTFilter.mk +++ b/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 \ diff --git a/filter/Jar_XSLTValidate.mk b/filter/Jar_XSLTValidate.mk index 6f1ab4c..cd578fa 100644 --- a/filter/Jar_XSLTValidate.mk +++ b/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 \ diff --git a/filter/Package_filter_generated.mk b/filter/Package_filter_generated.mk index bdcd213..d93416b 100644 --- a/filter/Package_filter_generated.mk +++ b/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 \ diff --git a/i18npool/Package_generated.mk b/i18npool/Package_generated.mk index c904a67..c0d7c80 100644 --- a/i18npool/Package_generated.mk +++ b/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 \ )) diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index 1f3ab32..8ae72cb 100644 --- a/offapi/UnoApi_offapi.mk +++ b/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 \ diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk index 02b9953..df0da06 100644 --- a/offapi/UnoApi_types.mk +++ b/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 \ diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk index 97dc0c1..0b0a8b0 100644 --- a/officecfg/Configuration_officecfg.mk +++ b/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 \ diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk index c204aa6..340c5d0 100644 --- a/oovbaapi/UnoApi_oovbaapi.mk +++ b/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 \ diff --git a/qadevOOo/Jar_OOoRunner.mk b/qadevOOo/Jar_OOoRunner.mk index 4434033..8268975 100644 --- a/qadevOOo/Jar_OOoRunner.mk +++ b/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 \ diff --git a/qadevOOo/Jar_OOoRunnerLight.mk b/qadevOOo/Jar_OOoRunnerLight.mk index 687b123..ca17599 100644 --- a/qadevOOo/Jar_OOoRunnerLight.mk +++ b/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 \ diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk index bbd71a0..fa0ec4d 100644 --- a/scripting/Jar_HelloWorld.mk +++ b/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 \ diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk index 018b6f8..ea46602 100644 --- a/scripting/Jar_Highlight.mk +++ b/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 \ diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk index eb1a476..bb9300b 100644 --- a/scripting/Jar_MemoryUsage.mk +++ b/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 \ diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk index b95606e..05774b9 100644 --- a/scripting/Jar_ScriptFramework.mk +++ b/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 \ diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk index 7fd3201..ef064ae 100644 --- a/scripting/Jar_ScriptProviderForBeanShell.mk +++ b/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 \ diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk index 8e7d2bf..39b747b 100644 --- a/scripting/Jar_ScriptProviderForJava.mk +++ b/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 \ diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk index 91d97fb..93ab3e1 100644 --- a/scripting/Jar_ScriptProviderForJavaScript.mk +++ b/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 \ diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 52a1936..21497f5 100644 --- a/solenv/gbuild/Configuration.mk +++ b/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 \ diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 624783c..a75c1f8 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/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 diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 18e03d4..9d410ba 100644 --- a/solenv/gbuild/Jar.mk +++ b/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)) diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 083898d..10df1da 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/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 diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk index 23ec530..7420757 100644 --- a/solenv/gbuild/Package.mk +++ b/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 diff --git a/swext/Configuration_mediawiki.mk b/swext/Configuration_mediawiki.mk index 23d10e7..4db4fa8 100644 --- a/swext/Configuration_mediawiki.mk +++ b/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 \ diff --git a/swext/Jar_mediawiki.mk b/swext/Jar_mediawiki.mk index 2a1c7ef..5661927 100644 --- a/swext/Jar_mediawiki.mk +++ b/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)) diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk index 14adf9b..513fc01 100644 --- a/tools/Package_reversemap.mk +++ b/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) \ diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk index 1572c13..fb1ac94 100644 --- a/udkapi/UnoApi_udkapi.mk +++ b/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) \ diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk index ad5c8f1..d61d079 100644 --- a/udkapi/UnoApi_uretypes.mk +++ b/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 \ diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk index cc7cd58..90d8b82 100644 --- a/vcl/Package_afmhash.mk +++ b/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: diff --git a/vcl/Package_kde4moc.mk b/vcl/Package_kde4moc.mk index c7b5af3..180689a 100644 --- a/vcl/Package_kde4moc.mk +++ b/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: diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk index eb5423e..fe3e338 100644 --- a/wizards/Jar_agenda.mk +++ b/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 \ diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk index 876b327..b5a4170 100644 --- a/wizards/Jar_commonwizards.mk +++ b/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 \ diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk index 7a86e60..a30849b 100644 --- a/wizards/Jar_fax.mk +++ b/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 \ diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk index d4e04aa..735687b 100644 --- a/wizards/Jar_form.mk +++ b/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 \ diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk index aaa7332..7be1974 100644 --- a/wizards/Jar_letter.mk +++ b/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 \ diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk index 62ea5e6..c4238df 100644 --- a/wizards/Jar_query.mk +++ b/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 \ diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk index 770cbdb..da8e28d 100644 --- a/wizards/Jar_report.mk +++ b/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 \ diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk index 74faf13..1304854 100644 --- a/wizards/Jar_reportbuilder.mk +++ b/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 \ diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk index f65ab18..4ed34c4 100644 --- a/wizards/Jar_table.mk +++ b/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 \ diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk index 340fa4e..36a2434 100644 --- a/wizards/Jar_web.mk +++ b/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 \ diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk index ec88aff..3e036f1 100644 --- a/writerfilter/Package_writerfilter_generated.mk +++ b/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,\ diff --git a/xmerge/Jar_XMergeBridge.mk b/xmerge/Jar_XMergeBridge.mk index 858b0e4..b2c7eb7 100644 --- a/xmerge/Jar_XMergeBridge.mk +++ b/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)) diff --git a/xmerge/Jar_aportisdoc.mk b/xmerge/Jar_aportisdoc.mk index f9a13e8..70b8b0d 100644 --- a/xmerge/Jar_aportisdoc.mk +++ b/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)) diff --git a/xmerge/Jar_htmlsoff.mk b/xmerge/Jar_htmlsoff.mk index 501e774..fca57f6 100644 --- a/xmerge/Jar_htmlsoff.mk +++ b/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)) diff --git a/xmerge/Jar_pexcel.mk b/xmerge/Jar_pexcel.mk index 8f18b33..c3f4758 100644 --- a/xmerge/Jar_pexcel.mk +++ b/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)) diff --git a/xmerge/Jar_pocketword.mk b/xmerge/Jar_pocketword.mk index ecbfe8e..7403838 100644 --- a/xmerge/Jar_pocketword.mk +++ b/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)) diff --git a/xmerge/Jar_xmerge.mk b/xmerge/Jar_xmerge.mk index 943f8b5..2846d4c 100644 --- a/xmerge/Jar_xmerge.mk +++ b/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)) commit eba6bc1b985c6caede347e48d636fd161b6413c0 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Oct 22 16:07:13 2011 +0200 No need to register repository diff --git a/Repository.mk b/Repository.mk index a723436..d6269b8 100644 --- a/Repository.mk +++ b/Repository.mk @@ -26,9 +26,6 @@ # #************************************************************************* -$(eval $(call gb_Helper_register_repository,SRCDIR)) - - $(eval $(call gb_Helper_register_executables,NONE, \ bestreversemap \ bmp \ diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 22aec26..bffaf8a 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -36,8 +36,6 @@ gb_Helper_PHONY := $(gb_Helper_MISC)/PHONY # general propose empty dummy target gb_Helper_MISCDUMMY := $(gb_Helper_MISC)/DUMMY -gb_Helper_REPOSITORYNAMES := - .PHONY : $(WORKDIR)/Misc/PHONY $(gb_Helper_MISCDUMMY) : @mkdir -p $(dir $@) && touch $@ @@ -86,20 +84,9 @@ define gb_Helper_get_outdir_clean_target $$(subst $(OUTDIR)/,$(WORKDIR)/Clean/OutDir/,$(1)) endef -define gb_Helper_register_repository -gb_Helper_CURRENTREPOSITORY := $(1) -gb_Helper_REPOSITORYNAMES += $(1) - -endef - # RepositoryExternal.mk is optional define gb_Helper_add_repository -gb_Helper_CURRENTREPOSITORY := include $(1)/Repository.mk -ifeq ($$(gb_Helper_CURRENTREPOSITORY),) -$$(eval $$(call gb_Output_error,No call to gb_Helper_register_repository in Repository.mk for repository $(1))) -endif -$$(gb_Helper_CURRENTREPOSITORY) := $(1) -include $(1)/RepositoryExternal.mk endef commit c1a1d5d532626c89d19e960a2c4be0a439359e11 Author: Matúš Kukan <matus.ku...@gmail.com> Date: Sat Oct 22 15:53:43 2011 +0200 do not use gb_Helper_REPOSITORYNAMES anymore diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk index 5f34487..52a1936 100644 --- a/solenv/gbuild/Configuration.mk +++ b/solenv/gbuild/Configuration.mk @@ -53,7 +53,7 @@ # Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget # fails: XcuModuleTarget XcuLangpackTarget XcuResTarget # -gb_Configuration__get_source = $($(gb_Configuration_REPO_$(1)))/$(2) +gb_Configuration__get_source = $(SRCDIR)/$(2) # XcsTarget class @@ -64,7 +64,6 @@ $(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs) endef gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG)) -gb_Configuration_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) gb_XcsTarget_XSLT_SchemaVal := $(OUTDIR)/xml/processing/schema_val.xsl gb_XcsTarget_XSLT_Sanity := $(OUTDIR)/xml/processing/sanity.xsl @@ -315,10 +314,6 @@ $(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 -$(if $(filter $(2),$(gb_Configuration_REPOSITORYNAMES)),,\ - $(error Configuration: no or invalid repository given; known repositories: \ - $(gb_Configuration_REPOSITORYNAMES))) -$(eval gb_Configuration_REPO_$(1) := $(2)) $(eval gb_Configuration_NODELIVER_$(1) := $(3)) $(foreach lang,$(gb_Configuration_LANGS),$(eval \ $(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang))))) @@ -426,7 +421,7 @@ $(call gb_Configuration_get_clean_target,$(1)) : \ $(call gb_Configuration_get_target,$(1)) : \ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : \ - $($(gb_Configuration_REPO_$(1)))/$(2)/$(3).tmpl + $(SRCDIR)/$(2)/$(3).tmpl $(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3) $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : LANG := $(4) $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \ diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk index 644ba2c..624783c 100644 --- a/solenv/gbuild/CustomTarget.mk +++ b/solenv/gbuild/CustomTarget.mk @@ -26,8 +26,6 @@ # #************************************************************************* -gb_CustomTarget_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) - # N.B.: putting the "+" there at the start activates the GNU make job server define gb_CustomTarget__command +$(call gb_Helper_abbreviate_dirs,\ @@ -53,10 +51,6 @@ $(1)/$(2)/Makefile endef define gb_CustomTarget_CustomTarget -$(if $(filter $(2),$(gb_CustomTarget_REPOSITORYNAMES)),,\ - $(error CustomTarget: no or invalid repository given; known repositories: \ - $(gb_CustomTarget_REPOSITORYNAMES))) -gb_CustomTarget_REPO_$(1) := $(2) $(call gb_CustomTarget_get_target,$(1)) : \ $(call gb_CustomTarget__get_makefile,$($(2)),$(1)) endef @@ -64,7 +58,7 @@ endef define gb_CustomTarget_add_dependency $(eval $(call gb_CustomTarget_get_target,$(1)) : \ - $($(gb_CustomTarget_REPO_$(1)))/$(2)) + $(SRCDIR)/$(2)) endef define gb_CustomTarget_add_dependencies diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 458216b..292d7ae 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -26,7 +26,6 @@ # #************************************************************************* -gb_JavaClassSet_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES) gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) gb_JavaClassSet_JAVACDEBUG := @@ -64,20 +63,16 @@ $(call gb_JavaClassSet_get_clean_target,%) : # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar) # UGLY: cannot use target local variable for REPO because it's needed in prereq define gb_JavaClassSet_JavaClassSet -$(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\ - $(error JavaClassSet: no or invalid repository given; known repositories: \ - $(gb_JavaClassSet_REPOSITORYNAMES))) -gb_JavaClassSet_REPO_$(1) := $(2) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := endef define gb_JavaClassSet__get_sourcefile -$($(1))/$(2).java +$(SRCDIR)/$(1).java endef define gb_JavaClassSet_add_sourcefile $(eval $(call gb_JavaClassSet_get_target,$(1)) : \ - $(call gb_JavaClassSet__get_sourcefile,$(gb_JavaClassSet_REPO_$(1)),$(2))) + $(call gb_JavaClassSet__get_sourcefile,$(2))) endef define gb_JavaClassSet_add_sourcefiles diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk index 816fb85..35c05c2 100644 --- a/solenv/gbuild/UnoApiTarget.mk +++ b/solenv/gbuild/UnoApiTarget.mk @@ -47,10 +47,6 @@ $(call gb_UnoApiTarget_get_header_target,$(1))/% : $(call gb_UnoApiTarget_get_ta mkdir -p $$(dir $$@) define gb_UnoApiTarget_UnoApiTarget -$(if $(filter $(2),$(gb_Helper_REPOSITORYNAMES)),,\ - $(error UnoApiTarget: no or invalid repository given; known repositories: \ - $(gb_Helper_REPOSITORYNAMES))) -gb_UnoApiTarget_REPO_$(1) := $(2) $$(eval $$(call gb_Module_register_target,$(call gb_UnoApiOutTarget_get_target,$(1)),$(call gb_UnoApiOutTarget_get_clean_target,$(1)))) $(call gb_UnoApiOutTarget_get_target,$(1)) : $(call gb_UnoApiTarget_get_target,$(1)) $(call gb_UnoApiOutTarget_get_clean_target,$(1)) : $(call gb_UnoApiTarget_get_clean_target,$(1))
_______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits