[Libreoffice-commits] .: 4 commits - Library_merged.mk RepositoryExternal.mk UnoControls/Library_ctl.mk accessibility/Jar_accessibility.mk accessibility/Jar_uno_accessbridge.mk accessibility/Library_acc.mk accessibility/Library_java_uno_accessbridge.mk animations/Library_animcore.mk apple_remote/Library_AppleRemote.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.mk avmedia/Library_avmediagst.mk avmedia/Library_avmediawin.mk basctl/Library_basctl.mk basebmp/CppunitTest_basebmp.mk basebmp/Library_basebmp.mk basegfx/CppunitTest_basegfx.mk basegfx/Library_basegfx.mk basegfx/StaticLibrary_basegfx_s.mk basic/CppunitTest_basic_scanner.mk basic/Library_sb.mk bean/Jar_officebean.mk bean/JunitTest_bean_complex.mk bean/Library_officebean.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk canvas/Library_cairocanvas.mk canvas/Library_canvasfactory.mk canvas/Library_canvastools.mk canvas/Library_directx9canvas .mk canvas/Library_gdipluscanvas.mk canvas/Library_nullcanvas.mk canvas/Library_simplecanvas.mk canvas/Library_vclcanvas.mk canvas/StaticLibrary_directxcanvas.mk chart2/JunitTest_chart2_unoapi.mk chart2/Library_chartcontroller.mk chart2/Library_chartmodel.mk chart2/Library_charttools.mk chart2/Library_chartview.mk clucene/Library_clucene.mk comphelper/CppunitTest_comphelper_test.mk comphelper/JunitTest_comphelper_complex.mk comphelper/Library_comphelp.mk configmgr/JunitTest_configmgr_unoapi.mk configmgr/Library_configmgr.mk cppcanvas/Library_cppcanvas.mk cppcanvas/Library_mtfrenderer.mk cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_qa_recursion.mk cppu/CppunitTest_cppu_qa_reference.mk cppu/CppunitTest_cppu_qa_unotype.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppu/Library_affine_uno.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cppu/Library_purpenvhelper.mk cppu/Library_unsafe_uno.mk cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk cppuhelper/CppunitTest_cppuh elper_cppu_unourl.mk cppuhelper/CppunitTest_cppuhelper_qa_weak.mk cppuhelper/Library_cppuhelper.mk cui/Library_cui.mk dbaccess/CppunitTest_dbaccess_macros_test.mk dbaccess/Executable_odbcconfig.mk dbaccess/JunitTest_dbaccess_complex.mk dbaccess/JunitTest_dbaccess_unoapi.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_dbui.mk dbaccess/Library_sdbt.mk desktop/Executable_crashrep.com.mk desktop/Executable_officeloader.mk desktop/Executable_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_sbase.mk desktop/Executable_scalc.mk desktop/Executable_sdraw.mk desktop/Executable_simpress.mk desktop/Executable_smath.mk desktop/Executable_soffice.bin.mk desktop/Executable_soffice.mk desktop/Executable_sweb.mk desktop/Executable_swriter.mk desktop/Executable_unoinfo.mk desktop/Executable_unopkg.bin.mk desktop/Executable_unopkg.mk desktop/Library_deployment.mk desktop/Library_deploymentgui.mk desktop/Libr ary_deploymentmisc.mk desktop/Library_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_spl_unx.mk desktop/Library_unopkgapp.mk drawinglayer/Library_drawinglayer.mk dtrans/Library_dnd.mk dtrans/Library_dtrans.mk dtrans/Library_ftransl.mk dtrans/Library_mcnttype.mk dtrans/Library_sysdtrans.mk dtrans/StaticLibrary_dtobj.mk editeng/CppunitTest_editeng_borderline.mk editeng/Library_editeng.mk embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embedserv/Library_emser.mk embedserv/Library_inprocserv.mk eventattacher/Library_evtatt.mk extensions/CppunitTest_extensions_test_update.mk extensions/Executable_nsplugin.mk extensions/Executable_pluginapp.bin.mk extensions/Library_abp.mk extensions/Library_bib.mk extensions/Library_dbp.mk extensions/Library_ldapbe2.mk extensions/Library_log.mk extensions/Library_npsoplugin.mk extensions/Library_oleautobridge.mk extensions/Library_oleaut obridge2.mk extensions/Library_pcr.mk extensions/Library_pl.mk extensions/Library_res.mk extensions/Library_scn.mk extensions/Library_so_activex.mk extensions/Library_so_activex_x64.mk extensions/Library_updatecheckui.mk extensions/Library_updatefeed.mk extensions/Library_updchk.mk extensions/StaticLibrary_plugcon.mk fileaccess/Library_fileacc.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_test.mk filter/Jar_XSLTFilter.mk filter/Jar_XSLTValidate.mk filter/JunitTest_filter_complex.mk filter/Library_PptImporter.mk filter/Library_egi.mk filter/Library_eme.mk filter/Library_epb.mk filter/Library_epg.mk filter/Library_epp.mk filter/Library_eps.mk filter/Library_ept.mk filter/Library_era.mk filter/Library_eti.mk filter/Library_exp.mk filter/Library_filterconfig.mk filter/Library_filtertracer.mk filter/Library_flash.mk filter/Library_icd.mk filter/Library_icg.mk filter/Library_idx.mk filter/Library_ime.mk filter/Library_ipb.mk filter/Library_ipd.mk filter/L ibrary_ips.mk filter/Library_ipt.mk filter/Library_ipx.mk filter/Library_ira.mk filter/Library_itg.mk filter/Library_iti.mk filter/Library_msfilter.mk filter/Library_odfflatxml.mk filter/Library_pdffilter.mk filter/Library_placeware.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Library_xsltdlg.mk filter/Library_xsltfilter.mk forms/JunitTest_forms_complex.mk forms/JunitTest_forms_unoapi.mk forms/Library_frm.mk formula/Library_for.mk formula/Library_forui.mk fpicker/Library_fpicker.mk fpicker/Library_fps.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps_odma.mk fpicker/Library_fps_office.mk framework/JunitTest_framework_complex.mk framework/JunitTest_framework_unoapi.mk framework/Library_fwe.mk framework/Library_fwi.mk framework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk framework/Library_lomenubar.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk i18npool/Cp punitTest_i18npool_test_breakiterator.mk i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18nutil/Library_i18nutil.mk idl/Executable_svidl.mk io/Library_acceptor.mk io/Library_connector.mk io/Library_streams.mk io/Library_textinstream.mk io/Library_textoutstream.mk javaunohelper/Jar_juh.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk jurt/Jar_jurt.mk jurt/JunitTest_bridgefactory.mk jurt/JunitTest_connections.mk jurt/JunitTest_java.mk jurt/JunitTest_java_re mote.mk jurt/JunitTest_remote.mk jurt/JunitTest_uno.mk jurt/JunitTest_urp.mk jurt/JunitTest_util.mk jurt/Library_jpipe.mk jurt/Library_jpipx.mk jvmaccess/Library_jvmaccess.mk jvmfwk/Executable_javaldx.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_spell.mk lingucomponent/StaticLibrary_ulingu.mk linguistic/JunitTest_linguistic_complex.mk linguistic/JunitTest_linguistic_unoapi.mk linguistic/Library_lng.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk nlpsolver/Jar_EvolutionarySolver.mk nlpsolver/Jar_nlpsolver.mk np_sdk/StaticLibrary_nputils.mk o3tl/CppunitTest_o3tl_tests.mk officecfg/CppunitTest_officecfg_cppheader_test.mk oox/Library_oox.mk package/Library_package2.mk package/Library_xstor.mk padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk qadevOOo/Jar_OOo Runner.mk qadevOOo/Jar_OOoRunnerLight.mk qadevOOo/JunitTest_qadevOOo_unoapi.mk regexp/Library_regexp.mk reportdesign/JunitTest_reportdesign_complex.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk ridljar/Jar_ridl.mk ridljar/JunitTest_typedesc.mk ridljar/JunitTest_uno.mk ridljar/JunitTest_util.mk rsc/Executable_rsc.mk sal/CppunitTest_Module_DLL.mk sal/CppunitTest_sal_bytesequence.mk sal/CppunitTest_sal_osl_condition.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk sal/CppunitTest_sal_osl_module.mk sal/CppunitTest_sal_osl_mutex.mk sal/CppunitTest_sal_osl_old_test_file.mk sal/CppunitTest_sal_osl_pipe.mk sal/CppunitTest_sal_osl_process.mk sal/CppunitTest_sal_osl_profile.mk sal/CppunitTest_sal_osl_security.mk sal/CppunitTest_sal_osl_setthreadname.mk sal/CppunitTest_sal_osl_thread.mk sal/CppunitTest_sal_rtl_alloc.mk sal/CppunitTest_sal_rtl_cipher.mk sal/CppunitTest_sal_rtl_crc32.mk sal/CppunitTest_sa l_rtl_doublelock.mk sal/CppunitTest_sal_rtl_locale.mk sal/CppunitTest_sal_rtl_math.mk sal/CppunitTest_sal_rtl_ostringbuffer.mk sal/CppunitTest_sal_rtl_oustringbuffer.mk sal/CppunitTest_sal_rtl_strings.mk sal/CppunitTest_sal_tcwf.mk sal/CppunitTest_sal_types.mk sal/Executable_cppunittester.mk sal/Executable_osl_process_child.mk sal/Library_sal.mk sal/Library_sal_textenc.mk sal/Library_uwinapi.mk sal/StaticLibrary_salcpprt.mk salhelper/Library_salhelper.mk sax/CppunitTest_sax.mk sax/Library_expwrap.mk sax/Library_fastsax.mk sax/Library_sax.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tableautoformatfield.mk sc/CppunitTest_sc_tables heetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/JunitTest_sc_complex.mk sc/JunitTest_sc_unoapi.mk sc/Library_sc.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_scui.mk sc/Library_vbaobj.mk scaddins/Library_analysis.mk scaddins/Library_date.mk sccomp/Library_solver.mk scripting/Jar_HelloWorld.mk scripting/Jar_Highlight.mk scripting/Jar_MemoryUsage.mk scripting/Jar_ScriptFramework.mk scripting/Jar_ScriptProviderForBeanShell.mk scripting/Jar_ScriptProviderForJava.mk scripting/Jar_ScriptProviderForJavaScript.mk scripting/Library_basprov.mk scripting/Library_dlgprov.mk scripting/Library_protocolhandler.mk scripting/Library_scriptframe.mk scripting/Library_stringresource.mk scripting/Library_vbaevents.mk sd/CppunitTest_sd_filters_test.mk sd/CppunitTest_sd_regression_test.mk sd/CppunitTest_sd_uimpress.mk sd/JunitTest_sd_unoapi.mk sd/Library_sd.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sdui.mk sdext/CppunitTest_pdfimport.mk sdext/Executab le_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Library_minimizer.mk sdext/Library_pdfimport.mk sdext/Library_presenter.mk sdext/StaticLibrary_pdfimport_s.mk sfx2/CppunitTest_sfx2_metadatable.mk sfx2/JunitTest_sfx2_complex.mk sfx2/JunitTest_sfx2_unoapi.mk sfx2/Library_qstart.mk sfx2/Library_sfx.mk slideshow/CppunitTest_slideshow.mk slideshow/Executable_demoshow.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk smoketest/CppunitTest_smoketest.mk smoketest/Jar_TestExtension.mk smoketest/Library_smoketest.mk solenv/gbuild sot/CppunitTest_sot_test_sot.mk sot/JunitTest_sot_complex.mk sot/Library_sot.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/JunitTest_sm_unoapi.mk starmath/JunitTest_starmath_unoapi.mk starmath/Library_sm.mk starmath/Library_smd.mk stoc/Library_bootstrap.mk stoc/Library_introspection.mk stoc/Library_invocadapt.mk stoc/Library_invocation.mk stoc/Library_javaloader.mk stoc/Library_javavm.mk stoc/Library_namingservice.mk stoc/Library_proxy fac.mk stoc/Library_reflection.mk stoc/Library_stocservices.mk svl/CppunitTest_svl_lngmisc.mk svl/CppunitTest_svl_urihelper.mk svl/JunitTest_svl_complex.mk svl/Library_fsstorage.mk svl/Library_passwordcontainer.mk svl/Library_svl.mk svtools/CppunitTest_svtools_filters_test.mk svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/JunitTest_svtools_unoapi.mk svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svx/Executable_gengal.bin.mk svx/JunitTest_svx_unoapi.mk svx/Library_svx.mk svx/Library_svxcore.mk svx/Library_textconversiondlgs.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_layout_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_regression_test.mk sw/CppunitTest_sw_subsequent_ooxmltok.mk sw/CppunitTest_sw_subsequent_rtftok.mk sw/CppunitTest_sw_swdoc_test.mk sw/JunitTest_sw_complex.mk sw/JunitTest_sw_unoapi.mk sw/Library_msword.mk sw/Library_sw.mk sw/Library_swd.mk sw/Library_swui.mk sw/Library_vbaswobj.mk s wext/Jar_mediawiki.mk test/Library_subsequenttest.mk test/Library_test.mk toolkit/JunitTest_toolkit_unoapi.mk toolkit/Library_tk.mk tools/CppunitTest_tools_test.mk tools/Executable_bestreversemap.mk tools/Executable_mkunroll.mk tools/Executable_rscdep.mk tools/Executable_so_checksum.mk tools/Library_tl.mk tools/StaticLibrary_ooopathutils.mk ucb/JunitTest_ucb_complex.mk ucb/JunitTest_ucb_unoapi.mk ucb/Library_cached1.mk ucb/Library_srtrs1.mk ucb/Library_ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpexpand1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucpftp1.mk ucb/Library_ucpgio1.mk ucb/Library_ucpgvfs1.mk ucb/Library_ucphier1.mk ucb/Library_ucpodma1.mk ucb/Library_ucppkg1.mk ucb/Library_ucptdoc1.mk ucb/StaticLibrary_odma_lib.mk ucbhelper/Library_ucbhelper.mk unoil/Jar_unoil.mk unotest/Jar_test-tools.mk unotest/Jar_test.mk unotest/Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotools/JunitTest_unotools_complex.mk unotool s/Library_utl.mk unoxml/JunitTest_unordf_complex.mk unoxml/JunitTest_unoxml_complex.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk uui/Library_uui.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/Executable_kdefilepicker.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_svp.mk vcl/StaticLibrary_headless.mk vcl/StaticLibrary_vclmain.mk wizards/Jar_agenda.mk wizards/Jar_commonwizards.mk wizards/Jar_fax.mk wizards/Jar_form.mk wizards/Jar_letter.mk wizards/Jar_query.mk wizards/Jar_report.mk wizards/Jar_reportbuilder.mk wizards/Jar_table.mk wizards/Jar_web.mk writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/JunitTest_writerfilter_complex.mk writerfilter/Library_doctok.mk writerfilter/Library_ooxml.mk writerfilter/Library_resourcemodel.mk w riterfilter/Library_rtftok.mk writerfilter/Library_writerfilter.mk writerfilter/Library_writerfilter_uno.mk writerperfect/Library_cdrimport.mk writerperfect/Library_msworks.mk writerperfect/Library_visioimport.mk writerperfect/Library_wpft.mk writerperfect/Library_wpgimport.mk writerperfect/StaticLibrary_writerperfect.mk xmerge/Jar_XMergeBridge.mk xmerge/Jar_aportisdoc.mk xmerge/Jar_pexcel.mk xmerge/Jar_pocketword.mk xmerge/Jar_xmerge.mk xml2cmp/Executable_xml2cmp.mk xmlhelp/Library_tvhlp1.mk xmlhelp/Library_ucpchelp1.mk xmloff/JunitTest_xmloff_unoapi.mk xmloff/Library_xo.mk xmloff/Library_xof.mk xmlreader/Library_xmlreader.mk xmlscript/Library_xcr.mk xmlsecurity/CppunitTest_qa_certext.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_fw.mk xmlsecurity/Library_xsec_xmlsec.mk
Michael Stahl
mst at kemper.freedesktop.org
Sat Apr 7 16:15:28 PDT 2012
Library_merged.mk | 10 -
RepositoryExternal.mk | 93 +++++------
UnoControls/Library_ctl.mk | 4
accessibility/Jar_accessibility.mk | 2
accessibility/Jar_uno_accessbridge.mk | 2
accessibility/Library_acc.mk | 4
accessibility/Library_java_uno_accessbridge.mk | 6
animations/Library_animcore.mk | 6
apple_remote/Library_AppleRemote.mk | 2
avmedia/Library_avmedia.mk | 6
avmedia/Library_avmediaQuickTime.mk | 4
avmedia/Library_avmediagst.mk | 4
avmedia/Library_avmediawin.mk | 4
basctl/Library_basctl.mk | 6
basebmp/CppunitTest_basebmp.mk | 2
basebmp/Library_basebmp.mk | 6
basegfx/CppunitTest_basegfx.mk | 4
basegfx/Library_basegfx.mk | 6
basegfx/StaticLibrary_basegfx_s.mk | 4
basic/CppunitTest_basic_scanner.mk | 6
basic/Library_sb.mk | 10 -
bean/Jar_officebean.mk | 2
bean/JunitTest_bean_complex.mk | 2
bean/Library_officebean.mk | 4
binaryurp/CppunitTest_binaryurp_test-cache.mk | 2
binaryurp/CppunitTest_binaryurp_test-unmarshal.mk | 6
binaryurp/Library_binaryurp.mk | 4
canvas/Library_cairocanvas.mk | 8
canvas/Library_canvasfactory.mk | 4
canvas/Library_canvastools.mk | 10 -
canvas/Library_directx9canvas.mk | 8
canvas/Library_gdipluscanvas.mk | 8
canvas/Library_nullcanvas.mk | 4
canvas/Library_simplecanvas.mk | 4
canvas/Library_vclcanvas.mk | 4
canvas/StaticLibrary_directxcanvas.mk | 2
chart2/JunitTest_chart2_unoapi.mk | 2
chart2/Library_chartcontroller.mk | 4
chart2/Library_chartmodel.mk | 4
chart2/Library_charttools.mk | 4
chart2/Library_chartview.mk | 4
clucene/Library_clucene.mk | 6
comphelper/CppunitTest_comphelper_test.mk | 4
comphelper/JunitTest_comphelper_complex.mk | 2
comphelper/Library_comphelp.mk | 6
configmgr/JunitTest_configmgr_unoapi.mk | 2
configmgr/Library_configmgr.mk | 4
cppcanvas/Library_cppcanvas.mk | 6
cppcanvas/Library_mtfrenderer.mk | 4
cppu/CppunitTest_cppu_qa_any.mk | 2
cppu/CppunitTest_cppu_qa_recursion.mk | 2
cppu/CppunitTest_cppu_qa_reference.mk | 2
cppu/CppunitTest_cppu_qa_unotype.mk | 2
cppu/CppunitTest_cppu_test_cppumaker.mk | 2
cppu/Library_affine_uno.mk | 4
cppu/Library_cppu.mk | 6
cppu/Library_log_uno.mk | 4
cppu/Library_purpenvhelper.mk | 4
cppu/Library_unsafe_uno.mk | 4
cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk | 4
cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk | 2
cppuhelper/CppunitTest_cppuhelper_qa_weak.mk | 4
cppuhelper/Library_cppuhelper.mk | 8
cui/Library_cui.mk | 6
dbaccess/CppunitTest_dbaccess_macros_test.mk | 8
dbaccess/Executable_odbcconfig.mk | 4
dbaccess/JunitTest_dbaccess_complex.mk | 2
dbaccess/JunitTest_dbaccess_unoapi.mk | 2
dbaccess/Library_dba.mk | 6
dbaccess/Library_dbaxml.mk | 4
dbaccess/Library_dbmm.mk | 6
dbaccess/Library_dbu.mk | 6
dbaccess/Library_dbui.mk | 6
dbaccess/Library_sdbt.mk | 6
desktop/Executable_crashrep.com.mk | 2
desktop/Executable_officeloader.mk | 2
desktop/Executable_oosplash.mk | 4
desktop/Executable_quickstart.mk | 4
desktop/Executable_sbase.mk | 2
desktop/Executable_scalc.mk | 2
desktop/Executable_sdraw.mk | 2
desktop/Executable_simpress.mk | 2
desktop/Executable_smath.mk | 2
desktop/Executable_soffice.bin.mk | 4
desktop/Executable_soffice.mk | 4
desktop/Executable_sweb.mk | 2
desktop/Executable_swriter.mk | 2
desktop/Executable_unoinfo.mk | 2
desktop/Executable_unopkg.bin.mk | 2
desktop/Executable_unopkg.mk | 2
desktop/Library_deployment.mk | 6
desktop/Library_deploymentgui.mk | 6
desktop/Library_deploymentmisc.mk | 4
desktop/Library_migrationoo2.mk | 4
desktop/Library_migrationoo3.mk | 4
desktop/Library_offacc.mk | 4
desktop/Library_sofficeapp.mk | 4
desktop/Library_spl.mk | 4
desktop/Library_spl_unx.mk | 4
desktop/Library_unopkgapp.mk | 4
drawinglayer/Library_drawinglayer.mk | 6
dtrans/Library_dnd.mk | 6
dtrans/Library_dtrans.mk | 4
dtrans/Library_ftransl.mk | 6
dtrans/Library_mcnttype.mk | 6
dtrans/Library_sysdtrans.mk | 6
dtrans/StaticLibrary_dtobj.mk | 2
editeng/CppunitTest_editeng_borderline.mk | 4
editeng/Library_editeng.mk | 6
embeddedobj/Library_embobj.mk | 4
embeddedobj/Library_emboleobj.mk | 6
embedserv/Library_emser.mk | 4
embedserv/Library_inprocserv.mk | 2
eventattacher/Library_evtatt.mk | 4
extensions/CppunitTest_extensions_test_update.mk | 10 -
extensions/Executable_nsplugin.mk | 10 -
extensions/Executable_pluginapp.bin.mk | 8
extensions/Library_abp.mk | 4
extensions/Library_bib.mk | 4
extensions/Library_dbp.mk | 4
extensions/Library_ldapbe2.mk | 4
extensions/Library_log.mk | 4
extensions/Library_npsoplugin.mk | 6
extensions/Library_oleautobridge.mk | 4
extensions/Library_oleautobridge2.mk | 4
extensions/Library_pcr.mk | 4
extensions/Library_pl.mk | 10 -
extensions/Library_res.mk | 4
extensions/Library_scn.mk | 6
extensions/Library_so_activex.mk | 6
extensions/Library_so_activex_x64.mk | 6
extensions/Library_updatecheckui.mk | 4
extensions/Library_updatefeed.mk | 4
extensions/Library_updchk.mk | 6
extensions/StaticLibrary_plugcon.mk | 4
fileaccess/Library_fileacc.mk | 4
filter/CppunitTest_filter_tga_test.mk | 8
filter/CppunitTest_filter_tiff_test.mk | 8
filter/Jar_XSLTFilter.mk | 2
filter/Jar_XSLTValidate.mk | 2
filter/JunitTest_filter_complex.mk | 2
filter/Library_PptImporter.mk | 4
filter/Library_egi.mk | 4
filter/Library_eme.mk | 4
filter/Library_epb.mk | 4
filter/Library_epg.mk | 4
filter/Library_epp.mk | 4
filter/Library_eps.mk | 4
filter/Library_ept.mk | 4
filter/Library_era.mk | 4
filter/Library_eti.mk | 4
filter/Library_exp.mk | 4
filter/Library_filterconfig.mk | 4
filter/Library_filtertracer.mk | 4
filter/Library_flash.mk | 4
filter/Library_icd.mk | 4
filter/Library_icg.mk | 4
filter/Library_idx.mk | 4
filter/Library_ime.mk | 4
filter/Library_ipb.mk | 4
filter/Library_ipd.mk | 4
filter/Library_ips.mk | 4
filter/Library_ipt.mk | 4
filter/Library_ipx.mk | 4
filter/Library_ira.mk | 4
filter/Library_itg.mk | 4
filter/Library_iti.mk | 4
filter/Library_msfilter.mk | 6
filter/Library_odfflatxml.mk | 4
filter/Library_pdffilter.mk | 4
filter/Library_placeware.mk | 4
filter/Library_svgfilter.mk | 6
filter/Library_t602filter.mk | 4
filter/Library_xmlfa.mk | 4
filter/Library_xmlfd.mk | 4
filter/Library_xsltdlg.mk | 4
filter/Library_xsltfilter.mk | 4
forms/JunitTest_forms_complex.mk | 2
forms/JunitTest_forms_unoapi.mk | 2
forms/Library_frm.mk | 4
formula/Library_for.mk | 6
formula/Library_forui.mk | 4
fpicker/Library_fpicker.mk | 6
fpicker/Library_fps.mk | 4
fpicker/Library_fps_aqua.mk | 4
fpicker/Library_fps_odma.mk | 6
fpicker/Library_fps_office.mk | 4
framework/JunitTest_framework_complex.mk | 2
framework/JunitTest_framework_unoapi.mk | 2
framework/Library_fwe.mk | 4
framework/Library_fwi.mk | 8
framework/Library_fwk.mk | 4
framework/Library_fwl.mk | 4
framework/Library_fwm.mk | 4
framework/Library_lomenubar.mk | 4
hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk | 8
hwpfilter/Library_hwp.mk | 6
i18npool/CppunitTest_i18npool_test_breakiterator.mk | 8
i18npool/Executable_gencoll_rule.mk | 2
i18npool/Executable_genconv_dict.mk | 2
i18npool/Executable_gendict.mk | 2
i18npool/Executable_genindex_data.mk | 2
i18npool/Executable_saxparser.mk | 4
i18npool/Library_collator_data.mk | 2
i18npool/Library_dict_ja.mk | 2
i18npool/Library_dict_zh.mk | 2
i18npool/Library_i18nisolang1.mk | 6
i18npool/Library_i18npool.mk | 4
i18npool/Library_i18nsearch.mk | 6
i18npool/Library_index_data.mk | 2
i18npool/Library_localedata_en.mk | 2
i18npool/Library_localedata_es.mk | 2
i18npool/Library_localedata_euro.mk | 2
i18npool/Library_localedata_others.mk | 2
i18npool/Library_textconv_dict.mk | 4
i18nutil/Library_i18nutil.mk | 6
idl/Executable_svidl.mk | 4
io/Library_acceptor.mk | 4
io/Library_connector.mk | 4
io/Library_streams.mk | 4
io/Library_textinstream.mk | 4
io/Library_textoutstream.mk | 4
javaunohelper/Jar_juh.mk | 2
javaunohelper/Library_juh.mk | 6
javaunohelper/Library_juhx.mk | 4
jurt/Jar_jurt.mk | 2
jurt/JunitTest_bridgefactory.mk | 4
jurt/JunitTest_connections.mk | 4
jurt/JunitTest_java.mk | 4
jurt/JunitTest_java_remote.mk | 4
jurt/JunitTest_remote.mk | 4
jurt/JunitTest_uno.mk | 4
jurt/JunitTest_urp.mk | 6
jurt/JunitTest_util.mk | 4
jurt/Library_jpipe.mk | 4
jurt/Library_jpipx.mk | 2
jvmaccess/Library_jvmaccess.mk | 6
jvmfwk/Executable_javaldx.mk | 2
jvmfwk/Library_jvmfwk.mk | 8
jvmfwk/Library_sunjavaplugin.mk | 8
lingucomponent/Library_MacOSXSpell.mk | 4
lingucomponent/Library_guesslang.mk | 4
lingucomponent/Library_hyphen.mk | 6
lingucomponent/Library_lnth.mk | 6
lingucomponent/Library_spell.mk | 6
lingucomponent/StaticLibrary_ulingu.mk | 2
linguistic/JunitTest_linguistic_complex.mk | 2
linguistic/JunitTest_linguistic_unoapi.mk | 2
linguistic/Library_lng.mk | 6
lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk | 8
lotuswordpro/Library_lwpft.mk | 4
nlpsolver/Jar_EvolutionarySolver.mk | 2
nlpsolver/Jar_nlpsolver.mk | 2
np_sdk/StaticLibrary_nputils.mk | 5
o3tl/CppunitTest_o3tl_tests.mk | 4
officecfg/CppunitTest_officecfg_cppheader_test.mk | 6
oox/Library_oox.mk | 6
package/Library_package2.mk | 6
package/Library_xstor.mk | 4
padmin/Executable_spadmin.bin.mk | 10 -
padmin/Library_spa.mk | 8
qadevOOo/Jar_OOoRunner.mk | 2
qadevOOo/Jar_OOoRunnerLight.mk | 2
qadevOOo/JunitTest_qadevOOo_unoapi.mk | 2
regexp/Library_regexp.mk | 6
reportdesign/JunitTest_reportdesign_complex.mk | 2
reportdesign/Library_rpt.mk | 4
reportdesign/Library_rptui.mk | 4
reportdesign/Library_rptxml.mk | 4
ridljar/Jar_ridl.mk | 4
ridljar/JunitTest_typedesc.mk | 2
ridljar/JunitTest_uno.mk | 2
ridljar/JunitTest_util.mk | 2
rsc/Executable_rsc.mk | 4
sal/CppunitTest_Module_DLL.mk | 2
sal/CppunitTest_sal_bytesequence.mk | 2
sal/CppunitTest_sal_osl_condition.mk | 2
sal/CppunitTest_sal_osl_file.mk | 2
sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk | 2
sal/CppunitTest_sal_osl_module.mk | 2
sal/CppunitTest_sal_osl_mutex.mk | 2
sal/CppunitTest_sal_osl_old_test_file.mk | 2
sal/CppunitTest_sal_osl_pipe.mk | 2
sal/CppunitTest_sal_osl_process.mk | 2
sal/CppunitTest_sal_osl_profile.mk | 2
sal/CppunitTest_sal_osl_security.mk | 2
sal/CppunitTest_sal_osl_setthreadname.mk | 2
sal/CppunitTest_sal_osl_thread.mk | 2
sal/CppunitTest_sal_rtl_alloc.mk | 2
sal/CppunitTest_sal_rtl_cipher.mk | 2
sal/CppunitTest_sal_rtl_crc32.mk | 2
sal/CppunitTest_sal_rtl_doublelock.mk | 2
sal/CppunitTest_sal_rtl_locale.mk | 2
sal/CppunitTest_sal_rtl_math.mk | 2
sal/CppunitTest_sal_rtl_ostringbuffer.mk | 2
sal/CppunitTest_sal_rtl_oustringbuffer.mk | 2
sal/CppunitTest_sal_rtl_strings.mk | 2
sal/CppunitTest_sal_tcwf.mk | 2
sal/CppunitTest_sal_types.mk | 2
sal/Executable_cppunittester.mk | 2
sal/Executable_osl_process_child.mk | 2
sal/Library_sal.mk | 8
sal/Library_sal_textenc.mk | 2
sal/Library_uwinapi.mk | 2
sal/StaticLibrary_salcpprt.mk | 2
salhelper/Library_salhelper.mk | 4
sax/CppunitTest_sax.mk | 4
sax/Library_expwrap.mk | 4
sax/Library_fastsax.mk | 4
sax/Library_sax.mk | 6
sc/CppunitTest_sc_cellrangeobj.mk | 8
sc/CppunitTest_sc_chart_regression_test.mk | 8
sc/CppunitTest_sc_databaserangeobj.mk | 8
sc/CppunitTest_sc_datapilotfieldobj.mk | 8
sc/CppunitTest_sc_datapilottableobj.mk | 8
sc/CppunitTest_sc_filters_test.mk | 8
sc/CppunitTest_sc_macros_test.mk | 8
sc/CppunitTest_sc_namedrangeobj.mk | 8
sc/CppunitTest_sc_namedrangesobj.mk | 8
sc/CppunitTest_sc_subsequent_filters_test.mk | 12 -
sc/CppunitTest_sc_tableautoformatfield.mk | 8
sc/CppunitTest_sc_tablesheetobj.mk | 8
sc/CppunitTest_sc_tablesheetsobj.mk | 8
sc/CppunitTest_sc_ucalc.mk | 8
sc/JunitTest_sc_complex.mk | 2
sc/JunitTest_sc_unoapi.mk | 2
sc/Library_sc.mk | 4
sc/Library_scd.mk | 4
sc/Library_scfilt.mk | 4
sc/Library_scui.mk | 6
sc/Library_vbaobj.mk | 6
scaddins/Library_analysis.mk | 6
scaddins/Library_date.mk | 4
sccomp/Library_solver.mk | 4
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
scripting/Library_basprov.mk | 4
scripting/Library_dlgprov.mk | 4
scripting/Library_protocolhandler.mk | 4
scripting/Library_scriptframe.mk | 4
scripting/Library_stringresource.mk | 4
scripting/Library_vbaevents.mk | 4
sd/CppunitTest_sd_filters_test.mk | 8
sd/CppunitTest_sd_regression_test.mk | 8
sd/CppunitTest_sd_uimpress.mk | 8
sd/JunitTest_sd_unoapi.mk | 2
sd/Library_sd.mk | 4
sd/Library_sdd.mk | 4
sd/Library_sdfilt.mk | 4
sd/Library_sdui.mk | 4
sdext/CppunitTest_pdfimport.mk | 10 -
sdext/Executable_pdf2xml.mk | 6
sdext/Executable_pdfunzip.mk | 6
sdext/Library_minimizer.mk | 4
sdext/Library_pdfimport.mk | 6
sdext/Library_presenter.mk | 4
sdext/StaticLibrary_pdfimport_s.mk | 4
sfx2/CppunitTest_sfx2_metadatable.mk | 4
sfx2/JunitTest_sfx2_complex.mk | 2
sfx2/JunitTest_sfx2_unoapi.mk | 2
sfx2/Library_qstart.mk | 4
sfx2/Library_sfx.mk | 10 -
slideshow/CppunitTest_slideshow.mk | 8
slideshow/Executable_demoshow.mk | 6
slideshow/Library_OGLTrans.mk | 10 -
slideshow/Library_slideshow.mk | 4
smoketest/CppunitTest_smoketest.mk | 4
smoketest/Jar_TestExtension.mk | 2
smoketest/Library_smoketest.mk | 4
solenv/gbuild/CppunitTest.mk | 55 ++++++
solenv/gbuild/Executable.mk | 9 +
solenv/gbuild/Extension.mk | 12 +
solenv/gbuild/Jar.mk | 60 +++++--
solenv/gbuild/JavaClassSet.mk | 47 ++++-
solenv/gbuild/JunitTest.mk | 67 ++++++-
solenv/gbuild/Library.mk | 12 +
solenv/gbuild/LinkTarget.mk | 109 ++++++++++---
solenv/gbuild/StaticLibrary.mk | 8
solenv/gbuild/templates/CppunitTest.mk | 2
solenv/gbuild/templates/Executable.mk | 2
solenv/gbuild/templates/JunitTest.mk | 2
solenv/gbuild/templates/Library.mk | 4
solenv/gbuild/templates/StaticLibrary.mk | 2
sot/CppunitTest_sot_test_sot.mk | 6
sot/JunitTest_sot_complex.mk | 2
sot/Library_sot.mk | 6
starmath/CppunitTest_starmath_qa_cppunit.mk | 14 -
starmath/JunitTest_sm_unoapi.mk | 2
starmath/JunitTest_starmath_unoapi.mk | 2
starmath/Library_sm.mk | 4
starmath/Library_smd.mk | 4
stoc/Library_bootstrap.mk | 4
stoc/Library_introspection.mk | 4
stoc/Library_invocadapt.mk | 4
stoc/Library_invocation.mk | 4
stoc/Library_javaloader.mk | 4
stoc/Library_javavm.mk | 4
stoc/Library_namingservice.mk | 4
stoc/Library_proxyfac.mk | 4
stoc/Library_reflection.mk | 4
stoc/Library_stocservices.mk | 4
svl/CppunitTest_svl_lngmisc.mk | 4
svl/CppunitTest_svl_urihelper.mk | 8
svl/JunitTest_svl_complex.mk | 2
svl/Library_fsstorage.mk | 6
svl/Library_passwordcontainer.mk | 6
svl/Library_svl.mk | 6
svtools/CppunitTest_svtools_filters_test.mk | 8
svtools/Executable_bmp.mk | 4
svtools/Executable_bmpsum.mk | 4
svtools/Executable_g2g.mk | 4
svtools/JunitTest_svtools_unoapi.mk | 2
svtools/Library_hatchwindowfactory.mk | 4
svtools/Library_svt.mk | 8
svx/Executable_gengal.bin.mk | 8
svx/JunitTest_svx_unoapi.mk | 2
svx/Library_svx.mk | 6
svx/Library_svxcore.mk | 6
svx/Library_textconversiondlgs.mk | 4
sw/CppunitTest_sw_filters_test.mk | 8
sw/CppunitTest_sw_layout_test.mk | 8
sw/CppunitTest_sw_macros_test.mk | 8
sw/CppunitTest_sw_regression_test.mk | 8
sw/CppunitTest_sw_subsequent_ooxmltok.mk | 8
sw/CppunitTest_sw_subsequent_rtftok.mk | 8
sw/CppunitTest_sw_swdoc_test.mk | 8
sw/JunitTest_sw_complex.mk | 2
sw/JunitTest_sw_unoapi.mk | 2
sw/Library_msword.mk | 6
sw/Library_sw.mk | 4
sw/Library_swd.mk | 4
sw/Library_swui.mk | 4
sw/Library_vbaswobj.mk | 4
swext/Jar_mediawiki.mk | 6
test/Library_subsequenttest.mk | 4
test/Library_test.mk | 6
toolkit/JunitTest_toolkit_unoapi.mk | 2
toolkit/Library_tk.mk | 8
tools/CppunitTest_tools_test.mk | 6
tools/Executable_bestreversemap.mk | 2
tools/Executable_mkunroll.mk | 2
tools/Executable_rscdep.mk | 6
tools/Executable_so_checksum.mk | 2
tools/Library_tl.mk | 10 -
tools/StaticLibrary_ooopathutils.mk | 2
ucb/JunitTest_ucb_complex.mk | 2
ucb/JunitTest_ucb_unoapi.mk | 2
ucb/Library_cached1.mk | 4
ucb/Library_srtrs1.mk | 4
ucb/Library_ucb1.mk | 4
ucb/Library_ucpcmis1.mk | 4
ucb/Library_ucpdav1.mk | 8
ucb/Library_ucpexpand1.mk | 4
ucb/Library_ucpext.mk | 4
ucb/Library_ucpfile1.mk | 4
ucb/Library_ucpftp1.mk | 4
ucb/Library_ucpgio1.mk | 4
ucb/Library_ucpgvfs1.mk | 4
ucb/Library_ucphier1.mk | 4
ucb/Library_ucpodma1.mk | 6
ucb/Library_ucppkg1.mk | 4
ucb/Library_ucptdoc1.mk | 4
ucb/StaticLibrary_odma_lib.mk | 4
ucbhelper/Library_ucbhelper.mk | 6
unoil/Jar_unoil.mk | 2
unotest/Jar_test-tools.mk | 2
unotest/Jar_test.mk | 4
unotest/Library_unoexceptionprotector.mk | 6
unotest/Library_unotest.mk | 6
unotools/JunitTest_unotools_complex.mk | 2
unotools/Library_utl.mk | 6
unoxml/JunitTest_unordf_complex.mk | 2
unoxml/JunitTest_unoxml_complex.mk | 2
unoxml/Library_unordf.mk | 4
unoxml/Library_unoxml.mk | 4
uui/Library_uui.mk | 4
vbahelper/Library_msforms.mk | 4
vbahelper/Library_vbahelper.mk | 6
vcl/Executable_kdefilepicker.mk | 2
vcl/Library_desktop_detector.mk | 8
vcl/Library_vcl.mk | 24 +-
vcl/Library_vclplug_gen.mk | 6
vcl/Library_vclplug_gtk.mk | 6
vcl/Library_vclplug_gtk3.mk | 8
vcl/Library_vclplug_kde.mk | 6
vcl/Library_vclplug_kde4.mk | 8
vcl/Library_vclplug_svp.mk | 8
vcl/StaticLibrary_headless.mk | 2
vcl/StaticLibrary_vclmain.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/CppunitTest_writerfilter_doctok.mk | 4
writerfilter/CppunitTest_writerfilter_rtftok.mk | 8
writerfilter/JunitTest_writerfilter_complex.mk | 2
writerfilter/Library_doctok.mk | 4
writerfilter/Library_ooxml.mk | 4
writerfilter/Library_resourcemodel.mk | 6
writerfilter/Library_rtftok.mk | 4
writerfilter/Library_writerfilter.mk | 4
writerfilter/Library_writerfilter_uno.mk | 4
writerperfect/Library_cdrimport.mk | 6
writerperfect/Library_msworks.mk | 6
writerperfect/Library_visioimport.mk | 6
writerperfect/Library_wpft.mk | 6
writerperfect/Library_wpgimport.mk | 6
writerperfect/StaticLibrary_writerperfect.mk | 2
xmerge/Jar_XMergeBridge.mk | 2
xmerge/Jar_aportisdoc.mk | 2
xmerge/Jar_pexcel.mk | 2
xmerge/Jar_pocketword.mk | 2
xmerge/Jar_xmerge.mk | 2
xml2cmp/Executable_xml2cmp.mk | 2
xmlhelp/Library_tvhlp1.mk | 4
xmlhelp/Library_ucpchelp1.mk | 4
xmloff/JunitTest_xmloff_unoapi.mk | 2
xmloff/Library_xo.mk | 6
xmloff/Library_xof.mk | 4
xmlreader/Library_xmlreader.mk | 6
xmlscript/Library_xcr.mk | 6
xmlsecurity/CppunitTest_qa_certext.mk | 4
xmlsecurity/Library_xmlsecurity.mk | 4
xmlsecurity/Library_xsec_fw.mk | 4
xmlsecurity/Library_xsec_xmlsec.mk | 18 +-
536 files changed, 1508 insertions(+), 1257 deletions(-)
New commits:
commit 449582407a0aad8096bb2ec75588e6e7d7de0169
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Apr 7 23:22:11 2012 +0200
extensions: add np_sdk_inc to mozilla_headers external
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index d2b1438..cb8c669 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1034,6 +1034,7 @@ endef
else #!SYSTEM_MOZILLA_HEADERS
define gb_LinkTarget__use_mozilla_headers
+$(eval $(call gb_LinkTarget_use_package,$(1),np_sdk_inc))
$(eval $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/npsdk \
$$(INCLUDE) \
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 4fd84f0..57bbb18 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -30,8 +30,6 @@
$(eval $(call gb_Executable_Executable,pluginapp.bin))
-$(eval $(call gb_Executable_use_package,pluginapp.bin,np_sdk_inc))
-
$(eval $(call gb_Executable_use_external,pluginapp.bin,mozilla_headers))
$(eval $(call gb_Executable_set_include,pluginapp.bin,\
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index cbcfc79..8db7fba 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -32,8 +32,6 @@ $(eval $(call gb_Library_Library,pl))
$(eval $(call gb_Library_set_componentfile,pl,extensions/source/plugin/pl))
-$(eval $(call gb_Library_use_package,pl,np_sdk_inc))
-
$(eval $(call gb_Library_use_external,pl,mozilla_headers))
$(eval $(call gb_Library_set_include,pl,\
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 0ef41af..50e90d0 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -31,8 +31,6 @@ endif
$(eval $(call gb_StaticLibrary_StaticLibrary,plugcon))
-$(eval $(call gb_StaticLibrary_use_package,plugcon,np_sdk_inc))
-
$(eval $(call gb_StaticLibrary_use_external,plugcon,mozilla_headers))
$(eval $(call gb_StaticLibrary_set_include,plugcon,\
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index c65b961..77b1e2d 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -27,8 +27,6 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
-$(eval $(call gb_StaticLibrary_use_package,nputils,np_sdk_inc))
-
$(eval $(call gb_StaticLibrary_use_externals,nputils,\
mozilla_headers \
))
@@ -37,19 +35,16 @@ ifeq ($(GUIBASE),aqua)
$(eval $(call gb_StaticLibrary_add_defs,nputils,\
-DNO_X11 \
))
-
endif
ifeq ($(OS),WNT)
$(eval $(call gb_StaticLibrary_add_exception_objects,nputils,\
np_sdk/mozsrc/npwin \
))
-
else
$(eval $(call gb_StaticLibrary_add_cobjects,nputils,\
np_sdk/mozsrc/npunix \
))
-
endif
# vim: set noet sw=4 ts=4:
commit 4c50f23f87e391d93ded2564000589ef1a70696a
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Apr 7 23:22:10 2012 +0200
LinkTarget.mk: remove gb_LinkTarget_add_package_headers
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index fbd4ae9..7154286 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,animcore))
-$(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
+$(eval $(call gb_Library_use_package,animcore,animations_inc))
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk
index b5acc01..37a1928 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -29,7 +29,7 @@
$(eval $(call gb_Library_Library,AppleRemote))
-$(eval $(call gb_Library_add_package_headers,AppleRemote,\
+$(eval $(call gb_Library_use_package,AppleRemote,\
apple_remote_inc \
))
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 1565af5..316b6d6 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,avmedia))
-$(eval $(call gb_Library_add_package_headers,avmedia,avmedia_inc))
+$(eval $(call gb_Library_use_package,avmedia,avmedia_inc))
$(eval $(call gb_Library_set_componentfile,avmedia,avmedia/util/avmedia))
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 731d965..f747d3d 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,basebmp))
-$(eval $(call gb_Library_add_package_headers,basebmp,basebmp_inc))
+$(eval $(call gb_Library_use_package,basebmp,basebmp_inc))
$(eval $(call gb_Library_set_include,basebmp,\
-I$(SRCDIR)/basebmp/inc/ \
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 4e88a3e..64e5a10 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,basegfx))
-$(eval $(call gb_Library_add_package_headers,basegfx,basegfx_inc))
+$(eval $(call gb_Library_use_package,basegfx,basegfx_inc))
$(eval $(call gb_Library_set_include,basegfx,\
-I$(SRCDIR)/basegfx/inc \
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 70c5a07..cbfe817 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,basegfx_s))
-$(eval $(call gb_StaticLibrary_add_package_headers,basegfx_s,basegfx_inc))
+$(eval $(call gb_StaticLibrary_use_package,basegfx_s,basegfx_inc))
$(eval $(call gb_StaticLibrary_set_include,basegfx_s,\
-I$(SRCDIR)/basegfx/inc \
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 91c0b39..352f3e6 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,sb))
-$(eval $(call gb_Library_add_package_headers,sb,basic_inc))
+$(eval $(call gb_Library_use_package,sb,basic_inc))
$(eval $(call gb_Library_set_componentfile,sb,basic/util/sb))
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 4ab7ab8..558cd24 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,canvastools))
-$(eval $(call gb_Library_add_package_headers,canvastools,canvas_inc))
+$(eval $(call gb_Library_use_package,canvastools,canvas_inc))
$(eval $(call gb_Library_set_include,canvastools,\
$$(INCLUDE) \
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index eac5715..8ac4dc7 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,clucene))
$(eval $(call gb_Library_use_external,clucene,zlib))
-$(eval $(call gb_Library_add_package_headers,clucene,clucene_source))
+$(eval $(call gb_Library_use_package,clucene,clucene_source))
$(eval $(call gb_Library_set_warnings_not_errors,clucene))
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 7627a9c..2e46bfd 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,comphelper))
-$(eval $(call gb_Library_add_package_headers,comphelper,comphelper_inc))
+$(eval $(call gb_Library_use_package,comphelper,comphelper_inc))
$(eval $(call gb_Library_set_componentfile,comphelper,comphelper/util/comphelp))
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index ce2355b..367f322 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,cppcanvas))
-$(eval $(call gb_Library_add_package_headers,cppcanvas,cppcanvas_inc))
+$(eval $(call gb_Library_use_package,cppcanvas,cppcanvas_inc))
$(eval $(call gb_Library_set_include,cppcanvas,\
-I$(SRCDIR)/cppcanvas/inc \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index d1b527b..9dcb35a 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,cppu))
$(eval $(call gb_Library_set_soversion_script,cppu,3,$(SRCDIR)/cppu/util/cppu.map))
# Unit tests depend on cppu_generated custom target
-$(eval $(call gb_Library_add_package_headers,cppu,cppu_generated))
+$(eval $(call gb_Library_use_package,cppu,cppu_generated))
$(eval $(call gb_Library_set_include,cppu,\
$$(INCLUDE) \
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 3724459..c653f04 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,cppuhelper))
$(eval $(call gb_Library_set_soversion_script,cppuhelper,3,$(SRCDIR)/cppuhelper/source/gcc3.map))
-$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_generated))
-$(eval $(call gb_Library_add_package_headers,cppuhelper,cppuhelper_inc))
+$(eval $(call gb_Library_use_packages,cppuhelper,\
+ cppuhelper_generated \
+ cppuhelper_inc \
+))
$(eval $(call gb_Library_set_include,cppuhelper,\
-I$(WORKDIR)/CustomTarget/cppuhelper/unotypes \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index ee7489d..0e71fd3 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,dba))
-$(eval $(call gb_Library_add_package_headers,dba,\
+$(eval $(call gb_Library_use_package,dba,\
dbaccess_inc \
))
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 8278207..cb9dc74 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,dbmm))
-$(eval $(call gb_Library_add_package_headers,dbmm,\
+$(eval $(call gb_Library_use_package,dbmm,\
dbaccess_inc \
))
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index d5d82ea..c6b0a80 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,sdbt))
-$(eval $(call gb_Library_add_package_headers,sdbt,\
+$(eval $(call gb_Library_use_package,sdbt,\
dbaccess_inc \
))
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index ba17108..b50b4b9 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,drawinglayer))
-$(eval $(call gb_Library_add_package_headers,drawinglayer,drawinglayer_inc))
+$(eval $(call gb_Library_use_package,drawinglayer,drawinglayer_inc))
$(eval $(call gb_Library_set_include,drawinglayer,\
$$(INCLUDE) \
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 3f649df..fb2193e 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,editeng))
-$(eval $(call gb_Library_add_package_headers,editeng,editeng_inc))
+$(eval $(call gb_Library_use_package,editeng,editeng_inc))
$(eval $(call gb_Library_set_include,editeng,\
$$(INCLUDE) \
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index 0c08a80..e2e5eb2 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -19,7 +19,7 @@
$(eval $(call gb_Library_Library,msfilter))
-$(eval $(call gb_Library_add_package_headers,msfilter,filter_inc))
+$(eval $(call gb_Library_use_package,msfilter,filter_inc))
$(eval $(call gb_Library_set_componentfile,msfilter,filter/source/msfilter/msfilter))
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 751194b..1c4852c 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,for))
-$(eval $(call gb_Library_add_package_headers,for,\
+$(eval $(call gb_Library_use_package,for,\
formula_inc \
))
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 98774bb..9b15a2d 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,fwi))
-$(eval $(call gb_Library_add_package_headers,fwi,framework_inc))
+$(eval $(call gb_Library_use_package,fwi,framework_inc))
$(eval $(call gb_Library_add_defs,fwi,\
-DFWI_DLLIMPLEMENTATION \
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
index 613548e..2ed16de 100644
--- a/i18npool/Library_i18nisolang1.mk
+++ b/i18npool/Library_i18nisolang1.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,i18nisolang1))
-$(eval $(call gb_Library_add_package_headers,i18nisolang1,i18npool_inc))
+$(eval $(call gb_Library_use_package,i18nisolang1,i18npool_inc))
$(eval $(call gb_Library_set_include,i18nisolang1,\
$$(INCLUDE) \
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index 88ddbe2..4194c53 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,i18nsearch))
-$(eval $(call gb_Library_add_package_headers,i18nsearch,i18npool_inc))
+$(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc))
$(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
diff --git a/i18nutil/Library_i18nutil.mk b/i18nutil/Library_i18nutil.mk
index 9b8b7dd..216dbec 100644
--- a/i18nutil/Library_i18nutil.mk
+++ b/i18nutil/Library_i18nutil.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,i18nutil))
-$(eval $(call gb_Library_add_package_headers,i18nutil,i18nutil_inc))
+$(eval $(call gb_Library_use_package,i18nutil,i18nutil_inc))
$(eval $(call gb_Library_use_api,i18nutil,\
udkapi \
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
index c72efbe..19297e7 100644
--- a/javaunohelper/Library_juh.mk
+++ b/javaunohelper/Library_juh.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,juh))
-$(eval $(call gb_Library_add_package_headers,juh,\
+$(eval $(call gb_Library_use_package,juh,\
javaunohelper_cppumaker \
))
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
index cd21583..f35ec61 100644
--- a/javaunohelper/Library_juhx.mk
+++ b/javaunohelper/Library_juhx.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,juhx))
-$(eval $(call gb_Library_add_package_headers,juhx,\
+$(eval $(call gb_Library_use_package,juhx,\
javaunohelper_cppumaker \
))
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 904a612..d4227a7 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,jvmaccess))
$(eval $(call gb_Library_set_soversion_script,jvmaccess,3,$(SRCDIR)/jvmaccess/util/gcc3.map))
-$(eval $(call gb_Library_add_package_headers,jvmaccess,\
+$(eval $(call gb_Library_use_package,jvmaccess,\
jvmaccess_inc \
))
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index f1b6778..4dc9c09 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,jvmfwk))
$(eval $(call gb_Library_set_soversion_script,jvmfwk,3,$(SRCDIR)/jvmfwk/source/framework.map))
-$(eval $(call gb_Library_add_package_headers,jvmfwk,\
+$(eval $(call gb_Library_use_package,jvmfwk,\
jvmfwk_inc \
))
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index 22984a8..f9a363b 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,lng))
-$(eval $(call gb_Library_add_package_headers,lng,linguistic_inc))
+$(eval $(call gb_Library_use_package,lng,linguistic_inc))
$(eval $(call gb_Library_set_componentfile,lng,linguistic/source/lng))
diff --git a/np_sdk/StaticLibrary_nputils.mk b/np_sdk/StaticLibrary_nputils.mk
index ff63293..c65b961 100644
--- a/np_sdk/StaticLibrary_nputils.mk
+++ b/np_sdk/StaticLibrary_nputils.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,nputils))
-$(eval $(call gb_StaticLibrary_add_package_headers,nputils,np_sdk_inc))
+$(eval $(call gb_StaticLibrary_use_package,nputils,np_sdk_inc))
$(eval $(call gb_StaticLibrary_use_externals,nputils,\
mozilla_headers \
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk
index 9eacbbb..464a5e7 100644
--- a/o3tl/CppunitTest_o3tl_tests.mk
+++ b/o3tl/CppunitTest_o3tl_tests.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,o3tl_tests))
-$(eval $(call gb_CppunitTest_add_package_headers,o3tl_tests,o3tl_inc))
+$(eval $(call gb_CppunitTest_use_package,o3tl_tests,o3tl_inc))
$(eval $(call gb_CppunitTest_use_libraries,o3tl_tests,\
sal \
diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk
index 6ce8a46..886888b 100644
--- a/officecfg/CppunitTest_officecfg_cppheader_test.mk
+++ b/officecfg/CppunitTest_officecfg_cppheader_test.mk
@@ -41,6 +41,6 @@ $(eval $(call gb_CppunitTest_use_api,officecfg_cppheader_test, \
udkapi \
))
-$(eval $(call gb_CppunitTest_add_package_headers,officecfg_cppheader_test,officecfg_cppheader))
+$(eval $(call gb_CppunitTest_use_package,officecfg_cppheader_test,officecfg_cppheader))
## vim: set noet sw=4 ts=4:
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index 7eae4ec..e6290e5 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,oox))
-$(eval $(call gb_Library_add_package_headers,oox,\
+$(eval $(call gb_Library_use_packages,oox,\
oox_inc \
oox_generated \
oox_source \
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 5be137e..223e280 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,package2))
-$(eval $(call gb_Library_add_package_headers,package2,package_inc))
+$(eval $(call gb_Library_use_package,package2,package_inc))
$(eval $(call gb_Library_set_componentfile,package2,package/util/package2))
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index 8ef6f5c..4599c76 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,i18nregexp))
-$(eval $(call gb_Library_add_package_headers,i18nregexp,regexp_inc))
+$(eval $(call gb_Library_use_package,i18nregexp,regexp_inc))
$(eval $(call gb_Library_use_api,i18nregexp,\
offapi \
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index f0d3abb..0b6e30f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -29,8 +29,10 @@ $(eval $(call gb_Library_Library,sal))
$(eval $(call gb_Library_set_soversion_script,sal,3,$(SRCDIR)/sal/util/sal.map))
-$(eval $(call gb_Library_add_package_headers,sal,sal_generated))
-$(eval $(call gb_Library_add_package_headers,sal,sal_inc))
+$(eval $(call gb_Library_use_packages,sal,\
+ sal_generated \
+ sal_inc \
+))
$(eval $(call gb_Library_set_include,sal,\
$$(INCLUDE) \
diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index 3ca32b9..f86043d 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,salcpprt))
-$(eval $(call gb_StaticLibrary_add_package_headers,salcpprt,\
+$(eval $(call gb_StaticLibrary_use_packages,salcpprt,\
sal_generated \
sal_inc \
))
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
index d2431c3..c9f7c8a 100644
--- a/salhelper/Library_salhelper.mk
+++ b/salhelper/Library_salhelper.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,salhelper))
-$(eval $(call gb_Library_add_package_headers,salhelper,salhelper_inc))
+$(eval $(call gb_Library_use_package,salhelper,salhelper_inc))
$(eval $(call gb_Library_add_defs,salhelper,\
-DSALHELPER_DLLIMPLEMENTATION \
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 585595a..08518e5 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,sax))
-$(eval $(call gb_Library_add_package_headers,sax,\
+$(eval $(call gb_Library_use_package,sax,\
sax_inc \
))
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index 6ac26b8..f9d848b 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,sfx))
-$(eval $(call gb_Library_add_package_headers,sfx,\
+$(eval $(call gb_Library_use_packages,sfx,\
sfx2_inc \
sfx2_sdi \
))
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 57821c5..bf1c0b5 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,slideshow))
-$(eval $(call gb_CppunitTest_add_package_headers,slideshow,sd_qa_unit))
+$(eval $(call gb_CppunitTest_use_package,slideshow,sd_qa_unit))
$(eval $(call gb_CppunitTest_set_include,slideshow,\
$$(INCLUDE) \
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index 07e83a8..91e6a02 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Executable_Executable,demoshow))
-$(eval $(call gb_Executable_add_package_headers,demoshow,sd_qa_unit))
+$(eval $(call gb_Executable_use_package,demoshow,sd_qa_unit))
$(eval $(call gb_Executable_set_include,demoshow,\
$$(INCLUDE) \
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index be3c51d..0709dc0 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -282,6 +282,8 @@ $(eval $(foreach method,\
add_asmobject \
add_asmobjects \
add_package_headers \
+ use_package \
+ use_packages \
add_sdi_headers \
add_cflags \
set_cflags \
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 3089924..b0ba4c9 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -121,6 +121,8 @@ $(eval $(foreach method,\
add_custom_headers \
use_custom_headers \
add_package_headers \
+ use_package \
+ use_packages \
add_sdi_headers \
add_nativeres \
set_warnings_not_errors \
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 177e07f..a9c1720 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -199,6 +199,7 @@ $(eval $(foreach method,\
use_custom_headers \
add_external_headers \
use_package \
+ use_packages \
add_package_headers \
add_sdi_headers \
export_objects_list \
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index b56456e..37e2025 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1011,9 +1011,8 @@ $(foreach customtarget,$(2),$(call gb_LinkTarget__use_custom_headers,$(1),$(cust
endef
define gb_LinkTarget_add_package_headers
-$(foreach package,$(2),$(call gb_LinkTarget__add_internal_headers,$(1),$(call gb_Package_get_target,$(package))))
-$(call gb_LinkTarget_get_clean_target,$(1)) : $(foreach package,$(2),$(call gb_Package_get_clean_target,$(package)))
-
+$$(call gb_Output_error,\
+ gb_LinkTarget_add_package_headers: use gb_LinkTarget_use_package instead.)
endef
# add SDI (svidl) headers
@@ -1029,7 +1028,13 @@ endef
# use a header package, possibly from another module (i.e. via OUTDIR)
define gb_LinkTarget_use_package
-$(call gb_LinkTarget_get_headers_target,$(1) : |$(call gb_Package_get_target,$(2)))
+$(call gb_LinkTarget_get_headers_target,$(1) : | \
+ $(call gb_Package_get_target,$(strip $(2))))
+
+endef
+
+define gb_LinkTarget_use_packages
+$(foreach package,$(2),$(call gb_LinkTarget_use_package,$(1),$(package)))
endef
# this forwards to functions that must be defined in RepositoryExternal.mk.
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index a437634..27183c4 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -113,6 +113,8 @@ $(eval $(foreach method,\
add_custom_headers \
use_custom_headers \
add_package_headers \
+ use_package \
+ use_packages \
add_sdi_headers \
set_warnings_not_errors \
,\
diff --git a/solenv/gbuild/templates/Library.mk b/solenv/gbuild/templates/Library.mk
index 972ab82..6fa404b 100644
--- a/solenv/gbuild/templates/Library.mk
+++ b/solenv/gbuild/templates/Library.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_Library,LIB))
# declare packages that will be delivered before compilation of LIB
# learn more about TYPE in the Package.mk template
-$(eval $(call gb_Library_add_package_headers,LIB,MODULE_TYPE))
+$(eval $(call gb_Library_use_package,LIB,MODULE_TYPE))
# in case UNO services are exported: declare location of component file
$(eval $(call gb_Library_set_componentfile,LIB,MODULE/COMPONENT_FILE))
diff --git a/solenv/gbuild/templates/StaticLibrary.mk b/solenv/gbuild/templates/StaticLibrary.mk
index 0bee7b9..2b9bac6 100644
--- a/solenv/gbuild/templates/StaticLibrary.mk
+++ b/solenv/gbuild/templates/StaticLibrary.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,LIB))
-$(eval $(call gb_StaticLibrary_add_package_headers,LIB,MODULE_inc))
+$(eval $(call gb_StaticLibrary_use_package,LIB,MODULE_inc))
$(eval $(call gb_StaticLibrary_add_exception_objects,LIB,\
))
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 124c592..5f620bc 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,sot))
-$(eval $(call gb_Library_add_package_headers,sot,sot_inc))
+$(eval $(call gb_Library_use_package,sot,sot_inc))
$(eval $(call gb_Library_set_componentfile,sot,sot/util/sot))
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index c4683a2..48a06d9 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,fsstorage))
-$(eval $(call gb_Library_add_package_headers,fsstorage,svl_inc))
+$(eval $(call gb_Library_use_package,fsstorage,svl_inc))
$(eval $(call gb_Library_set_componentfile,fsstorage,svl/source/fsstor/fsstorage))
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index aa3a940..d09ad30 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,passwordcontainer))
-$(eval $(call gb_Library_add_package_headers,passwordcontainer,svl_inc))
+$(eval $(call gb_Library_use_package,passwordcontainer,svl_inc))
$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer))
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index a4f06c1..35191e4 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,svl))
-$(eval $(call gb_Library_add_package_headers,svl,svl_inc))
+$(eval $(call gb_Library_use_package,svl,svl_inc))
$(eval $(call gb_Library_set_componentfile,svl,svl/util/svl))
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 73f1e21..7186bba 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,svt))
-$(eval $(call gb_Library_add_package_headers,svt,svtools_inc))
+$(eval $(call gb_Library_use_package,svt,svtools_inc))
$(eval $(call gb_Library_set_componentfile,svt,svtools/util/svt))
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index c1565f1..50ef4b2 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_Library_set_componentfile,svxcore,svx/util/svxcore))
$(eval $(call gb_Library_add_sdi_headers,svxcore,svx/sdi/svxslots))
-$(eval $(call gb_Library_add_package_headers,svxcore,\
+$(eval $(call gb_Library_use_packages,svxcore,\
svx_inc \
svx_sdi \
))
diff --git a/test/Library_test.mk b/test/Library_test.mk
index f35d2b7..571d26c 100644
--- a/test/Library_test.mk
+++ b/test/Library_test.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,test))
-$(eval $(call gb_Library_add_package_headers,test,test_inc))
+$(eval $(call gb_Library_use_package,test,test_inc))
$(eval $(call gb_Library_add_defs,test,\
-DOOO_DLLIMPLEMENTATION_TEST \
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 0518e7a..1ba1efd 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,tk))
$(eval $(call gb_Library_set_componentfile,tk,toolkit/util/tk))
-$(eval $(call gb_Library_add_package_headers,tk,toolkit_inc))
+$(eval $(call gb_Library_use_package,tk,toolkit_inc))
$(eval $(call gb_Library_set_include,tk,\
$$(INCLUDE) \
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index cddc0cc..2571031 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,tl))
-$(eval $(call gb_Library_add_package_headers,tl,tools_inc))
+$(eval $(call gb_Library_use_package,tl,tools_inc))
$(eval $(call gb_Library_use_custom_headers,tl,tools/reversemap))
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index e32c947..a656700 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,ooopathutils))
-$(eval $(call gb_StaticLibrary_add_package_headers,ooopathutils,tools_inc))
+$(eval $(call gb_StaticLibrary_use_package,ooopathutils,tools_inc))
$(eval $(call gb_StaticLibrary_add_exception_objects,ooopathutils,\
tools/source/misc/pathutils \
diff --git a/ucb/StaticLibrary_odma_lib.mk b/ucb/StaticLibrary_odma_lib.mk
index d9e1fe4..d6100b6 100644
--- a/ucb/StaticLibrary_odma_lib.mk
+++ b/ucb/StaticLibrary_odma_lib.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_StaticLibrary_StaticLibrary,odma_lib))
-$(eval $(call gb_StaticLibrary_add_package_headers,odma_lib,ucb_odma_inc))
+$(eval $(call gb_StaticLibrary_use_package,odma_lib,ucb_odma_inc))
$(eval $(call gb_StaticLibrary_use_api,odma_lib,\
offapi \
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index 3d93a15..166226d 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,ucbhelper))
-$(eval $(call gb_Library_add_package_headers,ucbhelper,ucbhelper_inc))
+$(eval $(call gb_Library_use_package,ucbhelper,ucbhelper_inc))
$(eval $(call gb_Library_set_include,ucbhelper,\
$$(INCLUDE) \
diff --git a/unotest/Library_unoexceptionprotector.mk b/unotest/Library_unoexceptionprotector.mk
index c23b195..fc850fc 100644
--- a/unotest/Library_unoexceptionprotector.mk
+++ b/unotest/Library_unoexceptionprotector.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,unoexceptionprotector))
-$(eval $(call gb_Library_add_package_headers,unoexceptionprotector,unotest_inc))
+$(eval $(call gb_Library_use_package,unoexceptionprotector,unotest_inc))
$(eval $(call gb_Library_use_api,unoexceptionprotector,\
udkapi \
diff --git a/unotest/Library_unotest.mk b/unotest/Library_unotest.mk
index 96ad171..0d3672e 100644
--- a/unotest/Library_unotest.mk
+++ b/unotest/Library_unotest.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Library_Library,unotest))
-$(eval $(call gb_Library_add_package_headers,unotest,unotest_inc))
+$(eval $(call gb_Library_use_package,unotest,unotest_inc))
$(eval $(call gb_Library_add_defs,unotest,\
-DOOO_DLLIMPLEMENTATION_UNOTEST \
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index c689299..da53b60 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Library_Library,utl))
# declare packages that will be delivered before compilation of utl
# learn more about TYPE in the Package.mk template
-$(eval $(call gb_Library_add_package_headers,utl,unotools_inc))
+$(eval $(call gb_Library_use_package,utl,unotools_inc))
# in case UNO services are exported: declare location of component file
$(eval $(call gb_Library_set_componentfile,utl,unotools/util/utl))
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 5c7f39a..a18f06e 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,vbahelper))
-$(eval $(call gb_Library_add_package_headers,vbahelper,vbahelper_inc))
+$(eval $(call gb_Library_use_package,vbahelper,vbahelper_inc))
# in case UNO services are exported: declare location of component file
#$(eval $(call gb_Library_set_componentfile,vbahelper,vbahelper/COMPONENT_FILE))
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index c6ab1ad..df85604 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,desktop_detector))
-#$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+#$(eval $(call gb_Library_use_package,vcl,vcl_inc))
$(eval $(call gb_Library_set_include,desktop_detector,\
$$(INCLUDE) \
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index d37a5bb..9020a67 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -42,7 +42,7 @@ else
$(eval $(call gb_Library_set_componentfile,vcl,vcl/vcl.unx))
endif
-$(eval $(call gb_Library_add_package_headers,vcl,vcl_inc))
+$(eval $(call gb_Library_use_package,vcl,vcl_inc))
$(eval $(call gb_Library_use_custom_headers,vcl,vcl/generic/fontmanager))
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index 9fbfcdd..bd3bdb0 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,xo))
$(eval $(call gb_Library_set_componentfile,xo,xmloff/util/xo))
-$(eval $(call gb_Library_add_package_headers,xo,xmloff_inc))
+$(eval $(call gb_Library_use_package,xo,xmloff_inc))
$(eval $(call gb_Library_set_include,xo,\
-I$(SRCDIR)/xmloff/inc \
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index cd1065a..2e6b0bf 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,xmlreader))
-$(eval $(call gb_Library_add_package_headers,xmlreader,xmlreader_inc))
+$(eval $(call gb_Library_use_package,xmlreader,xmlreader_inc))
$(eval $(call gb_Library_add_defs,xmlreader,\
-DOOO_DLLIMPLEMENTATION_XMLREADER \
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index 89a45fb..91f46ee 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_Library_Library,xcr))
-$(eval $(call gb_Library_add_package_headers,xcr,xmlscript_inc))
+$(eval $(call gb_Library_use_package,xcr,xmlscript_inc))
$(eval $(call gb_Library_set_componentfile,xcr,xmlscript/util/xcr))
commit ec3bf5e35ef08cdf809272d31308d70342993398
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Apr 7 23:22:09 2012 +0200
StaticLibrary.mk: linking against dynamic libs considered silly
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index ce79dfa..a437634 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -108,10 +108,6 @@ $(eval $(foreach method,\
set_library_path_flags \
add_api \
use_api \
- add_linked_libs \
- use_libraries \
- add_linked_static_libs \
- use_static_libraries \
use_external \
use_externals \
add_custom_headers \
commit c923f7d2c210dc7846767fc0ac6ece2a0d7812a8
Author: Michael Stahl <mstahl at redhat.com>
Date: Sat Apr 7 23:22:08 2012 +0200
gbuild: "use" vs. "add":
Naming convention for gbuild methods:
- "add" is used for stuff that is logically a part of the target
(i.e. not registered at the Module, but defined in the target's makefile)
- "use" is used for stuff that is logically a different target
(i.e. it is registered at the Module, has it's own makefile, may be
in a different module than the target)
diff --git a/Library_merged.mk b/Library_merged.mk
index cbd016b..c40343d 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -23,7 +23,7 @@
$(eval $(call gb_Library_Library,merged))
-$(eval $(call gb_Library_add_linked_libs,merged,\
+$(eval $(call gb_Library_use_libraries,merged,\
basegfx \
comphelper \
cppu \
@@ -58,12 +58,12 @@ $(eval $(call gb_Library_use_externals,merged,\
endif
# gb_MERGEDLIBS is defined in solenv/gbuild/extensions/pre_MergedLibsList.mk
-$(eval $(call gb_Library_add_library_objects,merged,\
+$(eval $(call gb_Library_use_library_objects,merged,\
$(gb_MERGEDLIBS) \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,merged,\
+$(eval $(call gb_Library_use_libraries,merged,\
advapi32 \
gdi32 \
ole32 \
@@ -76,14 +76,14 @@ $(eval $(call gb_Library_add_linked_libs,merged,\
endif
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_linked_libs,merged,\
+$(eval $(call gb_Library_use_libraries,merged,\
objc \
Cocoa \
))
endif
ifeq ($(OS),MACOSX)
-$(eval $(call gb_Library_add_linked_libs,merged,\
+$(eval $(call gb_Library_use_libraries,merged,\
objc \
Cocoa \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index a11f312..d2b1438 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -43,7 +43,7 @@ gb_LinkTarget__use_Mesa:=
else
define gb_LinkTarget__use_Mesa
-$(eval $(call gb_LinkTarget_add_external_headers,$(1),Mesa_inc))
+$(eval $(call gb_LinkTarget_use_package,$(1),Mesa_inc))
endef
endif
@@ -69,7 +69,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
))
define gb_LinkTarget__use_cppunit
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
cppunit \
)
@@ -94,7 +94,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_zlib
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
zlib \
)
@@ -125,7 +125,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/external/jpeg \
)
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
jpeglib \
)
@@ -163,7 +163,7 @@ $(if $(filter-out ascii_expat_xmlparse,$(2)),\
-DXML_UNICODE \
))
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
$(2) \
expat_xmltok \
)
@@ -209,7 +209,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
-I$(OUTDIR)/inc/hunspell \
)
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
$(if $(filter MSC,$(COM)),libhunspell,hunspell-1.3) \
)
@@ -236,7 +236,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_cmis
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
cmislib \
)
@@ -270,11 +270,11 @@ endif
define gb_LinkTarget__use_libexttextcat
ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
libexttextcat \
)
else
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
exttextcat \
)
endif
@@ -305,7 +305,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
))
define gb_LinkTarget__use_libxml2
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
xml2 \
)
@@ -332,7 +332,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_libxslt
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
xslt \
)
@@ -373,7 +373,7 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
neon \
)
@@ -403,7 +403,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_librdf
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
rdf \
)
@@ -448,7 +448,7 @@ $(call gb_LinkTarget_set_include,$(1),\
-I$(OUTDIR)/inc/cairo \
$(FREETYPE_CFLAGS) \
)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
cairo \
)
ifneq ($(OS),WNT)
@@ -457,7 +457,7 @@ $(call gb_LinkTarget_add_static_libs,$(1),\
pixman-1 \
)
else
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
pixman-1 \
)
endif
@@ -502,7 +502,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
graphite2_off \
))
define gb_LinkTarget__use_graphite
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
graphite2_off \
)
@@ -553,13 +553,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_icudt
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icudt \
)
endef
define gb_LinkTarget__use_icuin
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icuin \
)
@@ -574,13 +574,13 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_icudata
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icudata$(gb_ICU_suffix) \
)
endef
define gb_LinkTarget__use_icui18n
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icui18n$(gb_ICU_suffix) \
)
@@ -588,19 +588,19 @@ endef
endif
define gb_LinkTarget__use_icule
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icule$(gb_ICU_suffix) \
)
endef
define gb_LinkTarget__use_icutu
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icutu$(gb_ICU_suffix) \
)
endef
define gb_LinkTarget__use_icuuc
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
icuuc$(gb_ICU_suffix) \
)
@@ -636,17 +636,17 @@ endif
define gb_LinkTarget__use_openssl
ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
crypto \
ssl \
)
else
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
crypto \
ssl \
)
ifeq ($(OS),SOLARIS)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
nsl \
socket \
)
@@ -676,7 +676,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_cdr
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
cdrlib \
)
@@ -703,7 +703,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_visio
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
visiolib \
)
@@ -730,7 +730,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_wpd
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
wpdlib \
)
@@ -757,7 +757,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_wpg
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
wpglib \
)
@@ -784,7 +784,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
))
define gb_LinkTarget__use_wps
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
wpslib \
)
@@ -811,7 +811,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_lcms2
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
lcms2 \
)
@@ -834,7 +834,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_lpsolve55
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
lpsolve55 \
)
@@ -951,11 +951,11 @@ endif
define gb_LinkTarget__use_berkeleydb
ifneq ($(OS),WNT)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
db-4.7 \
)
else
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
db47 \
)
endif
@@ -985,7 +985,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
))
define gb_LinkTarget__use_png
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
png \
)
@@ -1012,7 +1012,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
))
define gb_LinkTarget__use_curl
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
curl \
)
@@ -1098,18 +1098,18 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
-$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+$(call gb_LinkTarget_use_static_libraries,$(1),\
fofi \
Goo \
xpdf \
)
ifeq ($(OS),MACOSX)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
objc \
)
else ifeq ($(OS),WNT)
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
advapi32 \
gdi32 \
)
@@ -1141,7 +1141,7 @@ endef
else # !SYSTEM_CLUCENE
define gb_LinkTarget__use_clucene
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
clucene \
)
@@ -1253,7 +1253,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
))
define gb_LinkTarget__use_plc4
-$(call gb_LinkTarget_add_linked_libs,$(1),\
+$(call gb_LinkTarget_use_libraries,$(1),\
plc4 \
)
@@ -1266,13 +1266,13 @@ endif
ifeq ($(SYSTEM_SAXON),YES)
define gb_JavaClassSet__use_saxon
-$(call gb_JavaClassSet_add_system_jar,$(1),$(SAXON_JAR))
+$(call gb_JavaClassSet_use_system_jar,$(1),$(SAXON_JAR))
endef
else # !SYSTEM_SAXON
define gb_JavaClassSet__use_saxon
-$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
+$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/saxon9.jar)
endef
endif # SYSTEM_SAXON
@@ -1280,13 +1280,13 @@ endif # SYSTEM_SAXON
ifeq ($(SYSTEM_BSH),YES)
define gb_JavaClassSet__use_bsh
-$(call gb_JavaClassSet_add_system_jar,$(1),$(BSH_JAR))
+$(call gb_JavaClassSet_use_system_jar,$(1),$(BSH_JAR))
endef
else # !SYSTEM_BSH
define gb_JavaClassSet__use_bsh
-$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/bsh.jar)
+$(call gb_JavaClassSet_use_jar,$(1),$(OUTDIR)/bin/bsh.jar)
endef
endif # SYSTEM_BSH
diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
index f1eb96a..9e7fc16 100644
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,ctl,\
-I$(SRCDIR)/UnoControls/source/inc \
))
-$(eval $(call gb_Library_add_api,ctl,\
+$(eval $(call gb_Library_use_api,ctl,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,ctl,\
+$(eval $(call gb_Library_use_libraries,ctl,\
cppu \
cppuhelper \
sal \
diff --git a/accessibility/Jar_accessibility.mk b/accessibility/Jar_accessibility.mk
index 49f77a0..1d82c5f 100644
--- a/accessibility/Jar_accessibility.mk
+++ b/accessibility/Jar_accessibility.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Jar_Jar,java_accessibility))
-$(eval $(call gb_Jar_add_jars,java_accessibility,\
+$(eval $(call gb_Jar_use_jars,java_accessibility,\
$(OUTDIR)/bin/jurt.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/unoil.jar \
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk
index 919e428..586f775 100644
--- a/accessibility/Jar_uno_accessbridge.mk
+++ b/accessibility/Jar_uno_accessbridge.mk
@@ -27,7 +27,7 @@
$(eval $(call gb_Jar_Jar,java_uno_accessbridge))
-$(eval $(call gb_Jar_add_jars,java_uno_accessbridge,\
+$(eval $(call gb_Jar_use_jars,java_uno_accessbridge,\
$(OUTDIR)/bin/java_accessibility.jar \
$(OUTDIR)/bin/jurt.jar \
$(OUTDIR)/bin/ridl.jar \
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 6fb65b6..af15243 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -33,12 +33,12 @@ $(eval $(call gb_Library_set_include,acc,\
-I$(SRCDIR)/accessibility/source/inc \
))
-$(eval $(call gb_Library_add_api,acc,\
+$(eval $(call gb_Library_use_api,acc,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,acc,\
+$(eval $(call gb_Library_use_libraries,acc,\
comphelper \
cppu \
cppuhelper \
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index e03dd43..dcf0acc 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -27,14 +27,14 @@
$(eval $(call gb_Library_Library,java_uno_accessbridge))
-$(eval $(call gb_Library_add_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
+$(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
-$(eval $(call gb_Library_add_api,java_uno_accessbridge,\
+$(eval $(call gb_Library_use_api,java_uno_accessbridge,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,java_uno_accessbridge,\
+$(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
cppu \
jvmaccess \
sal \
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 03e30d9..fbd4ae9 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_add_package_headers,animcore,animations_inc))
$(eval $(call gb_Library_set_componentfile,animcore,animations/source/animcore/animcore))
-$(eval $(call gb_Library_add_api,animcore,\
+$(eval $(call gb_Library_use_api,animcore,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,animcore,\
+$(eval $(call gb_Library_use_libraries,animcore,\
cppu \
cppuhelper \
sal \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index f654478..1565af5 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,avmedia,\
-I$(SRCDIR)/avmedia/source/inc \
))
-$(eval $(call gb_Library_add_api,avmedia,\
+$(eval $(call gb_Library_use_api,avmedia,\
udkapi \
offapi \
))
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,avmedia,\
-DAVMEDIA_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,avmedia,\
+$(eval $(call gb_Library_use_libraries,avmedia,\
comphelper \
ucbhelper \
cppu \
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index 06e5712..d471c03 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
-I$(SRCDIR)/avmedia/source/inc \
))
-$(eval $(call gb_Library_add_api,avmediaQuickTime,\
+$(eval $(call gb_Library_use_api,avmediaQuickTime,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,avmediaQuickTime,\
+$(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
comphelper \
cppu \
cppuhelper \
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 827ab4f..b6323bb 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,avmediagst,\
$(shell pkg-config --cflags gstreamer-0.10, gstreamer-plugins-base-0.10) \
))
-$(eval $(call gb_Library_add_api,avmediagst,\
+$(eval $(call gb_Library_use_api,avmediagst,\
udkapi \
offapi \
))
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_defs,avmediagst,\
))
endif
-$(eval $(call gb_Library_add_linked_libs,avmediagst,\
+$(eval $(call gb_Library_use_libraries,avmediagst,\
comphelper \
cppu \
cppuhelper \
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 1215a32..bac5161 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,avmediawin,\
-I$(SRCDIR)/avmedia/source/inc \
))
-$(eval $(call gb_Library_add_api,avmediawin,\
+$(eval $(call gb_Library_use_api,avmediawin,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,avmediawin,\
+$(eval $(call gb_Library_use_libraries,avmediawin,\
comphelper \
cppu \
cppuhelper \
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index cfc4488..897600b 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,basctl,\
-I$(WORKDIR)/SdiTarget/basctl/sdi \
))
-$(eval $(call gb_Library_add_api,basctl,\
+$(eval $(call gb_Library_use_api,basctl,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,basctl,\
+$(eval $(call gb_Library_use_libraries,basctl,\
comphelper \
cppu \
cppuhelper \
@@ -124,7 +124,7 @@ $(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,basctl,\
+$(eval $(call gb_Library_use_libraries,basctl,\
advapi32 \
gdi32 \
shell32 \
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index 3604ed4..e1e7f30 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -45,7 +45,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basebmp_test, \
basebmp/test/tools \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,basebmp_test, \
+$(eval $(call gb_CppunitTest_use_libraries,basebmp_test, \
basebmp \
basegfx \
sal \
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 93c58c1..731d965 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,basebmp,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,basebmp,\
+$(eval $(call gb_Library_use_api,basebmp,\
offapi \
udkapi \
))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,basebmp,\
-DBASEBMP_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,basebmp,\
+$(eval $(call gb_Library_use_libraries,basebmp,\
basegfx \
sal \
$(gb_STDLIBS) \
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index 3acabef..7874fa4 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basegfx_test, \
basegfx/test/genericclipper \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
+$(eval $(call gb_CppunitTest_use_libraries,basegfx_test, \
basegfx \
cppu \
cppuhelper \
@@ -46,7 +46,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basegfx_test, \
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_add_api,basegfx_test,\
+$(eval $(call gb_CppunitTest_use_api,basegfx_test,\
offapi \
udkapi \
))
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 4223095..4e88a3e 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -51,12 +51,12 @@ $(eval $(call gb_Library_add_cxxflags,basegfx,\
endif
endif
-$(eval $(call gb_Library_add_api,basegfx,\
+$(eval $(call gb_Library_use_api,basegfx,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,basegfx,\
+$(eval $(call gb_Library_use_libraries,basegfx,\
cppu \
cppuhelper \
sal \
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index 2102ccb..70c5a07 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_StaticLibrary_add_cxxflags,basegfx_s,\
endif
endif
-$(eval $(call gb_StaticLibrary_add_api,basegfx_s,\
+$(eval $(call gb_StaticLibrary_use_api,basegfx_s,\
offapi \
udkapi \
))
diff --git a/basic/CppunitTest_basic_scanner.mk b/basic/CppunitTest_basic_scanner.mk
index e7849e2..21e1a82 100644
--- a/basic/CppunitTest_basic_scanner.mk
+++ b/basic/CppunitTest_basic_scanner.mk
@@ -4,10 +4,10 @@ $(eval $(call gb_CppunitTest_add_exception_objects,basic_scanner, \
basic/qa/cppunit/test_scanner \
))
-$(eval $(call gb_CppunitTest_add_library_objects,basic_scanner,sb))
+$(eval $(call gb_CppunitTest_use_library_objects,basic_scanner,sb))
# add a list of all needed libraries here
-$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
+$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
comphelper \
cppu \
cppuhelper \
@@ -25,7 +25,7 @@ $(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
))
ifeq ($(GUI),WNT)
-$(eval $(call gb_CppunitTest_add_linked_libs,basic_scanner, \
+$(eval $(call gb_CppunitTest_use_libraries,basic_scanner, \
oleaut32 \
))
endif
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index fbc4e79..91c0b39 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,sb,\
-I$(SRCDIR)/basic/source/inc \
))
-$(eval $(call gb_Library_add_api,sb,\
+$(eval $(call gb_Library_use_api,sb,\
udkapi \
offapi \
oovbaapi \
@@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_defs,sb,\
-DBASIC_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,sb,\
+$(eval $(call gb_Library_use_libraries,sb,\
comphelper \
cppu \
cppuhelper \
@@ -145,12 +145,12 @@ $(eval $(call gb_Library_add_exception_objects,sb,\
))
# Uncomment the following line if DBG_TRACE_PROFILING is active in source/inc/sbtrace.hxx
-# $(eval $(call gb_Library_add_linked_libs,sb,\
+# $(eval $(call gb_Library_use_libraries,sb,\
canvastools \
))
ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,sb,\
+$(eval $(call gb_Library_use_libraries,sb,\
uwinapi \
oleaut32 \
))
diff --git a/bean/Jar_officebean.mk b/bean/Jar_officebean.mk
index 1d03e5c..1b897a6 100644
--- a/bean/Jar_officebean.mk
+++ b/bean/Jar_officebean.mk
@@ -29,7 +29,7 @@
$(eval $(call gb_Jar_Jar,officebean))
-$(eval $(call gb_Jar_add_jars,officebean,\
+$(eval $(call gb_Jar_use_jars,officebean,\
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/unoil.jar \
$(OUTDIR)/bin/jurt.jar \
diff --git a/bean/JunitTest_bean_complex.mk b/bean/JunitTest_bean_complex.mk
index f443d39..5eec323 100644
--- a/bean/JunitTest_bean_complex.mk
+++ b/bean/JunitTest_bean_complex.mk
@@ -29,7 +29,7 @@
$(eval $(call gb_JunitTest_JunitTest,bean_complex))
-$(eval $(call gb_JunitTest_add_jars,bean_complex,\
+$(eval $(call gb_JunitTest_use_jars,bean_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index bef4ac2..8cafec3 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -46,7 +46,7 @@ endif
ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,officebean,\
+$(eval $(call gb_Library_use_libraries,officebean,\
jawt \
))
@@ -63,7 +63,7 @@ $(eval $(call gb_Library_add_ldflags,officebean,\
endif
-$(eval $(call gb_Library_add_linked_libs,officebean,\
+$(eval $(call gb_Library_use_libraries,officebean,\
$(gb_STDLIBS) \
))
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index b78a9b4..8e7a441 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-cache))
-$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-cache,\
+$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-cache,\
sal \
$(gb_STDLIBS) \
))
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index 4b6cc3c..57036ed 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -28,7 +28,7 @@
$(eval $(call gb_CppunitTest_CppunitTest,binaryurp_test-unmarshal))
-$(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\
+$(eval $(call gb_CppunitTest_use_libraries,binaryurp_test-unmarshal,\
cppu \
cppuhelper \
sal \
@@ -36,11 +36,11 @@ $(eval $(call gb_CppunitTest_add_linked_libs,binaryurp_test-unmarshal,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_CppunitTest_add_library_objects,binaryurp_test-unmarshal,\
+$(eval $(call gb_CppunitTest_use_library_objects,binaryurp_test-unmarshal,\
binaryurp \
))
-$(eval $(call gb_CppunitTest_add_api,binaryurp_test-unmarshal,\
+$(eval $(call gb_CppunitTest_use_api,binaryurp_test-unmarshal,\
udkapi \
))
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index c86febe..f0b5173 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -30,12 +30,12 @@ $(eval $(call gb_Library_Library,binaryurp))
$(eval $(call gb_Library_set_componentfile,binaryurp,binaryurp/source/binaryurp))
-$(eval $(call gb_Library_add_api,binaryurp,\
+$(eval $(call gb_Library_use_api,binaryurp,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,binaryurp,\
+$(eval $(call gb_Library_use_libraries,binaryurp,\
cppu \
cppuhelper \
sal \
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index 8e4f43d..d7d09e6 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,cairocanvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,cairocanvas,\
+$(eval $(call gb_Library_use_api,cairocanvas,\
offapi \
udkapi \
))
@@ -60,7 +60,7 @@ $(eval $(call gb_Library_add_cxxflags,cairocanvas,\
endif
-$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+$(eval $(call gb_Library_use_libraries,cairocanvas,\
sal \
cppu \
basegfx \
@@ -99,7 +99,7 @@ ifeq ($(OS),WNT)
$(eval $(call gb_Library_add_exception_objects,cairocanvas,\
canvas/source/cairo/cairo_win32_cairo \
))
-$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+$(eval $(call gb_Library_use_libraries,cairocanvas,\
gdi32 \
))
@@ -115,7 +115,7 @@ $(eval $(call gb_Library_add_exception_objects,cairocanvas,\
))
# freetype? fontconfig? -> test on Solaris
-$(eval $(call gb_Library_add_linked_libs,cairocanvas,\
+$(eval $(call gb_Library_use_libraries,cairocanvas,\
X11 \
Xrender \
))
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index bdd5a7e..cbdb02c 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -35,11 +35,11 @@ $(eval $(call gb_Library_set_include,canvasfactory,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,canvasfactory,\
+$(eval $(call gb_Library_use_api,canvasfactory,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,canvasfactory,\
+$(eval $(call gb_Library_use_libraries,canvasfactory,\
cppu \
cppuhelper \
sal \
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 5d121f5..4ab7ab8 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,canvastools,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,canvastools,\
+$(eval $(call gb_Library_use_api,canvastools,\
offapi \
udkapi \
))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,canvastools,\
-DCANVASTOOLS_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,canvastools,\
+$(eval $(call gb_Library_use_libraries,canvastools,\
basegfx \
comphelper \
cppu \
@@ -77,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,canvastools,\
canvas/source/tools/bitmap \
canvas/source/tools/image \
))
-$(eval $(call gb_Library_add_linked_libs,canvastools,\
+$(eval $(call gb_Library_use_libraries,canvastools,\
agg \
))
ifneq ($(strip $(AGG_VERSION)),)
@@ -88,7 +88,7 @@ endif
endif
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,canvastools,\
+$(eval $(call gb_Library_use_libraries,canvastools,\
winmm \
))
endif
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 0b1da59..ab9ec64 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,directx9canvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,directx9canvas,\
+$(eval $(call gb_Library_use_api,directx9canvas,\
offapi \
udkapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,directx9canvas,\
-UNOMINMAX \
))
-$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+$(eval $(call gb_Library_use_libraries,directx9canvas,\
cppu \
tk \
sal \
@@ -61,13 +61,13 @@ $(eval $(call gb_Library_add_linked_libs,directx9canvas,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_linked_libs,directx9canvas,\
+$(eval $(call gb_Library_use_libraries,directx9canvas,\
d3d9 \
gdi32 \
gdiplus \
))
-$(eval $(call gb_Library_add_linked_static_libs,directx9canvas,\
+$(eval $(call gb_Library_use_static_libraries,directx9canvas,\
directxcanvas \
))
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index 3be70e5..f3ddcb8 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,gdipluscanvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,gdipluscanvas,\
+$(eval $(call gb_Library_use_api,gdipluscanvas,\
offapi \
udkapi \
))
@@ -52,7 +52,7 @@ $(eval $(call gb_Library_add_defs,gdipluscanvas,\
))
endif
-$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
+$(eval $(call gb_Library_use_libraries,gdipluscanvas,\
cppu \
tk \
sal \
@@ -67,12 +67,12 @@ $(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_linked_libs,gdipluscanvas,\
+$(eval $(call gb_Library_use_libraries,gdipluscanvas,\
gdi32 \
gdiplus \
))
-$(eval $(call gb_Library_add_linked_static_libs,gdipluscanvas,\
+$(eval $(call gb_Library_use_static_libraries,gdipluscanvas,\
directxcanvas \
))
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index 24050ff..42260bf 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,nullcanvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,nullcanvas,\
+$(eval $(call gb_Library_use_api,nullcanvas,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,nullcanvas,\
+$(eval $(call gb_Library_use_libraries,nullcanvas,\
basegfx \
canvastools \
comphelper \
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index fb70e90..a76bfaf 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,simplecanvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,simplecanvas,\
+$(eval $(call gb_Library_use_api,simplecanvas,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,simplecanvas,\
+$(eval $(call gb_Library_use_libraries,simplecanvas,\
basegfx \
canvastools \
comphelper \
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 344f8da..43cdc96 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -35,12 +35,12 @@ $(eval $(call gb_Library_set_include,vclcanvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_Library_add_api,vclcanvas,\
+$(eval $(call gb_Library_use_api,vclcanvas,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,vclcanvas,\
+$(eval $(call gb_Library_use_libraries,vclcanvas,\
basegfx \
canvastools \
comphelper \
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index c4ff2b6..232429c 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -32,7 +32,7 @@ $(eval $(call gb_StaticLibrary_set_include,directxcanvas,\
-I$(SRCDIR)/canvas/inc \
))
-$(eval $(call gb_StaticLibrary_add_api,directxcanvas,\
+$(eval $(call gb_StaticLibrary_use_api,directxcanvas,\
offapi \
udkapi \
))
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index ad0315a..575c51f 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,chart2_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/chart2/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,chart2_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,chart2_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index d3b0f15..ea0b2c2 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartcontroller,\
-I$(SRCDIR)/chart2/source/inc \
))
-$(eval $(call gb_Library_add_api,chartcontroller,\
+$(eval $(call gb_Library_use_api,chartcontroller,\
offapi \
udkapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartcontroller,\
# CFLAGS+=-ftemplate-depth-128
# .ENDIF
-$(eval $(call gb_Library_add_linked_libs,chartcontroller,\
+$(eval $(call gb_Library_use_libraries,chartcontroller,\
basegfx \
charttools \
chartview \
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index c1de660..c1da053 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Library_set_include,chartmodel,\
-I$(SRCDIR)/chart2/source/inc \
))
-$(eval $(call gb_Library_add_api,chartmodel,\
+$(eval $(call gb_Library_use_api,chartmodel,\
offapi \
udkapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_api,chartmodel,\
# CFLAGS+=-ftemplate-depth-128
# .ENDIF
-$(eval $(call gb_Library_add_linked_libs,chartmodel,\
+$(eval $(call gb_Library_use_libraries,chartmodel,\
charttools \
comphelper \
cppu \
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index 7b2de1e..0c55770 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_add_defs,charttools,\
-DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
))
-$(eval $(call gb_Library_add_api,charttools,\
+$(eval $(call gb_Library_use_api,charttools,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,charttools,\
+$(eval $(call gb_Library_use_libraries,charttools,\
basegfx \
comphelper \
cppu \
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 974df61..ab3952e 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -37,12 +37,12 @@ $(eval $(call gb_Library_add_defs,chartview,\
-DOOO_DLLIMPLEMENTATION_CHARTVIEW \
))
-$(eval $(call gb_Library_add_api,chartview,\
+$(eval $(call gb_Library_use_api,chartview,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,chartview,\
+$(eval $(call gb_Library_use_libraries,chartview,\
basegfx \
charttools \
comphelper \
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 2cc9520..eac5715 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -49,12 +49,12 @@ $(eval $(call gb_Library_add_defs,clucene,\
))
# clucene does not depend on sal nor needs uwinapi here
-$(eval $(call gb_Library_add_linked_libs,clucene,\
+$(eval $(call gb_Library_use_libraries,clucene,\
$(filter-out uwinapi,$(gb_STDLIBS)) \
))
ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,clucene,\
+$(eval $(call gb_Library_use_libraries,clucene,\
dl \
m \
pthread \
diff --git a/comphelper/CppunitTest_comphelper_test.mk b/comphelper/CppunitTest_comphelper_test.mk
index b36ba1d..942539b 100644
--- a/comphelper/CppunitTest_comphelper_test.mk
+++ b/comphelper/CppunitTest_comphelper_test.mk
@@ -31,12 +31,12 @@ $(eval $(call gb_CppunitTest_add_exception_objects,comphelper_test, \
comphelper/qa/string/test_string \
))
-$(eval $(call gb_CppunitTest_add_api,comphelper_test, \
+$(eval $(call gb_CppunitTest_use_api,comphelper_test, \
udkapi \
offapi \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,comphelper_test, \
+$(eval $(call gb_CppunitTest_use_libraries,comphelper_test, \
comphelper \
cppuhelper \
cppu \
diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk
index 090ed60..78c26a4 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,comphelper_complex,\
comphelper/qa/complex/comphelper/SequenceOutputStreamUnitTest \
))
-$(eval $(call gb_JunitTest_add_jars,comphelper_complex,\
+$(eval $(call gb_JunitTest_use_jars,comphelper_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index 05ae0ab..7627a9c 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,comphelper,\
-DCOMPHELPER_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,comphelper,\
+$(eval $(call gb_Library_use_libraries,comphelper,\
cppu \
cppuhelper \
sal \
@@ -50,7 +50,7 @@ $(eval $(call gb_Library_add_linked_libs,comphelper,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_api,comphelper,\
+$(eval $(call gb_Library_use_api,comphelper,\
udkapi \
offapi \
))
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk
index e1abbb3..70b570c 100644
--- a/configmgr/JunitTest_configmgr_unoapi.mk
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,configmgr_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/configmgr/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,configmgr_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,configmgr_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/configmgr/Library_configmgr.mk b/configmgr/Library_configmgr.mk
index 2210871..13cbdd8 100644
--- a/configmgr/Library_configmgr.mk
+++ b/configmgr/Library_configmgr.mk
@@ -63,12 +63,12 @@ $(eval $(call gb_Library_add_exception_objects,configmgr, \
configmgr/source/xmldata \
))
-$(eval $(call gb_Library_add_api,configmgr, \
+$(eval $(call gb_Library_use_api,configmgr, \
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,configmgr, \
+$(eval $(call gb_Library_use_libraries,configmgr, \
comphelper \
cppu \
cppuhelper \
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 8e64760..ce2355b 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -36,7 +36,7 @@ $(eval $(call gb_Library_set_include,cppcanvas,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,cppcanvas,\
+$(eval $(call gb_Library_use_api,cppcanvas,\
offapi \
udkapi \
))
@@ -44,7 +44,7 @@ $(eval $(call gb_Library_add_defs,cppcanvas,\
-DCPPCANVAS_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,cppcanvas,\
+$(eval $(call gb_Library_use_libraries,cppcanvas,\
basegfx \
canvastools \
comphelper \
diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk
index 52e2387..f491344 100644
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_Library,mtfrenderer))
$(eval $(call gb_Library_set_componentfile,mtfrenderer,cppcanvas/source/uno/mtfrenderer))
-$(eval $(call gb_Library_add_linked_libs,mtfrenderer,\
+$(eval $(call gb_Library_use_libraries,mtfrenderer,\
sal \
cppu \
cppuhelper \
@@ -40,7 +40,7 @@ $(eval $(call gb_Library_add_linked_libs,mtfrenderer,\
$(gb_STDLIBS) \
))
-$(eval $(call gb_Library_add_api,mtfrenderer,\
+$(eval $(call gb_Library_use_api,mtfrenderer,\
offapi \
udkapi \
))
diff --git a/cppu/CppunitTest_cppu_qa_any.mk b/cppu/CppunitTest_cppu_qa_any.mk
index 28993ee..6263e7d 100644
--- a/cppu/CppunitTest_cppu_qa_any.mk
+++ b/cppu/CppunitTest_cppu_qa_any.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_any, \
cppu/qa/test_any \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_any, \
+$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_any, \
cppu \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/CppunitTest_cppu_qa_recursion.mk b/cppu/CppunitTest_cppu_qa_recursion.mk
index 7bf9868..1534e38 100644
--- a/cppu/CppunitTest_cppu_qa_recursion.mk
+++ b/cppu/CppunitTest_cppu_qa_recursion.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_recursion, \
cppu/qa/test_recursion \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_recursion, \
+$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_recursion, \
cppu \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/CppunitTest_cppu_qa_reference.mk b/cppu/CppunitTest_cppu_qa_reference.mk
index 279cce7..1dc96fe 100644
--- a/cppu/CppunitTest_cppu_qa_reference.mk
+++ b/cppu/CppunitTest_cppu_qa_reference.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_reference, \
cppu/qa/test_reference \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_reference, \
+$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_reference, \
cppu \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/CppunitTest_cppu_qa_unotype.mk b/cppu/CppunitTest_cppu_qa_unotype.mk
index 0a17bc2..bb1ac91 100644
--- a/cppu/CppunitTest_cppu_qa_unotype.mk
+++ b/cppu/CppunitTest_cppu_qa_unotype.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_qa_unotype, \
cppu/qa/test_unotype \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppu_qa_unotype, \
+$(eval $(call gb_CppunitTest_use_libraries,cppu_qa_unotype, \
cppu \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/CppunitTest_cppu_test_cppumaker.mk b/cppu/CppunitTest_cppu_test_cppumaker.mk
index 6ed2e7b..0c495c0 100644
--- a/cppu/CppunitTest_cppu_test_cppumaker.mk
+++ b/cppu/CppunitTest_cppu_test_cppumaker.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppu_test_cppumaker, \
cppu/qa/cppumaker/test_cppumaker \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppu_test_cppumaker, \
+$(eval $(call gb_CppunitTest_use_libraries,cppu_test_cppumaker, \
cppu \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/Library_affine_uno.mk b/cppu/Library_affine_uno.mk
index fd04b53..3318271 100644
--- a/cppu/Library_affine_uno.mk
+++ b/cppu/Library_affine_uno.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,affine_uno,\
-I$(SRCDIR)/cppu/inc \
))
-$(eval $(call gb_Library_add_api,affine_uno,\
+$(eval $(call gb_Library_use_api,affine_uno,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,affine_uno,\
+$(eval $(call gb_Library_use_libraries,affine_uno,\
purpenvhelper \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 4febd33..d1b527b 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Library_set_include,cppu,\
-I$(SRCDIR)/cppu/inc \
))
-$(eval $(call gb_Library_add_api,cppu,\
+$(eval $(call gb_Library_use_api,cppu,\
udkapi \
offapi \
))
@@ -46,7 +46,7 @@ $(eval $(call gb_Library_add_defs,cppu,\
-DCPPU_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,cppu,\
+$(eval $(call gb_Library_use_libraries,cppu,\
sal \
$(gb_STDLIBS) \
))
diff --git a/cppu/Library_log_uno.mk b/cppu/Library_log_uno.mk
index b07a766..582414d 100644
--- a/cppu/Library_log_uno.mk
+++ b/cppu/Library_log_uno.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,log_uno,\
-I$(SRCDIR)/cppu/inc \
))
-$(eval $(call gb_Library_add_api,log_uno,\
+$(eval $(call gb_Library_use_api,log_uno,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,log_uno,\
+$(eval $(call gb_Library_use_libraries,log_uno,\
cppu \
purpenvhelper \
sal \
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 5bac8e5..60d0485 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_add_defs,purpenvhelper,\
-DPURPENV_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_api,purpenvhelper,\
+$(eval $(call gb_Library_use_api,purpenvhelper,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,purpenvhelper,\
+$(eval $(call gb_Library_use_libraries,purpenvhelper,\
cppu \
sal \
$(gb_STDLIBS) \
diff --git a/cppu/Library_unsafe_uno.mk b/cppu/Library_unsafe_uno.mk
index 26d9a68..49724f5 100644
--- a/cppu/Library_unsafe_uno.mk
+++ b/cppu/Library_unsafe_uno.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,unsafe_uno,\
-I$(SRCDIR)/cppu/inc \
))
-$(eval $(call gb_Library_add_api,unsafe_uno,\
+$(eval $(call gb_Library_use_api,unsafe_uno,\
udkapi \
offapi \
))
-$(eval $(call gb_Library_add_linked_libs,unsafe_uno,\
+$(eval $(call gb_Library_use_libraries,unsafe_uno,\
purpenvhelper \
sal \
$(gb_STDLIBS) \
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
index 2006d98..3432a83 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
@@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_ifcontainer,\
cppuhelper/qa/ifcontainer/cppu_ifcontainer \
))
-$(eval $(call gb_CppunitTest_add_api,cppuhelper_cppu_ifcontainer,\
+$(eval $(call gb_CppunitTest_use_api,cppuhelper_cppu_ifcontainer,\
udkapi \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_ifcontainer,\
+$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_ifcontainer,\
cppu \
cppuhelper \
sal \
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
index ceaec25..658afbc 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_cppu_unourl,\
cppuhelper/qa/unourl/cppu_unourl \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_cppu_unourl,\
+$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_cppu_unourl,\
cppu \
cppuhelper \
sal \
diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
index eaea97b..455ea6d 100644
--- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
@@ -31,11 +31,11 @@ $(eval $(call gb_CppunitTest_add_exception_objects,cppuhelper_qa_weak,\
cppuhelper/qa/weak/test_weak \
))
-$(eval $(call gb_CppunitTest_add_api,cppuhelper_qa_weak,\
+$(eval $(call gb_CppunitTest_use_api,cppuhelper_qa_weak,\
udkapi \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,cppuhelper_qa_weak,\
+$(eval $(call gb_CppunitTest_use_libraries,cppuhelper_qa_weak,\
cppu \
cppuhelper \
sal \
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index 2fa6d1a..3724459 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -41,7 +41,7 @@ $(eval $(call gb_Library_add_defs,cppuhelper,\
-DCPPUHELPER_DLLIMPLEMENTATION \
))
-$(eval $(call gb_Library_add_linked_libs,cppuhelper,\
+$(eval $(call gb_Library_use_libraries,cppuhelper,\
cppu \
sal \
salhelper \
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 6df0d5b..1251306 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -40,12 +40,12 @@ $(eval $(call gb_Library_add_defs,cui,\
$(if $(filter TRUE,$(ENABLE_KDE4)),-DENABLE_KDE4) \
))
-$(eval $(call gb_Library_add_api,cui,\
+$(eval $(call gb_Library_use_api,cui,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,cui,\
+$(eval $(call gb_Library_use_libraries,cui,\
avmedia \
basegfx \
comphelper \
@@ -78,7 +78,7 @@ $(eval $(call gb_Library_use_externals,cui,\
))
ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,cui,\
+$(eval $(call gb_Library_use_libraries,cui,\
advapi32 \
shlwapi \
))
diff --git a/dbaccess/CppunitTest_dbaccess_macros_test.mk b/dbaccess/CppunitTest_dbaccess_macros_test.mk
index de72fdf..9512946 100644
--- a/dbaccess/CppunitTest_dbaccess_macros_test.mk
+++ b/dbaccess/CppunitTest_dbaccess_macros_test.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_CppunitTest_add_exception_objects,dbaccess_macros_test, \
dbaccess/qa/extras/macros-test \
))
-$(eval $(call gb_CppunitTest_add_linked_libs,dbaccess_macros_test, \
+$(eval $(call gb_CppunitTest_use_libraries,dbaccess_macros_test, \
avmedia \
basegfx \
comphelper \
@@ -77,7 +77,7 @@ $(eval $(call gb_CppunitTest_set_include,dbaccess_macros_test,\
$$(INCLUDE) \
))
-$(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\
+$(eval $(call gb_CppunitTest_use_api,dbaccess_macros_test,\
offapi \
oovbaapi \
udkapi \
@@ -85,12 +85,12 @@ $(eval $(call gb_CppunitTest_add_api,dbaccess_macros_test,\
$(eval $(call gb_CppunitTest_uses_ure,dbaccess_macros_test))
-$(eval $(call gb_CppunitTest_add_type_rdbs,dbaccess_macros_test,\
+$(eval $(call gb_CppunitTest_use_type_rdbs,dbaccess_macros_test,\
oovbaapi \
types \
))
-$(eval $(call gb_CppunitTest_add_components,dbaccess_macros_test,\
+$(eval $(call gb_CppunitTest_use_components,dbaccess_macros_test,\
basic/util/sb \
comphelper/util/comphelp \
configmgr/source/configmgr \
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index 60017df..b81dc73 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Executable_set_include,odbcconfig,\
-I$(SRCDIR)/dbaccess/inc \
))
-$(eval $(call gb_Library_add_api,odbcconfig,\
+$(eval $(call gb_Library_use_api,odbcconfig,\
offapi \
udkapi \
))
-$(eval $(call gb_Executable_add_linked_libs,odbcconfig,\
+$(eval $(call gb_Executable_use_libraries,odbcconfig,\
$(gb_STDLIBS) \
))
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index 8606bfe..ad39394 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -54,7 +54,7 @@ $(eval $(call gb_JunitTest_add_sourcefiles,dbaccess_complex,\
dbaccess/qa/complex/dbaccess/TestCase \
))
-$(eval $(call gb_JunitTest_add_jars,dbaccess_complex,\
+$(eval $(call gb_JunitTest_use_jars,dbaccess_complex,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index d999518..369b66f 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_JunitTest_set_defs,dbaccess_unoapi,\
-Dorg.openoffice.test.arg.tdoc=$(SRCDIR)/dbaccess/qa/unoapi/testdocuments \
))
-$(eval $(call gb_JunitTest_add_jars,dbaccess_unoapi,\
+$(eval $(call gb_JunitTest_use_jars,dbaccess_unoapi,\
$(OUTDIR)/bin/OOoRunner.jar \
$(OUTDIR)/bin/ridl.jar \
$(OUTDIR)/bin/test.jar \
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index 34100ce..ee7489d 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -42,12 +42,12 @@ $(eval $(call gb_Library_add_defs,dba,\
-DOOO_DLLIMPLEMENTATION_DBA \
))
-$(eval $(call gb_Library_add_api,dba,\
+$(eval $(call gb_Library_use_api,dba,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,dba,\
+$(eval $(call gb_Library_use_libraries,dba,\
comphelper \
cppu \
cppuhelper \
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index ea248db..093a2eb 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -32,12 +32,12 @@ $(eval $(call gb_Library_set_include,dbaxml,\
-I$(SRCDIR)/dbaccess/source/inc \
))
-$(eval $(call gb_Library_add_api,dbaxml,\
+$(eval $(call gb_Library_use_api,dbaxml,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,dbaxml,\
+$(eval $(call gb_Library_use_libraries,dbaxml,\
comphelper \
cppu \
cppuhelper \
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index ae690b2..8278207 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -36,12 +36,12 @@ $(eval $(call gb_Library_set_include,dbmm,\
-I$(SRCDIR)/dbaccess/inc \
))
-$(eval $(call gb_Library_add_api,dbmm,\
+$(eval $(call gb_Library_use_api,dbmm,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,dbmm,\
+$(eval $(call gb_Library_use_libraries,dbmm,\
comphelper \
cppu \
cppuhelper \
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 585ad94..727568e 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -35,7 +35,7 @@ $(eval $(call gb_Library_set_include,dbu,\
-I$(WORKDIR)/inc/dbaccess \
))
-$(eval $(call gb_Library_add_api,dbu,\
+$(eval $(call gb_Library_use_api,dbu,\
offapi \
udkapi \
))
@@ -51,7 +51,7 @@ $(eval $(call gb_Library_add_cxxflags,dbu,\
))
endif
-$(eval $(call gb_Library_add_linked_libs,dbu,\
+$(eval $(call gb_Library_use_libraries,dbu,\
comphelper \
cppu \
cppuhelper \
@@ -76,7 +76,7 @@ $(eval $(call gb_Library_add_linked_libs,dbu,\
))
ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_linked_libs,dbu,\
+$(eval $(call gb_Library_use_libraries,dbu,\
ole32 \
oleaut32 \
uuid \
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index 84fe364..a8f6aa2 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -38,7 +38,7 @@ $(eval $(call gb_Library_set_include,dbui,\
$$(INCLUDE) \
))
-$(eval $(call gb_Library_add_api,dbui,\
+$(eval $(call gb_Library_use_api,dbui,\
offapi \
udkapi \
))
@@ -65,7 +65,7 @@ $(eval $(call gb_Library_add_defs,dbui,\
-DDBACCESS_DLLIMPLEMENTATION\
))
-$(eval $(call gb_Library_add_linked_libs,dbui,\
+$(eval $(call gb_Library_use_libraries,dbui,\
comphelper \
cppuhelper \
cppu \
@@ -90,7 +90,7 @@ $(eval $(call gb_Library_add_linked_libs,dbui,\
$(gb_STDLIBS) \
))
ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_linked_libs,dbui,\
+$(eval $(call gb_Library_use_libraries,dbui,\
ole32 \
oleaut32 \
uuid \
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 7a13d56..d5d82ea 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -38,12 +38,12 @@ $(eval $(call gb_Library_set_include,sdbt,\
-I$(SRCDIR)/dbaccess/source/sdbtools/inc \
))
-$(eval $(call gb_Library_add_api,sdbt,\
+$(eval $(call gb_Library_use_api,sdbt,\
offapi \
udkapi \
))
-$(eval $(call gb_Library_add_linked_libs,sdbt,\
+$(eval $(call gb_Library_use_libraries,sdbt,\
comphelper \
cppu \
cppuhelper \
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index d7f4d73..96ed6f7 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -37,7 +37,7 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
$(LFS_CFLAGS) \
))
-$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
+$(eval $(call gb_Executable_use_libraries,crashrep_com,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index f1801e6..e3a766f 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,officeloader,\
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_add_linked_libs,officeloader,\
+$(eval $(call gb_Executable_use_libraries,officeloader,\
sal \
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index 9273b84..b8919d5 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,oosplash,\
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_add_linked_libs,oosplash,\
+$(eval $(call gb_Executable_use_libraries,oosplash,\
sal \
$(gb_STDLIBS) \
))
@@ -80,7 +80,7 @@ endif
ifeq ($(OS),SOLARIS)
-$(eval $(call gb_Executable_add_linked_libs,oosplash,\
+$(eval $(call gb_Executable_use_libraries,oosplash,\
-lsocket \
))
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 7da5066..b3fbde1 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_set_include,quickstart,\
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_add_linked_libs,quickstart,\
+$(eval $(call gb_Executable_use_libraries,quickstart,\
comdlg32 \
gdi32 \
ole32 \
@@ -44,7 +44,7 @@ $(eval $(call gb_Executable_add_linked_libs,quickstart,\
ifeq ($(COM),GCC)
-$(eval $(call gb_Executable_add_linked_libs,quickstart,\
+$(eval $(call gb_Executable_use_libraries,quickstart,\
uuid \
))
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index 098f8c2..375cba3 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sbase,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,sbase,\
+$(eval $(call gb_Executable_use_libraries,sbase,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 290e880..ce90099 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,scalc,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,scalc,\
+$(eval $(call gb_Executable_use_libraries,scalc,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 2e57495..4642445 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sdraw,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,sdraw,\
+$(eval $(call gb_Executable_use_libraries,sdraw,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 926ad57..c302643 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,simpress,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,simpress,\
+$(eval $(call gb_Executable_use_libraries,simpress,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index ed1b460..4c7c4af 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,smath,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,smath,\
+$(eval $(call gb_Executable_use_libraries,smath,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index e0c5891..59b9f08 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(sofficebin),\
-I$(SRCDIR)/desktop/source/inc \
))
-$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
+$(eval $(call gb_Executable_use_libraries,$(sofficebin),\
sal \
sofficeapp \
$(gb_STDLIBS) \
@@ -52,7 +52,7 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
ifeq ($(OS),WNT)
-$(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
+$(eval $(call gb_Executable_use_static_libraries,$(sofficebin),\
ooopathutils \
winextendloaderenv \
))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 9ca4d3a..18efbbd 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -29,14 +29,14 @@ $(eval $(call gb_Executable_Executable,soffice))
$(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
-$(eval $(call gb_Executable_add_linked_libs,soffice,\
+$(eval $(call gb_Executable_use_libraries,soffice,\
advapi32 \
shell32 \
shlwapi \
$(gb_STDLIBS) \
))
-$(eval $(call gb_Executable_add_linked_static_libs,soffice,\
+$(eval $(call gb_Executable_use_static_libraries,soffice,\
ooopathutils \
winextendloaderenv \
))
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 858bc7a..870cf7d 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,sweb,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,sweb,\
+$(eval $(call gb_Executable_use_libraries,sweb,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index f1e0d65..acd299b 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -33,7 +33,7 @@ $(eval $(call gb_Executable_add_defs,swriter,\
-DUNICODE \
))
-$(eval $(call gb_Executable_add_linked_libs,swriter,\
+$(eval $(call gb_Executable_use_libraries,swriter,\
$(gb_STDLIBS) \
))
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index bdb6342..40db3a0 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -31,7 +31,7 @@ $(eval $(call gb_Executable_set_include,unoinfo,\
$$(INCLUDE) \
))
-$(eval $(call gb_Executable_add_linked_static_libs,unoinfo,\
+$(eval $(call gb_Executable_use_static_libraries,unoinfo,\
ooopathutils \
))
diff --git a/desktop/Executable_unopkg.bin.mk b/desktop/Executable_unopkg.bin.mk
index c635c2b..cf22afd 100644
--- a/desktop/Executable_unopkg.bin.mk
+++ b/desktop/Executable_unopkg.bin.mk
@@ -40,7 +40,7 @@ $(eval $(call gb_Executable_set_include,$(unopkgbin),\
-I$(SRCDIR)/desktop/source/inc \
))
-$(eval $(call gb_Executable_add_linked_libs,$(unopkgbin),\
+$(eval $(call gb_Executable_use_libraries,$(unopkgbin),\
comphelper \
sal \
tl \
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index 74d957e..27611ea 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Executable_Executable,unopkg))
$(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
-$(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
+$(eval $(call gb_Executable_use_static_libraries,unopkg,\
ooopathutils \
winextendloaderenv \
))
diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk
index 7e455ef..3314c2e 100644
--- a/desktop/Library_deployment.mk
+++ b/desktop/Library_deployment.mk
@@ -34,12 +34,12 @@ $(eval $(call gb_Library_set_include,deployment,\
-I$(SRCDIR)/desktop/source/deployment/registry/inc \
))
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list