[Libreoffice-commits] .: 6 commits - accessibility/AllLangResTarget_acc.mk accessibility/Jar_uno_accessbridge.mk accessibility/Library_acc.mk accessibility/Library_java_uno_accessbridge.mk accessibility/Module_accessibility.mk animations/Library_animcore.mk autodoc/Executable_autodoc.mk autodoc/Module_autodoc.mk avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmedia.mk avmedia/Library_avmediaQuickTime.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 basic/CppunitTest_basic_coverage.mk basic/CppunitTest_basic_enable.mk basic/CppunitTest_basic_nested_struct.mk basic/Library_sb.mk binaryurp/CppunitTest_binaryurp_test-cache.mk binaryurp/CppunitTest_binaryurp_test-unmarshal.mk binaryurp/Library_binaryurp.mk boost/StaticLibrary_boostdatetime.mk boost/StaticLibrary_boostthread.mk boost/UnpackedTarball_boost.mk bridges/Library_cc50_solaris_ intel.mk bridges/Library_cc50_solaris_sparc.mk bridges/Library_cc5_solaris_sparc64.mk bridges/Library_gcc3_aix_powerpc.mk bridges/Library_gcc3_ios_arm.mk bridges/Library_gcc3_linux_alpha.mk bridges/Library_gcc3_linux_arm.mk bridges/Library_gcc3_linux_hppa.mk bridges/Library_gcc3_linux_ia64.mk bridges/Library_gcc3_linux_intel.mk bridges/Library_gcc3_linux_m68k.mk bridges/Library_gcc3_linux_mips.mk bridges/Library_gcc3_linux_powerpc64.mk bridges/Library_gcc3_linux_powerpc.mk bridges/Library_gcc3_linux_s390.mk bridges/Library_gcc3_linux_s390x.mk bridges/Library_gcc3_linux_sparc.mk bridges/Library_gcc3_linux_x86-64.mk bridges/Library_gcc3_macosx_intel.mk bridges/Library_gcc3_macosx_powerpc.mk bridges/Library_gcc3_macosx_x86-64.mk bridges/Library_gcc3_solaris_intel.mk bridges/Library_gcc3_solaris_sparc.mk bridges/Library_java_uno.mk bridges/Library_mingw_intel.mk bridges/Library_msvc_win32_intel.mk bridges/Library_msvc_win32_x86-64.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/Library_chartcontroller.mk chart2/Library_chartcore.mk codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/Module_codemaker.mk comphelper/Library_comphelper.mk configmgr/Library_configmgr.mk connectivity/CppunitTest_connectivity_ado.mk connectivity/CppunitTest_connectivity_mork.mk connectivity/Executable_mork_helper.mk connectivity/Library_calc.mk connectivity/Library_dbase.mk connectivity/Library_dbtools.mk connectivity/Library_evoab.mk connectivity/Library_file.mk connectivity/Library_flat.mk connectivity/Library_hsqldb.mk connectivity/Library_jdbc.mk connectivity/Library_mork.mk connectivity/Library_mozabdrv.mk connectivity/Library_mozab.mk connectivity/Library_mysql.mk connectivity/Library_odbcbase.mk con nectivity/Library_postgresql-sdbc-impl.mk connectivity/Library_sdbc2.mk cosv/Module_cosv.mk cppcanvas/Library_cppcanvas.mk cppcanvas/Library_mtfrenderer.mk cppu/CppunitTest_cppu_qa_any.mk cppu/CppunitTest_cppu_test_cppumaker.mk cppuhelper/InternalUnoApi_cppuhelper.mk cppuhelper/Library_cppuhelper.mk cppu/InternalUnoApi_cppu.mk cppu/Library_cppu.mk cppu/Library_log_uno.mk cpputools/Executable_sp2bv.mk cpputools/Executable_uno.mk cpputools/Module_cpputools.mk crashrep/Executable_crashrep.mk crashrep/Module_crashrep.mk ct2n/Module_ct2n.mk cui/Library_cui.mk dbaccess/Library_dba.mk dbaccess/Library_dbaxml.mk dbaccess/Library_dbmm.mk dbaccess/Library_dbu.mk dbaccess/Library_sdbt.mk desktop/Executable_crashrep.com.mk desktop/Executable_officeloader.mk desktop/Executable_oosplash.mk desktop/Executable_quickstart.mk desktop/Executable_unoinfo.mk desktop/Executable_unopkg.com.mk desktop/Library_deploymentgui.mk desktop/Library_deploymentmisc.mk desktop/Library_deployment.mk desktop/L ibrary_migrationoo2.mk desktop/Library_migrationoo3.mk desktop/Library_offacc.mk desktop/Library_sofficeapp.mk desktop/Library_spl.mk desktop/Library_unopkgapp.mk desktop/Package_soffice_sh.mk desktop/StaticLibrary_winextendloaderenv.mk desktop/StaticLibrary_winlauncher.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 editeng/CppunitTest_editeng_borderline.mk editeng/CppunitTest_editeng_core.mk editeng/CppunitTest_editeng_lookuptree.mk editeng/Library_editeng.mk embeddedobj/Library_embobj.mk embeddedobj/Library_emboleobj.mk embedserv/Library_emser.mk extensions/AllLangResTarget_abp.mk extensions/AllLangResTarget_bib.mk extensions/AllLangResTarget_dbp.mk extensions/AllLangResTarget_pcr.mk extensions/AllLangResTarget_scn.mk extensions/AllLangResTarget_updchk.mk extensions/AllLangResTarget_upd.mk extensions/Configuration_updchk.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_oleautobridge2.mk extensions/Library_oleautobridge.mk extensions/Library_OOoSpotlightImporter.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/Package_uiconfig.mk extensions/StaticLibrary_npsoenv.mk extensions/StaticLibrary_plugcon.mk extensions/WinResTarget_activex.mk extensions/WinResTarget_npsoplugin.mk extensions/Zip_mdibundle.mk fileaccess/Library_fileacc.mk filter/CppunitTest_filter_pict_test.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_test.mk filter/Executable_svg2odf.mk filter/Library_egi.mk filter/Library_eme.mk fi lter/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_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/Library_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_pdffilter.mk filter/Library_placeware.mk filter/Library_svgfilter.mk filter/Library_t602filter.mk filter/Library_textfd.mk filter/Library_xmlfa.mk filter/Library_xmlfd.mk filter/Library_xsltdlg.mk filter/Library_xsltfilter.mk forms/Library_frm.mk formula/Library_for.mk formula/Library_forui.mk fpicker/Library_fpicker.mk fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/Library_fps_office.mk framework/Library_fwe.mk framework/Library_fwi.mk f ramework/Library_fwk.mk framework/Library_fwl.mk framework/Library_fwm.mk helpcompiler/Executable_helpindexer.mk helpcompiler/Executable_helplinker.mk helpcompiler/Library_helplinker.mk helpcompiler/Module_helpcompiler.mk hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk hwpfilter/Library_hwp.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18nutil/Library_i18nutil.mk idlc/CustomTarget_parser_test.mk idlc/Executable_idlc.mk idlc/Module_idlc.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 io/Module_io.mk ios/Executable_Viewer.mk javaunohelper/Jar_juh.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk javaunohelper/Module_javaunohelper.mk javaunohelper/Zip_juh.mk jurt/Jar_jurt.mk jurt/JunitTest_bridgefactory.mk jurt /JunitTest_connections.mk jurt/JunitTest_java.mk jurt/JunitTest_java_remote.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 jurt/Module_jurt.mk jurt/Package_jnilib.mk jurt/Zip_jurt.mk jvmaccess/Library_jvmaccess.mk jvmaccess/Module_jvmaccess.mk jvmaccess/Package_inc.mk jvmfwk/Executable_javaldx.mk jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk jvmfwk/Module_jvmfwk.mk jvmfwk/Package_inc.mk jvmfwk/Package_jreproperties.mk jvmfwk/Package_rcfiles.mk l10ntools/Executable_cfgex.mk l10ntools/Executable_helpex.mk l10ntools/Executable_localize.mk l10ntools/Executable_propex.mk l10ntools/Executable_renewpo.mk l10ntools/Executable_stringex.mk l10ntools/Executable_transex3.mk l10ntools/Executable_treex.mk l10ntools/Executable_ulfex.mk l10ntools/Executable_xrmex.mk l10ntools/Module_l10ntools.mk liborcus/ExternalProject_liborcus.mk librelogo/Zip_librelogo.mk libvisio/ExternalProject_libvis io.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_spell.mk lingucomponent/StaticLibrary_ulingu.mk linguistic/Library_lng.mk lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk lotuswordpro/Library_lwpft.mk mysqlcppconn/mysql_config.pmk mysqlc/source o3tl/CppunitTest_o3tl_tests.mk oox/Library_oox.mk package/Library_package2.mk package/Library_xstor.mk padmin/Executable_spadmin.bin.mk padmin/Library_spa.mk pyuno/Executable_python_wrapper.mk pyuno/Library_pythonloader.mk pyuno/Library_pyuno.mk pyuno/Library_pyuno_wrapper.mk pyuno/Module_pyuno.mk readlicense_oo/Module_readlicense_oo.mk registry/Executable_regcompare.mk registry/Executable_regmerge.mk registry/Executable_regview.mk registry/Library_reg.mk registry/Module_registry.mk reportdesign/Library_rpt.mk reportdesign/Library_rptui.mk reportdesign/Library_rptxml.mk RepositoryExternal.mk ridljar/Jar_ridl.mk ridljar/Jar_unoloader.mk ridljar/JunitTest_typedesc.mk ridljar/JunitTe st_uno.mk ridljar/JunitTest_util.mk ridljar/Module_ridljar.mk ridljar/Zip_ridl.mk ridljar/Zip_unoloader.mk rsc/Executable_rsc.mk sal/CppunitTest_sal_checkapi.mk sal/CppunitTest_sal_osl_file.mk sal/CppunitTest_sal_osl_setthreadname.mk sal/Executable_cppunittester.mk salhelper/CppunitTest_salhelper_checkapi.mk salhelper/CppunitTest_salhelper_testapi.mk sal/Library_sal_textenc.mk sax/Library_fastsax.mk sax/Library_sax.mk scaddins/InternalUnoApi_scaddins.mk scaddins/Library_analysis.mk scaddins/Library_date.mk scaddins/Library_pricing.mk sccomp/Library_solver.mk sc/CppunitTest_sc_annotationobj.mk sc/CppunitTest_sc_annotationshapeobj.mk sc/CppunitTest_sc_annotationsobj.mk sc/CppunitTest_sc_cellrangeobj.mk sc/CppunitTest_sc_databaserangeobj.mk sc/CppunitTest_sc_datapilotfieldobj.mk sc/CppunitTest_sc_datapilottableobj.mk sc/CppunitTest_sc_editfieldobj_cell.mk sc/CppunitTest_sc_editfieldobj_header.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_s c_modelobj.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_namedrangesobj.mk sc/CppunitTest_sc_outlineobj.mk sc/CppunitTest_sc_rangelst_test.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tablesheetsobj.mk sc/CppunitTest_sc_ucalc.mk sc/Library_scd.mk sc/Library_scfilt.mk sc/Library_sc.mk sc/Library_scui.mk sc/Library_vbaobj.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 sdext/Configuration_minimizer.mk sdext/CppunitTest_pdfimport.mk sdext/Executable_pdf2xml.mk sdext/Executable_pdfunzip.mk sdext/Executable_xpdfimport.mk sdext/Extension_minimizer.mk sdext/Library_minimizer.mk sdext/Library_pdfimport.mk sdext/Library_presenter .mk sdext/Module_sdext.mk sdext/Rdb_minimizer.mk sdext/StaticLibrary_pdfimport_s.mk sd/Library_sdd.mk sd/Library_sdfilt.mk sd/Library_sd.mk sd/Library_sdui.mk sfx2/CppunitTest_sfx2_metadatable.mk sfx2/Library_qstart.mk sfx2/Library_sfx.mk shell/Library_desktopbe.mk shell/Library_gconfbe.mk shell/Library_kde4be.mk shell/Library_kdebe.mk shell/Library_losessioninstall.mk shell/Library_macbe.mk shell/Library_tdebe.mk slideshow/Library_OGLTrans.mk slideshow/Library_slideshow.mk smoketest/CppunitTest_smoketest.mk smoketest/Library_smoketest.mk solenv/bin soltools/Executable_adjustvisibility.mk soltools/Executable_cpp.mk soltools/Executable_javadep.mk soltools/Executable_ldump4.mk soltools/Executable_makedepend.mk soltools/Module_soltools.mk sot/Library_sot.mk starmath/CppunitTest_starmath_qa_cppunit.mk starmath/Library_smd.mk starmath/Library_sm.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_proxyfac.mk stoc/Library_reflection.mk stoc/Library_stocservices.mk stoc/Module_stoc.mk store/Module_store.mk svgio/Library_svgio.mk svl/CppunitTest_svl_urihelper.mk svl/Library_fsstorage.mk svl/Library_svl.mk svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/Executable_langsupport.mk svtools/Library_hatchwindowfactory.mk svtools/Library_svt.mk svx/Executable_gengal.bin.mk svx/Library_svxcore.mk svx/Library_svx.mk svx/Library_textconversiondlgs.mk svx/Package_globlmn_hrc.mk sw/CppunitTest_sw_filters_test.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_subsequent_odfexport.mk sw/CppunitTest_sw_subsequent_odfimport.mk sw/CppunitTest_sw_subsequent_ooxmlexport.mk sw/CppunitTest_sw_subsequent_ooxmlimport.mk sw/CppunitTest_sw_subsequent_rtfexport.mk sw/CppunitTest_sw_subsequent_rtfimport.mk sw/CppunitTest_sw_subsequent_ww8export.mk sw/CppunitTest_sw_subsequent_ww8impo rt.mk sw/CppunitTest_sw_swdoc_test.mk sw/Library_msword.mk sw/Library_swd.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk test/Library_subsequenttest.mk test/Library_test.mk testtools/InternalUnoApi_bridgetest.mk testtools/Library_bridgetest.mk testtools/Library_constructors.mk testtools/Library_cppobj.mk testtools/Module_testtools.mk testtools/Rdb_uno_services.mk testtools/StaticLibrary_bridgetest.mk toolkit/Library_tk.mk tools/CppunitTest_tools_test.mk tools/Library_tl.mk ucbhelper/Library_ucbhelper.mk ucb/Library_ucb1.mk ucb/Library_ucpcmis1.mk ucb/Library_ucpdav1.mk ucb/Library_ucpext.mk ucb/Library_ucpfile1.mk ucb/Library_ucphier1.mk ucb/Library_ucppkg1.mk udm/Module_udm.mk UnoControls/Library_ctl.mk UnoControls/Module_UnoControls.mk unodevtools/Executable_skeletonmaker.mk unodevtools/Module_unodevtools.mk unoil/Jar_unoil.mk unoil/Module_unoil.mk unoil/Package_climaker.mk unoil/Package_clioootypesversion.mk unotest/Library_unobootstrapprotector.mk unotest/ Library_unoexceptionprotector.mk unotest/Library_unotest.mk unotools/Library_utl.mk unoxml/Library_unordf.mk unoxml/Library_unoxml.mk ure/Module_ure.mk ure/Package_distribution.mk ure/Package_uretest.mk ure/Rdb_ure.mk ure/Zip_uretest.mk uui/Library_uui.mk vbahelper/Library_msforms.mk vbahelper/Library_vbahelper.mk vcl/CppunitTest_vcl_filters_test.mk vcl/Executable_ui-previewer.mk vcl/Library_desktop_detector.mk vcl/Library_vcl.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk.mk vcl/Library_vclplug_kde4.mk vcl/Library_vclplug_kde.mk vcl/Library_vclplug_svp.mk vcl/Library_vclplug_tde.mk vcl/StaticLibrary_headless.mk vcl/Zip_osxres.mk wizards/Pyuno_commonwizards.mk wizards/Pyuno_fax.mk wizards/Pyuno_letter.mk writerfilter/CppunitTest_writerfilter_doctok.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/Library_writerfilter.mk writerperfect/Library_wpftwriter.mk writerperfect/StaticLibrary_writerperfect.mk xmlhelp/Library_tvhlp1.mk xmlhelp/Library_ucpchelp1.mk xmloff/Library_xof.mk xmloff/Library_xo.mk xmlreader/Library_xmlreader.mk xmlscript/Library_xmlscript.mk xmlsecurity/CppunitTest_qa_certext.mk xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_xmlsec.mk

• Previous message: [Libreoffice-commits] .: 3 commits - helpers/help_hid.lst source/text
• Next message: [Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - sc/source
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

 RepositoryExternal.mk                                      |    4 
 UnoControls/Library_ctl.mk                                 |    2 
 UnoControls/Module_UnoControls.mk                          |    2 
 accessibility/AllLangResTarget_acc.mk                      |    2 
 accessibility/Jar_uno_accessbridge.mk                      |    2 
 accessibility/Library_acc.mk                               |    4 
 accessibility/Library_java_uno_accessbridge.mk             |    4 
 accessibility/Module_accessibility.mk                      |    2 
 animations/Library_animcore.mk                             |    2 
 autodoc/Executable_autodoc.mk                              |    2 
 autodoc/Module_autodoc.mk                                  |    2 
 avmedia/Library_avmedia.mk                                 |    2 
 avmedia/Library_avmediaQuickTime.mk                        |    2 
 avmedia/Library_avmediagst.mk                              |    2 
 avmedia/Library_avmediagst_0_10.mk                         |    2 
 avmedia/Library_avmediawin.mk                              |    2 
 basctl/Library_basctl.mk                                   |    6 -
 basebmp/CppunitTest_basebmp.mk                             |    2 
 basebmp/Library_basebmp.mk                                 |    5 -
 basegfx/CppunitTest_basegfx.mk                             |    2 
 basegfx/Library_basegfx.mk                                 |    2 
 basic/CppunitTest_basic_coverage.mk                        |    2 
 basic/CppunitTest_basic_enable.mk                          |    2 
 basic/CppunitTest_basic_nested_struct.mk                   |    2 
 basic/Library_sb.mk                                        |    2 
 binaryurp/CppunitTest_binaryurp_test-cache.mk              |    2 
 binaryurp/CppunitTest_binaryurp_test-unmarshal.mk          |    2 
 binaryurp/Library_binaryurp.mk                             |    2 
 boost/StaticLibrary_boostdatetime.mk                       |    2 
 boost/StaticLibrary_boostthread.mk                         |    2 
 boost/UnpackedTarball_boost.mk                             |    4 
 bridges/Library_cc50_solaris_intel.mk                      |    2 
 bridges/Library_cc50_solaris_sparc.mk                      |    2 
 bridges/Library_cc5_solaris_sparc64.mk                     |    2 
 bridges/Library_gcc3_aix_powerpc.mk                        |    2 
 bridges/Library_gcc3_ios_arm.mk                            |    2 
 bridges/Library_gcc3_linux_alpha.mk                        |    2 
 bridges/Library_gcc3_linux_arm.mk                          |    2 
 bridges/Library_gcc3_linux_hppa.mk                         |    2 
 bridges/Library_gcc3_linux_ia64.mk                         |    2 
 bridges/Library_gcc3_linux_intel.mk                        |    2 
 bridges/Library_gcc3_linux_m68k.mk                         |    2 
 bridges/Library_gcc3_linux_mips.mk                         |    2 
 bridges/Library_gcc3_linux_powerpc.mk                      |    2 
 bridges/Library_gcc3_linux_powerpc64.mk                    |    2 
 bridges/Library_gcc3_linux_s390.mk                         |    2 
 bridges/Library_gcc3_linux_s390x.mk                        |    2 
 bridges/Library_gcc3_linux_sparc.mk                        |    2 
 bridges/Library_gcc3_linux_x86-64.mk                       |    2 
 bridges/Library_gcc3_macosx_intel.mk                       |    2 
 bridges/Library_gcc3_macosx_powerpc.mk                     |    2 
 bridges/Library_gcc3_macosx_x86-64.mk                      |    2 
 bridges/Library_gcc3_solaris_intel.mk                      |    2 
 bridges/Library_gcc3_solaris_sparc.mk                      |    2 
 bridges/Library_java_uno.mk                                |    2 
 bridges/Library_mingw_intel.mk                             |    2 
 bridges/Library_msvc_win32_intel.mk                        |    2 
 bridges/Library_msvc_win32_x86-64.mk                       |    2 
 canvas/Library_cairocanvas.mk                              |    1 
 canvas/Library_canvasfactory.mk                            |    2 
 canvas/Library_canvastools.mk                              |    2 
 canvas/Library_directx9canvas.mk                           |    2 
 canvas/Library_gdipluscanvas.mk                            |    2 
 canvas/Library_nullcanvas.mk                               |    2 
 canvas/Library_simplecanvas.mk                             |    2 
 canvas/Library_vclcanvas.mk                                |    2 
 canvas/StaticLibrary_directxcanvas.mk                      |    4 
 chart2/Library_chartcontroller.mk                          |    2 
 chart2/Library_chartcore.mk                                |    2 
 codemaker/Executable_cppumaker.mk                          |    2 
 codemaker/Executable_javamaker.mk                          |    2 
 codemaker/Module_codemaker.mk                              |    2 
 comphelper/Library_comphelper.mk                           |    2 
 configmgr/Library_configmgr.mk                             |    2 
 connectivity/CppunitTest_connectivity_ado.mk               |    2 
 connectivity/CppunitTest_connectivity_mork.mk              |    2 
 connectivity/Executable_mork_helper.mk                     |    2 
 connectivity/Library_calc.mk                               |    2 
 connectivity/Library_dbase.mk                              |    2 
 connectivity/Library_dbtools.mk                            |    2 
 connectivity/Library_evoab.mk                              |    1 
 connectivity/Library_file.mk                               |    2 
 connectivity/Library_flat.mk                               |    2 
 connectivity/Library_hsqldb.mk                             |    1 
 connectivity/Library_jdbc.mk                               |    2 
 connectivity/Library_mork.mk                               |    2 
 connectivity/Library_mozab.mk                              |    2 
 connectivity/Library_mozabdrv.mk                           |    1 
 connectivity/Library_mysql.mk                              |    2 
 connectivity/Library_odbcbase.mk                           |    5 -
 connectivity/Library_postgresql-sdbc-impl.mk               |    1 
 connectivity/Library_sdbc2.mk                              |    1 
 cosv/Module_cosv.mk                                        |    2 
 cppcanvas/Library_cppcanvas.mk                             |    2 
 cppcanvas/Library_mtfrenderer.mk                           |    2 
 cppu/CppunitTest_cppu_qa_any.mk                            |    2 
 cppu/CppunitTest_cppu_test_cppumaker.mk                    |    2 
 cppu/InternalUnoApi_cppu.mk                                |    2 
 cppu/Library_cppu.mk                                       |    2 
 cppu/Library_log_uno.mk                                    |    2 
 cppuhelper/InternalUnoApi_cppuhelper.mk                    |    2 
 cppuhelper/Library_cppuhelper.mk                           |    2 
 cpputools/Executable_sp2bv.mk                              |    2 
 cpputools/Executable_uno.mk                                |    2 
 cpputools/Module_cpputools.mk                              |    2 
 crashrep/Executable_crashrep.mk                            |    2 
 crashrep/Module_crashrep.mk                                |    8 -
 ct2n/Module_ct2n.mk                                        |    2 
 cui/Library_cui.mk                                         |    1 
 dbaccess/Library_dba.mk                                    |    2 
 dbaccess/Library_dbaxml.mk                                 |    2 
 dbaccess/Library_dbmm.mk                                   |    2 
 dbaccess/Library_dbu.mk                                    |    5 -
 dbaccess/Library_sdbt.mk                                   |    2 
 desktop/Executable_crashrep.com.mk                         |    4 
 desktop/Executable_officeloader.mk                         |    4 
 desktop/Executable_oosplash.mk                             |    4 
 desktop/Executable_quickstart.mk                           |    4 
 desktop/Executable_unoinfo.mk                              |    4 
 desktop/Executable_unopkg.com.mk                           |    4 
 desktop/Library_deployment.mk                              |    2 
 desktop/Library_deploymentgui.mk                           |    2 
 desktop/Library_deploymentmisc.mk                          |    2 
 desktop/Library_migrationoo2.mk                            |    4 
 desktop/Library_migrationoo3.mk                            |    4 
 desktop/Library_offacc.mk                                  |    4 
 desktop/Library_sofficeapp.mk                              |    2 
 desktop/Library_spl.mk                                     |    2 
 desktop/Library_unopkgapp.mk                               |    2 
 desktop/Package_soffice_sh.mk                              |    2 
 desktop/StaticLibrary_winextendloaderenv.mk                |    2 
 desktop/StaticLibrary_winlauncher.mk                       |    2 
 drawinglayer/Library_drawinglayer.mk                       |    5 -
 dtrans/Library_dnd.mk                                      |    4 
 dtrans/Library_dtrans.mk                                   |    4 
 dtrans/Library_ftransl.mk                                  |    4 
 dtrans/Library_mcnttype.mk                                 |    4 
 dtrans/Library_sysdtrans.mk                                |    4 
 editeng/CppunitTest_editeng_borderline.mk                  |    5 -
 editeng/CppunitTest_editeng_core.mk                        |    1 
 editeng/CppunitTest_editeng_lookuptree.mk                  |    4 
 editeng/Library_editeng.mk                                 |    1 
 embeddedobj/Library_embobj.mk                              |    2 
 embeddedobj/Library_emboleobj.mk                           |    2 
 embedserv/Library_emser.mk                                 |    2 
 extensions/AllLangResTarget_abp.mk                         |    2 
 extensions/AllLangResTarget_bib.mk                         |    2 
 extensions/AllLangResTarget_dbp.mk                         |    2 
 extensions/AllLangResTarget_pcr.mk                         |    2 
 extensions/AllLangResTarget_scn.mk                         |    2 
 extensions/AllLangResTarget_upd.mk                         |    2 
 extensions/AllLangResTarget_updchk.mk                      |    2 
 extensions/Configuration_updchk.mk                         |    2 
 extensions/Executable_nsplugin.mk                          |    4 
 extensions/Executable_pluginapp.bin.mk                     |    2 
 extensions/Library_OOoSpotlightImporter.mk                 |    2 
 extensions/Library_abp.mk                                  |    4 
 extensions/Library_bib.mk                                  |    4 
 extensions/Library_dbp.mk                                  |    4 
 extensions/Library_ldapbe2.mk                              |    2 
 extensions/Library_log.mk                                  |    4 
 extensions/Library_oleautobridge.mk                        |    4 
 extensions/Library_oleautobridge2.mk                       |    4 
 extensions/Library_pcr.mk                                  |    4 
 extensions/Library_pl.mk                                   |    7 +
 extensions/Library_res.mk                                  |    4 
 extensions/Library_scn.mk                                  |    3 
 extensions/Library_so_activex.mk                           |    2 
 extensions/Library_so_activex_x64.mk                       |    2 
 extensions/Library_updatecheckui.mk                        |    4 
 extensions/Library_updatefeed.mk                           |    2 
 extensions/Library_updchk.mk                               |    7 +
 extensions/Package_uiconfig.mk                             |    2 
 extensions/StaticLibrary_npsoenv.mk                        |    2 
 extensions/StaticLibrary_plugcon.mk                        |    7 +
 extensions/WinResTarget_activex.mk                         |    2 
 extensions/WinResTarget_npsoplugin.mk                      |    2 
 extensions/Zip_mdibundle.mk                                |    2 
 fileaccess/Library_fileacc.mk                              |    4 
 filter/CppunitTest_filter_pict_test.mk                     |    2 
 filter/CppunitTest_filter_tga_test.mk                      |    2 
 filter/CppunitTest_filter_tiff_test.mk                     |    2 
 filter/Executable_svg2odf.mk                               |    2 
 filter/Library_egi.mk                                      |    6 -
 filter/Library_eme.mk                                      |    6 -
 filter/Library_epb.mk                                      |    6 -
 filter/Library_epg.mk                                      |    6 -
 filter/Library_epp.mk                                      |    6 -
 filter/Library_eps.mk                                      |    6 -
 filter/Library_ept.mk                                      |    6 -
 filter/Library_era.mk                                      |    6 -
 filter/Library_eti.mk                                      |    6 -
 filter/Library_exp.mk                                      |    6 -
 filter/Library_filterconfig.mk                             |    2 
 filter/Library_flash.mk                                    |    9 --
 filter/Library_icd.mk                                      |    6 -
 filter/Library_icg.mk                                      |    6 -
 filter/Library_idx.mk                                      |    6 -
 filter/Library_ime.mk                                      |    6 -
 filter/Library_ipb.mk                                      |    6 -
 filter/Library_ipd.mk                                      |    6 -
 filter/Library_ips.mk                                      |    6 -
 filter/Library_ipt.mk                                      |    6 -
 filter/Library_ipx.mk                                      |    6 -
 filter/Library_ira.mk                                      |    6 -
 filter/Library_itg.mk                                      |    6 -
 filter/Library_iti.mk                                      |    6 -
 filter/Library_msfilter.mk                                 |    6 -
 filter/Library_pdffilter.mk                                |    2 
 filter/Library_placeware.mk                                |    4 
 filter/Library_svgfilter.mk                                |    5 -
 filter/Library_t602filter.mk                               |    4 
 filter/Library_textfd.mk                                   |    4 
 filter/Library_xmlfa.mk                                    |    6 -
 filter/Library_xmlfd.mk                                    |    4 
 filter/Library_xsltdlg.mk                                  |    2 
 filter/Library_xsltfilter.mk                               |    4 
 forms/Library_frm.mk                                       |    1 
 formula/Library_for.mk                                     |    2 
 formula/Library_forui.mk                                   |    2 
 fpicker/Library_fpicker.mk                                 |    2 
 fpicker/Library_fps.mk                                     |    2 
 fpicker/Library_fps_aqua.mk                                |    2 
 fpicker/Library_fps_office.mk                              |    2 
 framework/Library_fwe.mk                                   |    2 
 framework/Library_fwi.mk                                   |    2 
 framework/Library_fwk.mk                                   |    2 
 framework/Library_fwl.mk                                   |    2 
 framework/Library_fwm.mk                                   |    2 
 helpcompiler/Executable_helpindexer.mk                     |    2 
 helpcompiler/Executable_helplinker.mk                      |    3 
 helpcompiler/Library_helplinker.mk                         |    1 
 helpcompiler/Module_helpcompiler.mk                        |    2 
 hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk          |    2 
 hwpfilter/Library_hwp.mk                                   |    9 --
 i18npool/Executable_genconv_dict.mk                        |    4 
 i18npool/Executable_gendict.mk                             |    4 
 i18npool/Executable_genindex_data.mk                       |    4 
 i18npool/Executable_saxparser.mk                           |    4 
 i18npool/Library_i18npool.mk                               |    1 
 i18npool/Library_i18nsearch.mk                             |    4 
 i18nutil/Library_i18nutil.mk                               |    5 -
 idl/Executable_svidl.mk                                    |    2 
 idlc/CustomTarget_parser_test.mk                           |    4 
 idlc/Executable_idlc.mk                                    |    4 
 idlc/Module_idlc.mk                                        |    2 
 io/Library_acceptor.mk                                     |    4 
 io/Library_connector.mk                                    |    4 
 io/Library_streams.mk                                      |    4 
 io/Library_textinstream.mk                                 |    2 
 io/Library_textoutstream.mk                                |    2 
 io/Module_io.mk                                            |    2 
 ios/Executable_Viewer.mk                                   |    4 
 javaunohelper/Jar_juh.mk                                   |    2 
 javaunohelper/Library_juh.mk                               |    2 
 javaunohelper/Library_juhx.mk                              |    2 
 javaunohelper/Module_javaunohelper.mk                      |    2 
 javaunohelper/Zip_juh.mk                                   |    2 
 jurt/Jar_jurt.mk                                           |    2 
 jurt/JunitTest_bridgefactory.mk                            |    2 
 jurt/JunitTest_connections.mk                              |    2 
 jurt/JunitTest_java.mk                                     |    2 
 jurt/JunitTest_java_remote.mk                              |    2 
 jurt/JunitTest_remote.mk                                   |    2 
 jurt/JunitTest_uno.mk                                      |    2 
 jurt/JunitTest_urp.mk                                      |    2 
 jurt/JunitTest_util.mk                                     |    2 
 jurt/Library_jpipe.mk                                      |    2 
 jurt/Library_jpipx.mk                                      |    2 
 jurt/Module_jurt.mk                                        |    2 
 jurt/Package_jnilib.mk                                     |    2 
 jurt/Zip_jurt.mk                                           |    2 
 jvmaccess/Library_jvmaccess.mk                             |    2 
 jvmaccess/Module_jvmaccess.mk                              |    2 
 jvmaccess/Package_inc.mk                                   |    2 
 jvmfwk/Executable_javaldx.mk                               |    2 
 jvmfwk/Library_jvmfwk.mk                                   |    3 
 jvmfwk/Library_sunjavaplugin.mk                            |    3 
 jvmfwk/Module_jvmfwk.mk                                    |    2 
 jvmfwk/Package_inc.mk                                      |    2 
 jvmfwk/Package_jreproperties.mk                            |    2 
 jvmfwk/Package_rcfiles.mk                                  |    2 
 l10ntools/Executable_cfgex.mk                              |    5 -
 l10ntools/Executable_helpex.mk                             |   11 --
 l10ntools/Executable_localize.mk                           |    3 
 l10ntools/Executable_propex.mk                             |    1 
 l10ntools/Executable_renewpo.mk                            |    1 
 l10ntools/Executable_stringex.mk                           |    1 
 l10ntools/Executable_transex3.mk                           |    3 
 l10ntools/Executable_treex.mk                              |    1 
 l10ntools/Executable_ulfex.mk                              |    5 -
 l10ntools/Executable_xrmex.mk                              |    5 -
 l10ntools/Module_l10ntools.mk                              |    2 
 liborcus/ExternalProject_liborcus.mk                       |    8 -
 librelogo/Zip_librelogo.mk                                 |    2 
 libvisio/ExternalProject_libvisio.mk                       |    5 -
 lingucomponent/Library_hyphen.mk                           |    1 
 lingucomponent/Library_lnth.mk                             |    1 
 lingucomponent/Library_spell.mk                            |    1 
 lingucomponent/StaticLibrary_ulingu.mk                     |    1 
 linguistic/Library_lng.mk                                  |    1 
 lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk |    2 
 lotuswordpro/Library_lwpft.mk                              |    5 -
 mysqlc/source/makefile.mk                                  |    1 
 mysqlcppconn/mysql_config.pmk                              |    2 
 o3tl/CppunitTest_o3tl_tests.mk                             |    2 
 oox/Library_oox.mk                                         |    1 
 package/Library_package2.mk                                |    1 
 package/Library_xstor.mk                                   |    2 
 padmin/Executable_spadmin.bin.mk                           |    4 
 padmin/Library_spa.mk                                      |    2 
 pyuno/Executable_python_wrapper.mk                         |    2 
 pyuno/Library_pythonloader.mk                              |    2 
 pyuno/Library_pyuno.mk                                     |    3 
 pyuno/Library_pyuno_wrapper.mk                             |    2 
 pyuno/Module_pyuno.mk                                      |    2 
 readlicense_oo/Module_readlicense_oo.mk                    |    2 
 registry/Executable_regcompare.mk                          |    2 
 registry/Executable_regmerge.mk                            |    2 
 registry/Executable_regview.mk                             |    2 
 registry/Library_reg.mk                                    |    2 
 registry/Module_registry.mk                                |    2 
 reportdesign/Library_rpt.mk                                |    2 
 reportdesign/Library_rptui.mk                              |    2 
 reportdesign/Library_rptxml.mk                             |    2 
 ridljar/Jar_ridl.mk                                        |    2 
 ridljar/Jar_unoloader.mk                                   |    2 
 ridljar/JunitTest_typedesc.mk                              |    2 
 ridljar/JunitTest_uno.mk                                   |    2 
 ridljar/JunitTest_util.mk                                  |    2 
 ridljar/Module_ridljar.mk                                  |    2 
 ridljar/Zip_ridl.mk                                        |    2 
 ridljar/Zip_unoloader.mk                                   |    2 
 rsc/Executable_rsc.mk                                      |    2 
 sal/CppunitTest_sal_checkapi.mk                            |    2 
 sal/CppunitTest_sal_osl_file.mk                            |    2 
 sal/CppunitTest_sal_osl_setthreadname.mk                   |    2 
 sal/Executable_cppunittester.mk                            |    5 -
 sal/Library_sal_textenc.mk                                 |    2 
 salhelper/CppunitTest_salhelper_checkapi.mk                |    2 
 salhelper/CppunitTest_salhelper_testapi.mk                 |    2 
 sax/Library_fastsax.mk                                     |    1 
 sax/Library_sax.mk                                         |    2 
 sc/CppunitTest_sc_annotationobj.mk                         |    2 
 sc/CppunitTest_sc_annotationshapeobj.mk                    |    2 
 sc/CppunitTest_sc_annotationsobj.mk                        |    2 
 sc/CppunitTest_sc_cellrangeobj.mk                          |    2 
 sc/CppunitTest_sc_databaserangeobj.mk                      |    2 
 sc/CppunitTest_sc_datapilotfieldobj.mk                     |    2 
 sc/CppunitTest_sc_datapilottableobj.mk                     |    2 
 sc/CppunitTest_sc_editfieldobj_cell.mk                     |    2 
 sc/CppunitTest_sc_editfieldobj_header.mk                   |    2 
 sc/CppunitTest_sc_filters_test.mk                          |    1 
 sc/CppunitTest_sc_macros_test.mk                           |    2 
 sc/CppunitTest_sc_modelobj.mk                              |    2 
 sc/CppunitTest_sc_namedrangeobj.mk                         |    2 
 sc/CppunitTest_sc_namedrangesobj.mk                        |    2 
 sc/CppunitTest_sc_outlineobj.mk                            |    2 
 sc/CppunitTest_sc_rangelst_test.mk                         |    2 
 sc/CppunitTest_sc_subsequent_export_test.mk                |    1 
 sc/CppunitTest_sc_subsequent_filters_test.mk               |    1 
 sc/CppunitTest_sc_tablesheetobj.mk                         |    2 
 sc/CppunitTest_sc_tablesheetsobj.mk                        |    2 
 sc/CppunitTest_sc_ucalc.mk                                 |    4 
 sc/Library_sc.mk                                           |    1 
 sc/Library_scd.mk                                          |    2 
 sc/Library_scfilt.mk                                       |    5 -
 sc/Library_scui.mk                                         |    5 -
 sc/Library_vbaobj.mk                                       |    2 
 scaddins/InternalUnoApi_scaddins.mk                        |    2 
 scaddins/Library_analysis.mk                               |    2 
 scaddins/Library_date.mk                                   |    2 
 scaddins/Library_pricing.mk                                |    2 
 sccomp/Library_solver.mk                                   |    5 -
 scripting/Library_basprov.mk                               |    2 
 scripting/Library_dlgprov.mk                               |    2 
 scripting/Library_protocolhandler.mk                       |    2 
 scripting/Library_scriptframe.mk                           |    2 
 scripting/Library_stringresource.mk                        |    2 
 scripting/Library_vbaevents.mk                             |    2 
 sd/CppunitTest_sd_filters_test.mk                          |    2 
 sd/CppunitTest_sd_regression_test.mk                       |    2 
 sd/CppunitTest_sd_uimpress.mk                              |    1 
 sd/Library_sd.mk                                           |    5 -
 sd/Library_sdd.mk                                          |    2 
 sd/Library_sdfilt.mk                                       |    2 
 sd/Library_sdui.mk                                         |    2 
 sdext/Configuration_minimizer.mk                           |    2 
 sdext/CppunitTest_pdfimport.mk                             |    2 
 sdext/Executable_pdf2xml.mk                                |    2 
 sdext/Executable_pdfunzip.mk                               |    2 
 sdext/Executable_xpdfimport.mk                             |    2 
 sdext/Extension_minimizer.mk                               |    2 
 sdext/Library_minimizer.mk                                 |    2 
 sdext/Library_pdfimport.mk                                 |    3 
 sdext/Library_presenter.mk                                 |    2 
 sdext/Module_sdext.mk                                      |    2 
 sdext/Rdb_minimizer.mk                                     |    2 
 sdext/StaticLibrary_pdfimport_s.mk                         |    2 
 sfx2/CppunitTest_sfx2_metadatable.mk                       |    4 
 sfx2/Library_qstart.mk                                     |    1 
 sfx2/Library_sfx.mk                                        |    5 -
 shell/Library_desktopbe.mk                                 |    2 
 shell/Library_gconfbe.mk                                   |    1 
 shell/Library_kde4be.mk                                    |    1 
 shell/Library_kdebe.mk                                     |    1 
 shell/Library_losessioninstall.mk                          |    3 
 shell/Library_macbe.mk                                     |    2 
 shell/Library_tdebe.mk                                     |    1 
 slideshow/Library_OGLTrans.mk                              |    9 --
 slideshow/Library_slideshow.mk                             |    2 
 smoketest/CppunitTest_smoketest.mk                         |    2 
 smoketest/Library_smoketest.mk                             |    5 -
 solenv/bin/concat-deps.c                                   |   56 +++++--------
 soltools/Executable_adjustvisibility.mk                    |    2 
 soltools/Executable_cpp.mk                                 |    2 
 soltools/Executable_javadep.mk                             |    2 
 soltools/Executable_ldump4.mk                              |    2 
 soltools/Executable_makedepend.mk                          |    2 
 soltools/Module_soltools.mk                                |    2 
 sot/Library_sot.mk                                         |    4 
 starmath/CppunitTest_starmath_qa_cppunit.mk                |    2 
 starmath/Library_sm.mk                                     |    2 
 starmath/Library_smd.mk                                    |    2 
 stoc/Library_bootstrap.mk                                  |    4 
 stoc/Library_introspection.mk                              |    4 
 stoc/Library_invocadapt.mk                                 |    4 
 stoc/Library_invocation.mk                                 |    4 
 stoc/Library_javaloader.mk                                 |    2 
 stoc/Library_javavm.mk                                     |    4 
 stoc/Library_namingservice.mk                              |    4 
 stoc/Library_proxyfac.mk                                   |    2 
 stoc/Library_reflection.mk                                 |    4 
 stoc/Library_stocservices.mk                               |    2 
 stoc/Module_stoc.mk                                        |    2 
 store/Module_store.mk                                      |    2 
 svgio/Library_svgio.mk                                     |    2 
 svl/CppunitTest_svl_urihelper.mk                           |    2 
 svl/Library_fsstorage.mk                                   |    2 
 svl/Library_svl.mk                                         |    2 
 svtools/Executable_bmp.mk                                  |    2 
 svtools/Executable_bmpsum.mk                               |    2 
 svtools/Executable_g2g.mk                                  |    2 
 svtools/Executable_langsupport.mk                          |    2 
 svtools/Library_hatchwindowfactory.mk                      |    2 
 svtools/Library_svt.mk                                     |    1 
 svx/Executable_gengal.bin.mk                               |    4 
 svx/Library_svx.mk                                         |    1 
 svx/Library_svxcore.mk                                     |    5 -
 svx/Library_textconversiondlgs.mk                          |    2 
 svx/Package_globlmn_hrc.mk                                 |    2 
 sw/CppunitTest_sw_filters_test.mk                          |    7 -
 sw/CppunitTest_sw_macros_test.mk                           |    2 
 sw/CppunitTest_sw_subsequent_odfexport.mk                  |    1 
 sw/CppunitTest_sw_subsequent_odfimport.mk                  |    1 
 sw/CppunitTest_sw_subsequent_ooxmlexport.mk                |    1 
 sw/CppunitTest_sw_subsequent_ooxmlimport.mk                |    1 
 sw/CppunitTest_sw_subsequent_rtfexport.mk                  |    1 
 sw/CppunitTest_sw_subsequent_rtfimport.mk                  |    1 
 sw/CppunitTest_sw_subsequent_ww8export.mk                  |    1 
 sw/CppunitTest_sw_subsequent_ww8import.mk                  |    1 
 sw/CppunitTest_sw_swdoc_test.mk                            |    1 
 sw/Library_msword.mk                                       |    1 
 sw/Library_sw.mk                                           |    1 
 sw/Library_swd.mk                                          |    2 
 sw/Library_swui.mk                                         |    2 
 sw/Library_vbaswobj.mk                                     |    1 
 test/Library_subsequenttest.mk                             |    5 -
 test/Library_test.mk                                       |    4 
 testtools/InternalUnoApi_bridgetest.mk                     |    2 
 testtools/Library_bridgetest.mk                            |    4 
 testtools/Library_constructors.mk                          |    2 
 testtools/Library_cppobj.mk                                |    4 
 testtools/Module_testtools.mk                              |    2 
 testtools/Rdb_uno_services.mk                              |    2 
 testtools/StaticLibrary_bridgetest.mk                      |    2 
 toolkit/Library_tk.mk                                      |    2 
 tools/CppunitTest_tools_test.mk                            |    2 
 tools/Library_tl.mk                                        |    5 -
 ucb/Library_ucb1.mk                                        |    2 
 ucb/Library_ucpcmis1.mk                                    |    3 
 ucb/Library_ucpdav1.mk                                     |    1 
 ucb/Library_ucpext.mk                                      |    2 
 ucb/Library_ucpfile1.mk                                    |    2 
 ucb/Library_ucphier1.mk                                    |    2 
 ucb/Library_ucppkg1.mk                                     |    2 
 ucbhelper/Library_ucbhelper.mk                             |    2 
 udm/Module_udm.mk                                          |    2 
 unodevtools/Executable_skeletonmaker.mk                    |    4 
 unodevtools/Module_unodevtools.mk                          |    2 
 unoil/Jar_unoil.mk                                         |    2 
 unoil/Module_unoil.mk                                      |    2 
 unoil/Package_climaker.mk                                  |    2 
 unoil/Package_clioootypesversion.mk                        |    2 
 unotest/Library_unobootstrapprotector.mk                   |    1 
 unotest/Library_unoexceptionprotector.mk                   |    1 
 unotest/Library_unotest.mk                                 |    1 
 unotools/Library_utl.mk                                    |    2 
 unoxml/Library_unordf.mk                                   |    5 -
 unoxml/Library_unoxml.mk                                   |    9 --
 ure/Module_ure.mk                                          |    2 
 ure/Package_distribution.mk                                |    2 
 ure/Package_uretest.mk                                     |    2 
 ure/Rdb_ure.mk                                             |    2 
 ure/Zip_uretest.mk                                         |    2 
 uui/Library_uui.mk                                         |    2 
 vbahelper/Library_msforms.mk                               |    5 -
 vbahelper/Library_vbahelper.mk                             |    7 -
 vcl/CppunitTest_vcl_filters_test.mk                        |    2 
 vcl/Executable_ui-previewer.mk                             |    4 
 vcl/Library_desktop_detector.mk                            |    1 
 vcl/Library_vcl.mk                                         |    1 
 vcl/Library_vclplug_gen.mk                                 |    1 
 vcl/Library_vclplug_gtk.mk                                 |    1 
 vcl/Library_vclplug_gtk3.mk                                |    1 
 vcl/Library_vclplug_kde.mk                                 |    1 
 vcl/Library_vclplug_kde4.mk                                |    1 
 vcl/Library_vclplug_svp.mk                                 |    1 
 vcl/Library_vclplug_tde.mk                                 |    1 
 vcl/StaticLibrary_headless.mk                              |    2 
 vcl/Zip_osxres.mk                                          |    2 
 wizards/Pyuno_commonwizards.mk                             |    2 
 wizards/Pyuno_fax.mk                                       |    2 
 wizards/Pyuno_letter.mk                                    |    2 
 writerfilter/CppunitTest_writerfilter_doctok.mk            |    2 
 writerfilter/CppunitTest_writerfilter_rtftok.mk            |    2 
 writerfilter/Library_writerfilter.mk                       |    5 -
 writerperfect/Library_wpftwriter.mk                        |    1 
 writerperfect/StaticLibrary_writerperfect.mk               |    1 
 xmlhelp/Library_tvhlp1.mk                                  |    1 
 xmlhelp/Library_ucpchelp1.mk                               |    1 
 xmloff/Library_xo.mk                                       |    2 
 xmloff/Library_xof.mk                                      |    2 
 xmlreader/Library_xmlreader.mk                             |    2 
 xmlscript/Library_xmlscript.mk                             |    2 
 xmlsecurity/CppunitTest_qa_certext.mk                      |    4 
 xmlsecurity/Library_xmlsecurity.mk                         |    2 
 xmlsecurity/Library_xsec_xmlsec.mk                         |    1 
 538 files changed, 910 insertions(+), 542 deletions(-)

New commits:
commit 5a61e283780969ff45039d3e033d1bfaac314d95
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Jan 26 22:19:07 2013 +0100

    gbuild: fix silly "expandtabs" in makefile VIM modelines
    
    Change-Id: I54d8923ad315e8041fd3904da3a29f1a7a8c8b16

diff --git a/UnoControls/Library_ctl.mk b/UnoControls/Library_ctl.mk
index ee4e033..2283b19 100644
--- a/UnoControls/Library_ctl.mk
+++ b/UnoControls/Library_ctl.mk
@@ -59,4 +59,4 @@ $(eval $(call gb_Library_add_exception_objects,ctl,\
     UnoControls/source/controls/statusindicator \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/UnoControls/Module_UnoControls.mk b/UnoControls/Module_UnoControls.mk
index 6b7fac1..7353533 100644
--- a/UnoControls/Module_UnoControls.mk
+++ b/UnoControls/Module_UnoControls.mk
@@ -31,4 +31,4 @@ $(eval $(call gb_Module_add_targets,UnoControls,\
     Library_ctl \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/accessibility/AllLangResTarget_acc.mk b/accessibility/AllLangResTarget_acc.mk
index 9430b75..a889615 100644
--- a/accessibility/AllLangResTarget_acc.mk
+++ b/accessibility/AllLangResTarget_acc.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_SrsTarget_add_files,acc/res,\
     accessibility/source/helper/accessiblestrings.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/accessibility/Jar_uno_accessbridge.mk b/accessibility/Jar_uno_accessbridge.mk
index 0486750..b9f2960 100644
--- a/accessibility/Jar_uno_accessbridge.mk
+++ b/accessibility/Jar_uno_accessbridge.mk
@@ -95,4 +95,4 @@ $(eval $(call gb_Jar_add_generated_sourcefiles,java_uno_accessbridge,\
     CustomTarget/accessibility/bridge/org/openoffice/java/accessibility/Build \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index 2c1bda1..0188b08 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -124,4 +124,4 @@ $(eval $(call gb_Library_add_exception_objects,acc,\
     accessibility/source/standard/vclxaccessibletoolboxitem \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index b9eec59..68ef420 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -47,4 +47,4 @@ $(eval $(call gb_Library_add_exception_objects,java_uno_accessbridge,\
     accessibility/bridge/source/java/WindowsAccessBridgeAdapter \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/accessibility/Module_accessibility.mk b/accessibility/Module_accessibility.mk
index 47751e8..83175c9 100644
--- a/accessibility/Module_accessibility.mk
+++ b/accessibility/Module_accessibility.mk
@@ -43,4 +43,4 @@ $(eval $(call gb_Module_add_targets,accessibility,\
 endif
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/autodoc/Executable_autodoc.mk b/autodoc/Executable_autodoc.mk
index e35b427..8f7ff19 100644
--- a/autodoc/Executable_autodoc.mk
+++ b/autodoc/Executable_autodoc.mk
@@ -169,4 +169,4 @@ $(eval $(call gb_Executable_add_exception_objects,autodoc,\
     autodoc/source/ary/doc/d_node \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/autodoc/Module_autodoc.mk b/autodoc/Module_autodoc.mk
index 80d6ce6..1503426 100644
--- a/autodoc/Module_autodoc.mk
+++ b/autodoc/Module_autodoc.mk
@@ -16,4 +16,4 @@ $(eval $(call gb_Module_add_targets,autodoc,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index 2d87c9fe..2aed85d 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -67,4 +67,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,directxcanvas,\
 	canvas/source/directx/dx_vcltools \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/codemaker/Executable_cppumaker.mk b/codemaker/Executable_cppumaker.mk
index a508fd2..c7437b4 100644
--- a/codemaker/Executable_cppumaker.mk
+++ b/codemaker/Executable_cppumaker.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_Executable_add_cxxflags,cppumaker,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/codemaker/Executable_javamaker.mk b/codemaker/Executable_javamaker.mk
index a79a76e..3db6096 100644
--- a/codemaker/Executable_javamaker.mk
+++ b/codemaker/Executable_javamaker.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Executable_add_exception_objects,javamaker,\
     codemaker/source/javamaker/javatype \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 9a67e39..c6e98b8 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -39,4 +39,4 @@ $(eval $(call gb_Module_add_targets,codemaker,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/connectivity/Executable_mork_helper.mk b/connectivity/Executable_mork_helper.mk
index 27b8685..2c80a0a 100644
--- a/connectivity/Executable_mork_helper.mk
+++ b/connectivity/Executable_mork_helper.mk
@@ -27,4 +27,4 @@ $(eval $(call gb_Executable_add_exception_objects,mork_helper,\
     connectivity/source/drivers/mork/mork_helper \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/cosv/Module_cosv.mk b/cosv/Module_cosv.mk
index 333594a..9c9e242 100644
--- a/cosv/Module_cosv.mk
+++ b/cosv/Module_cosv.mk
@@ -17,4 +17,4 @@ $(eval $(call gb_Module_add_targets,cosv,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/cppu/InternalUnoApi_cppu.mk b/cppu/InternalUnoApi_cppu.mk
index b60e2b7..ec374b8 100644
--- a/cppu/InternalUnoApi_cppu.mk
+++ b/cppu/InternalUnoApi_cppu.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_InternalUnoApi_add_idlfiles,cppu,cppu/qa/cppumaker,\
     types \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/cppuhelper/InternalUnoApi_cppuhelper.mk b/cppuhelper/InternalUnoApi_cppuhelper.mk
index 0779595..c61b5b0 100644
--- a/cppuhelper/InternalUnoApi_cppuhelper.mk
+++ b/cppuhelper/InternalUnoApi_cppuhelper.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_InternalUnoApi_add_idlfiles,cppuhelper,cppuhelper/unotypes/cppu
     XExceptionThrower \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/cpputools/Executable_sp2bv.mk b/cpputools/Executable_sp2bv.mk
index 7b12f9a..94ea833 100644
--- a/cpputools/Executable_sp2bv.mk
+++ b/cpputools/Executable_sp2bv.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_Executable_add_exception_objects,sp2bv,\
     cpputools/source/sp2bv/sp2bv \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/cpputools/Executable_uno.mk b/cpputools/Executable_uno.mk
index 1825fbd..642b962 100644
--- a/cpputools/Executable_uno.mk
+++ b/cpputools/Executable_uno.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Executable_add_exception_objects,uno,\
     cpputools/source/unoexe/unoexe \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/cpputools/Module_cpputools.mk b/cpputools/Module_cpputools.mk
index 0a504da..64d4205 100644
--- a/cpputools/Module_cpputools.mk
+++ b/cpputools/Module_cpputools.mk
@@ -44,4 +44,4 @@ endif
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ct2n/Module_ct2n.mk b/ct2n/Module_ct2n.mk
index 189222d..acc9d5f 100644
--- a/ct2n/Module_ct2n.mk
+++ b/ct2n/Module_ct2n.mk
@@ -18,4 +18,4 @@ $(eval $(call gb_Module_add_targets,ConvertTextToNumber,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/desktop/Package_soffice_sh.mk b/desktop/Package_soffice_sh.mk
index 48a1f9c..d544db6 100644
--- a/desktop/Package_soffice_sh.mk
+++ b/desktop/Package_soffice_sh.mk
@@ -29,4 +29,4 @@ $(eval $(call gb_Package_Package,desktop_soffice_sh,$(call gb_CustomTarget_get_w
 
 $(eval $(call gb_Package_add_file,desktop_soffice_sh,bin/soffice,soffice.sh))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk
index 9662d67..aad9e80 100644
--- a/desktop/StaticLibrary_winextendloaderenv.mk
+++ b/desktop/StaticLibrary_winextendloaderenv.mk
@@ -31,4 +31,4 @@ $(eval $(call gb_StaticLibrary_add_noexception_objects,winextendloaderenv,\
     desktop/win32/source/extendloaderenvironment \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/desktop/StaticLibrary_winlauncher.mk b/desktop/StaticLibrary_winlauncher.mk
index 606d628..ae37c22 100644
--- a/desktop/StaticLibrary_winlauncher.mk
+++ b/desktop/StaticLibrary_winlauncher.mk
@@ -35,4 +35,4 @@ $(eval $(call gb_StaticLibrary_add_noexception_objects,winlauncher,\
     desktop/win32/source/applauncher/launcher \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk
index 6ea4ea3..1a0d660 100644
--- a/extensions/AllLangResTarget_abp.mk
+++ b/extensions/AllLangResTarget_abp.mk
@@ -49,4 +49,4 @@ $(eval $(call gb_SrsTarget_add_files,abp/res,\
 	extensions/source/abpilot/abspilot.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
index 4d5f8fa..d75cd05 100644
--- a/extensions/AllLangResTarget_bib.mk
+++ b/extensions/AllLangResTarget_bib.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_SrsTarget_add_files,bib/res,\
 	extensions/source/bibliography/toolbar.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk
index 1645177..a1f7405 100644
--- a/extensions/AllLangResTarget_dbp.mk
+++ b/extensions/AllLangResTarget_dbp.mk
@@ -51,4 +51,4 @@ $(eval $(call gb_SrsTarget_add_files,dbp/res,\
 	extensions/source/dbpilots/listcombopages.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk
index 87ce2c6..715a05f 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_SrsTarget_add_files,pcr/res,\
 	extensions/source/propctrlr/newdatatype.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk
index 8b8dde4..f2cfa03 100644
--- a/extensions/AllLangResTarget_scn.mk
+++ b/extensions/AllLangResTarget_scn.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_SrsTarget_add_files,scn/res,\
 	extensions/source/scanner/sanedlg.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_upd.mk b/extensions/AllLangResTarget_upd.mk
index 7c1190f..4f74309 100644
--- a/extensions/AllLangResTarget_upd.mk
+++ b/extensions/AllLangResTarget_upd.mk
@@ -38,4 +38,4 @@ $(eval $(call gb_SrsTarget_add_files,upd/res,\
 	extensions/source/update/check/updatehdl.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk
index 5cf8c77..bc741f31 100644
--- a/extensions/AllLangResTarget_updchk.mk
+++ b/extensions/AllLangResTarget_updchk.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_SrsTarget_add_nonlocalized_files,updchk/res,\
 	extensions/source/update/ui/updatecheckui.src \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk
index 0cd2104..f651866 100644
--- a/extensions/Configuration_updchk.mk
+++ b/extensions/Configuration_updchk.mk
@@ -45,4 +45,4 @@ $(eval $(call gb_Configuration_add_localized_datas,updchk,extensions/source/upda
 	org/openoffice/Office/Addons.xcu \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 9e833e9..82e49fc 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -91,4 +91,4 @@ $(eval $(call gb_Executable_use_system_win32_libs,nsplugin,\
 ))
 endif # WNT
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 8bfea65..e614e40 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.bin.mk
@@ -100,4 +100,4 @@ endif
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
index ef48cb3..af39f0a 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,OOoSpotlightImporter,\
 
 $(eval $(call gb_Library_use_external,OOoSpotlightImporter,zlib))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index 8aa4569..2ecbd0c 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -90,4 +90,4 @@ $(eval $(call gb_Library_use_libraries,abp,\
 	$(gb_UWINAPI) \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 320dbd9..599dbdc 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -78,4 +78,4 @@ $(eval $(call gb_Library_use_libraries,bib,\
 	$(gb_UWINAPI) \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 0c3ca37..25a7271 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -74,4 +74,4 @@ $(eval $(call gb_Library_use_libraries,dbp,\
 	$(gb_UWINAPI) \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 3b9c3414..f0c053d 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -79,4 +79,4 @@ $(eval $(call gb_Library_add_libs,ldapbe2,\
 ))
 endif # OS=FREEBSD
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 8dd0a6e..7c4c149 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -61,4 +61,4 @@ $(eval $(call gb_Library_use_libraries,log,\
 	$(gb_UWINAPI) \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 7aec0c2..32467f3 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -83,4 +83,4 @@ $(eval $(call gb_Library_add_exception_objects,oleautobridge,\
 	extensions/source/ole/windata \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_oleautobridge2.mk b/extensions/Library_oleautobridge2.mk
index 7a609f8..53eac9f 100644
--- a/extensions/Library_oleautobridge2.mk
+++ b/extensions/Library_oleautobridge2.mk
@@ -91,4 +91,4 @@ $(eval $(call gb_Library_add_generated_exception_objects,oleautobridge2,\
 	CustomTarget/extensions/source/ole/windata \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index 1502ce1e..85e7c04 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -119,4 +119,4 @@ $(eval $(call gb_Library_add_exception_objects,pcr,\
 	extensions/source/propctrlr/xsdvalidationpropertyhandler \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 9d88546..e39c0cd 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -149,4 +149,4 @@ $(eval $(call gb_Library_add_exception_objects,pl,\
 	extensions/source/plugin/base/xplugin \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 8dd2064..e713a55 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_Library_add_exception_objects,res,\
 	extensions/source/resource/resourceservices \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index aec8e25..26d6f44 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -76,4 +76,4 @@ endif
 endif
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index d618127..603a79c 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -75,4 +75,4 @@ $(eval $(call gb_Library_add_libs,so_activex,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 132f7f0..c4f9546 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -78,4 +78,4 @@ $(eval $(call gb_Library_add_libs,so_activex_x64,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 6232392..04ce3e5 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -51,4 +51,4 @@ $(eval $(call gb_Library_add_exception_objects,updatecheckui,\
 	extensions/source/update/ui/updatecheckui \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index 354834d..7730a00 100644
--- a/extensions/Library_updatefeed.mk
+++ b/extensions/Library_updatefeed.mk
@@ -42,4 +42,4 @@ $(eval $(call gb_Library_add_exception_objects,updatefeed,\
 	extensions/source/update/feed/updatefeed \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index 182f7f5..119feda 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -74,4 +74,4 @@ $(eval $(call gb_Library_add_exception_objects,updchk,\
 	extensions/source/update/check/updateprotocol \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Package_uiconfig.mk b/extensions/Package_uiconfig.mk
index 33e63b2..cf5a182 100644
--- a/extensions/Package_uiconfig.mk
+++ b/extensions/Package_uiconfig.mk
@@ -32,4 +32,4 @@ $(eval $(call gb_Package_Package,extensions_uiconfig,$(SRCDIR)/extensions/source
 
 $(eval $(call gb_Package_add_file,extensions_uiconfig,xml/uiconfig/modules/sbibliography/menubar/menubar.xml,menubar.xml))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk
index e0383da..96c3ce3 100644
--- a/extensions/StaticLibrary_npsoenv.mk
+++ b/extensions/StaticLibrary_npsoenv.mk
@@ -35,4 +35,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,npsoenv,\
 	extensions/source/nsplugin/source/so_env \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 4779f41..9930c7b 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -83,5 +83,5 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,plugcon,\
 	extensions/source/plugin/unx/plugcon \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
 
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index 4e46d0e..e7c87d9 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -47,4 +47,4 @@ $(eval $(call gb_WinResTarget_add_defs,activex_res,\
 	-DSO_ACTIVEX_TLB_DIR=$(subst /,\\,$(subst $(SRCDIR),../../..,$(WORKDIR)/CustomTarget/extensions/source/activex/idl)) \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk
index d6b1e95..9a8b5d4 100644
--- a/extensions/WinResTarget_npsoplugin.mk
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -32,4 +32,4 @@ $(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res))
 
 $(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/extensions/Zip_mdibundle.mk b/extensions/Zip_mdibundle.mk
index 0d1619f..1b63eac 100644
--- a/extensions/Zip_mdibundle.mk
+++ b/extensions/Zip_mdibundle.mk
@@ -35,4 +35,4 @@ $(eval $(call gb_Zip_add_file,mdibundle,Info.plist,$(SRCDIR)/extensions/source/m
 $(eval $(call gb_Zip_add_file,mdibundle,en.lproj/schema.strings,$(SRCDIR)/extensions/source/macosx/spotlight/mdimporter/en.lproj/schema.strings))
 $(eval $(call gb_Zip_add_file,mdibundle,MacOS/OOoSpotlightImporter,$(OUTDIR)/lib/libOOoSpotlightImporter.dylib))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/helpcompiler/Executable_helpindexer.mk b/helpcompiler/Executable_helpindexer.mk
index 6c3839c..08faae7 100644
--- a/helpcompiler/Executable_helpindexer.mk
+++ b/helpcompiler/Executable_helpindexer.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Executable_add_exception_objects,HelpIndexer,\
     helpcompiler/source/HelpIndexer_main \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/helpcompiler/Executable_helplinker.mk b/helpcompiler/Executable_helplinker.mk
index 0068dd9..1ab99a3 100644
--- a/helpcompiler/Executable_helplinker.mk
+++ b/helpcompiler/Executable_helplinker.mk
@@ -47,4 +47,4 @@ $(eval $(call gb_Executable_add_exception_objects,HelpLinker,\
     helpcompiler/source/HelpLinker_main \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/helpcompiler/Module_helpcompiler.mk b/helpcompiler/Module_helpcompiler.mk
index f047039..d6ec065 100644
--- a/helpcompiler/Module_helpcompiler.mk
+++ b/helpcompiler/Module_helpcompiler.mk
@@ -16,4 +16,4 @@ $(eval $(call gb_Module_add_targets,helpcompiler,\
     Package_inc \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/idlc/Executable_idlc.mk b/idlc/Executable_idlc.mk
index 71971ba..fc40364 100644
--- a/idlc/Executable_idlc.mk
+++ b/idlc/Executable_idlc.mk
@@ -79,4 +79,4 @@ $(eval $(call gb_Executable_add_exception_objects,idlc,\
     idlc/source/astservice \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/idlc/Module_idlc.mk b/idlc/Module_idlc.mk
index 28113f1..4a79c0b 100644
--- a/idlc/Module_idlc.mk
+++ b/idlc/Module_idlc.mk
@@ -14,4 +14,4 @@ $(eval $(call gb_Module_add_targets,idlc,Executable_idlc))
 $(eval $(call gb_Module_add_check_targets,idlc,CustomTarget_parser_test))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/io/Library_acceptor.mk b/io/Library_acceptor.mk
index f1ac846e..44ff337 100644
--- a/io/Library_acceptor.mk
+++ b/io/Library_acceptor.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Library_add_exception_objects,acceptor,\
     io/source/acceptor/acceptor \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/io/Library_connector.mk b/io/Library_connector.mk
index 064dec8..f742482 100644
--- a/io/Library_connector.mk
+++ b/io/Library_connector.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Library_add_exception_objects,connector,\
     io/source/connector/ctr_socket \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/io/Library_streams.mk b/io/Library_streams.mk
index 97d1e03..72a26c2 100644
--- a/io/Library_streams.mk
+++ b/io/Library_streams.mk
@@ -49,4 +49,4 @@ $(eval $(call gb_Library_add_exception_objects,streams,\
     io/source/stm/streamhelper \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/io/Library_textinstream.mk b/io/Library_textinstream.mk
index fbbe875..049a4d5 100644
--- a/io/Library_textinstream.mk
+++ b/io/Library_textinstream.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Library_add_exception_objects,textinstream,\
     io/source/TextInputStream/TextInputStream \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/io/Library_textoutstream.mk b/io/Library_textoutstream.mk
index 0aeacdf..bc6d060 100644
--- a/io/Library_textoutstream.mk
+++ b/io/Library_textoutstream.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Library_add_exception_objects,textoutstream,\
     io/source/TextOutputStream/TextOutputStream \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/io/Module_io.mk b/io/Module_io.mk
index 44a4b02..5426d68 100644
--- a/io/Module_io.mk
+++ b/io/Module_io.mk
@@ -35,4 +35,4 @@ $(eval $(call gb_Module_add_targets,io,\
     Library_textoutstream \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/Jar_juh.mk b/javaunohelper/Jar_juh.mk
index 02fb033..7f796a1 100644
--- a/javaunohelper/Jar_juh.mk
+++ b/javaunohelper/Jar_juh.mk
@@ -67,4 +67,4 @@ $(eval $(call gb_Jar_add_sourcefiles,juh,\
     javaunohelper/com/sun/star/lib/uno/helper/WeakBase \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/Library_juh.mk b/javaunohelper/Library_juh.mk
index 8d1a3e8..b08a574 100644
--- a/javaunohelper/Library_juh.mk
+++ b/javaunohelper/Library_juh.mk
@@ -51,4 +51,4 @@ $(eval $(call gb_Library_add_exception_objects,juh,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/Library_juhx.mk b/javaunohelper/Library_juhx.mk
index a3bb964..64f4351 100644
--- a/javaunohelper/Library_juhx.mk
+++ b/javaunohelper/Library_juhx.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_Library_add_exception_objects,juhx,\
     javaunohelper/source/vm \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/Module_javaunohelper.mk b/javaunohelper/Module_javaunohelper.mk
index 181e10f..8479109 100644
--- a/javaunohelper/Module_javaunohelper.mk
+++ b/javaunohelper/Module_javaunohelper.mk
@@ -43,4 +43,4 @@ endif
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/javaunohelper/Zip_juh.mk b/javaunohelper/Zip_juh.mk
index c4a6139..496ddd7 100644
--- a/javaunohelper/Zip_juh.mk
+++ b/javaunohelper/Zip_juh.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_Zip_add_files,juh_src,\
     com/sun/star/lib/uno/helper/WeakBase.java \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/Jar_jurt.mk b/jurt/Jar_jurt.mk
index 0c17574..282fe6a 100644
--- a/jurt/Jar_jurt.mk
+++ b/jurt/Jar_jurt.mk
@@ -96,4 +96,4 @@ $(eval $(call gb_Jar_add_sourcefiles,jurt,\
     jurt/com/sun/star/uno/WeakReference \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_bridgefactory.mk b/jurt/JunitTest_bridgefactory.mk
index 0931a84..de57386 100644
--- a/jurt/JunitTest_bridgefactory.mk
+++ b/jurt/JunitTest_bridgefactory.mk
@@ -41,4 +41,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_bridgefactory,\
     com.sun.star.comp.bridgefactory.BridgeFactory_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_connections.mk b/jurt/JunitTest_connections.mk
index e9b880f..c2f60e2 100644
--- a/jurt/JunitTest_connections.mk
+++ b/jurt/JunitTest_connections.mk
@@ -41,4 +41,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_connections,\
     com.sun.star.comp.connections.PipedConnection_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_java.mk b/jurt/JunitTest_java.mk
index a4a4089..bcf62af 100644
--- a/jurt/JunitTest_java.mk
+++ b/jurt/JunitTest_java.mk
@@ -41,4 +41,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_java,\
     com.sun.star.lib.uno.environments.java.java_environment_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_java_remote.mk b/jurt/JunitTest_java_remote.mk
index 7cf13c5..2389a24 100644
--- a/jurt/JunitTest_java_remote.mk
+++ b/jurt/JunitTest_java_remote.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_java_remote,\
     com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_remote.mk b/jurt/JunitTest_remote.mk
index 7133816..11946ed 100644
--- a/jurt/JunitTest_remote.mk
+++ b/jurt/JunitTest_remote.mk
@@ -50,4 +50,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_remote,\
     com.sun.star.lib.uno.environments.remote.ThreadPool_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_uno.mk b/jurt/JunitTest_uno.mk
index 36e26d3..c3e5041 100644
--- a/jurt/JunitTest_uno.mk
+++ b/jurt/JunitTest_uno.mk
@@ -46,4 +46,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_uno,\
     com.sun.star.uno.WeakReference_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_urp.mk b/jurt/JunitTest_urp.mk
index 473059a..3024064 100644
--- a/jurt/JunitTest_urp.mk
+++ b/jurt/JunitTest_urp.mk
@@ -51,4 +51,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_urp,\
     com.sun.star.lib.uno.protocols.urp.Protocol_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/JunitTest_util.mk b/jurt/JunitTest_util.mk
index 54a614f..cf3e27e 100644
--- a/jurt/JunitTest_util.mk
+++ b/jurt/JunitTest_util.mk
@@ -41,4 +41,4 @@ $(eval $(call gb_JunitTest_add_classes,jurt_util,\
     com.sun.star.lib.util.NativeLibraryLoader_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/Library_jpipe.mk b/jurt/Library_jpipe.mk
index 987c9a8..316caa2 100644
--- a/jurt/Library_jpipe.mk
+++ b/jurt/Library_jpipe.mk
@@ -55,4 +55,4 @@ $(eval $(call gb_Library_add_cobjects,jpipe,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/Library_jpipx.mk b/jurt/Library_jpipx.mk
index c8978c8..a70ced9 100644
--- a/jurt/Library_jpipx.mk
+++ b/jurt/Library_jpipx.mk
@@ -36,4 +36,4 @@ $(eval $(call gb_Library_add_cobjects,jpipx,\
     jurt/source/pipe/com_sun_star_lib_connections_pipe_PipeConnection \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index e367b6f..20cc85c 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -63,4 +63,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,jurt,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk
index a728e71..8767d3d 100644
--- a/jurt/Package_jnilib.mk
+++ b/jurt/Package_jnilib.mk
@@ -29,4 +29,4 @@ $(eval $(call gb_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util))
 
 $(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe))))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jurt/Zip_jurt.mk b/jurt/Zip_jurt.mk
index 4624f21..a32fff7 100644
--- a/jurt/Zip_jurt.mk
+++ b/jurt/Zip_jurt.mk
@@ -84,4 +84,4 @@ $(eval $(call gb_Zip_add_files,jurt_src,\
     com/sun/star/uno/WeakReference.java \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmaccess/Library_jvmaccess.mk b/jvmaccess/Library_jvmaccess.mk
index 8a00566..75128f3 100644
--- a/jvmaccess/Library_jvmaccess.mk
+++ b/jvmaccess/Library_jvmaccess.mk
@@ -54,4 +54,4 @@ $(eval $(call gb_Library_add_exception_objects,jvmaccess,\
     jvmaccess/source/virtualmachine \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmaccess/Module_jvmaccess.mk b/jvmaccess/Module_jvmaccess.mk
index a760e76..39eb4ad 100644
--- a/jvmaccess/Module_jvmaccess.mk
+++ b/jvmaccess/Module_jvmaccess.mk
@@ -37,4 +37,4 @@ $(eval $(call gb_Module_add_targets,jvmaccess,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmaccess/Package_inc.mk b/jvmaccess/Package_inc.mk
index ef2d5f0..9396ecb 100644
--- a/jvmaccess/Package_inc.mk
+++ b/jvmaccess/Package_inc.mk
@@ -32,4 +32,4 @@ $(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/jvmaccessdllapi.h,
 $(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/unovirtualmachine.hxx,unovirtualmachine.hxx))
 $(eval $(call gb_Package_add_file,jvmaccess_inc,inc/jvmaccess/virtualmachine.hxx,virtualmachine.hxx))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Executable_javaldx.mk b/jvmfwk/Executable_javaldx.mk
index 0e64f3f..3e91221 100644
--- a/jvmfwk/Executable_javaldx.mk
+++ b/jvmfwk/Executable_javaldx.mk
@@ -37,4 +37,4 @@ $(eval $(call gb_Executable_add_exception_objects,javaldx,\
     jvmfwk/plugins/sunmajor/javaenvsetup/javaldx \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 66521e3..aceaed2 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -66,4 +66,4 @@ $(eval $(call gb_Library_add_exception_objects,jvmfwk,\
     jvmfwk/source/libxmlutil \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index fcec133..a0f8c2f 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -81,4 +81,4 @@ $(eval $(call gb_Library_add_exception_objects,sunjavaplugin,\
     jvmfwk/plugins/sunmajor/pluginlib/vendorlist \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index 443fc0a..719bf79 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -51,4 +51,4 @@ endif
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
index fd8a616..7cfdff2 100644
--- a/jvmfwk/Package_inc.mk
+++ b/jvmfwk/Package_inc.mk
@@ -32,4 +32,4 @@ $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdll
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
index f8449b7..8310322 100644
--- a/jvmfwk/Package_jreproperties.mk
+++ b/jvmfwk/Package_jreproperties.mk
@@ -30,4 +30,4 @@ $(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(call gb_CustomTarget_get
 $(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class))
 $(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/jvmfwk/Package_rcfiles.mk b/jvmfwk/Package_rcfiles.mk
index fb5a392..b1985b5 100644
--- a/jvmfwk/Package_rcfiles.mk
+++ b/jvmfwk/Package_rcfiles.mk
@@ -57,4 +57,4 @@ else
 $(call gb_Output_error,Unsupported platform)
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_cfgex.mk b/l10ntools/Executable_cfgex.mk
index 8248608..7d23fa4 100644
--- a/l10ntools/Executable_cfgex.mk
+++ b/l10ntools/Executable_cfgex.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_Executable_use_externals,cfgex,\
     icui18n \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk
index d52a7c9..5aa2af2 100644
--- a/l10ntools/Executable_helpex.mk
+++ b/l10ntools/Executable_helpex.mk
@@ -54,4 +54,4 @@ $(eval $(call gb_Executable_add_exception_objects,helpex,\
     l10ntools/source/helpmerge \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_localize.mk b/l10ntools/Executable_localize.mk
index a55024d..5f3cc62 100644
--- a/l10ntools/Executable_localize.mk
+++ b/l10ntools/Executable_localize.mk
@@ -49,4 +49,4 @@ $(eval $(call gb_Executable_use_externals,localize,\
     icui18n \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk
index 364f386..5178cd5 100644
--- a/l10ntools/Executable_transex3.mk
+++ b/l10ntools/Executable_transex3.mk
@@ -57,4 +57,4 @@ $(eval $(call gb_Executable_use_externals,transex3,\
     libxml2 \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_ulfex.mk b/l10ntools/Executable_ulfex.mk
index dc12681..cd9d86e 100644
--- a/l10ntools/Executable_ulfex.mk
+++ b/l10ntools/Executable_ulfex.mk
@@ -50,4 +50,4 @@ $(eval $(call gb_Executable_use_externals,ulfex,\
     icui18n \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk
index 3eef337..de707dd 100644
--- a/l10ntools/Executable_xrmex.mk
+++ b/l10ntools/Executable_xrmex.mk
@@ -55,4 +55,4 @@ $(eval $(call gb_Executable_use_externals,xrmex,\
     icu_headers \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/l10ntools/Module_l10ntools.mk b/l10ntools/Module_l10ntools.mk
index 02b88dc..276ebfb 100644
--- a/l10ntools/Module_l10ntools.mk
+++ b/l10ntools/Module_l10ntools.mk
@@ -52,4 +52,4 @@ $(eval $(call gb_Module_add_targets,l10ntools,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/librelogo/Zip_librelogo.mk b/librelogo/Zip_librelogo.mk
index 617d0fd..d4ca750 100644
--- a/librelogo/Zip_librelogo.mk
+++ b/librelogo/Zip_librelogo.mk
@@ -46,4 +46,4 @@ $(eval $(foreach icon,\
     $(SRCDIR)/librelogo/source/icons/$(icon) \
 )))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/pyuno/Executable_python_wrapper.mk b/pyuno/Executable_python_wrapper.mk
index 157a0a3..fe4990f 100644
--- a/pyuno/Executable_python_wrapper.mk
+++ b/pyuno/Executable_python_wrapper.mk
@@ -38,4 +38,4 @@ $(eval $(call gb_Executable_add_noexception_objects,pyuno/python,\
     pyuno/zipcore/python \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/pyuno/Library_pythonloader.mk b/pyuno/Library_pythonloader.mk
index d57168d..6d8077f 100644
--- a/pyuno/Library_pythonloader.mk
+++ b/pyuno/Library_pythonloader.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_Library_add_exception_objects,pythonloader,\
     pyuno/source/loader/pyuno_loader \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/pyuno/Library_pyuno.mk b/pyuno/Library_pyuno.mk
index f3bc282..2de0463 100644
--- a/pyuno/Library_pyuno.mk
+++ b/pyuno/Library_pyuno.mk
@@ -64,4 +64,4 @@ $(eval $(call gb_Library_add_exception_objects,pyuno,\
     pyuno/source/module/pyuno_gc \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/pyuno/Library_pyuno_wrapper.mk b/pyuno/Library_pyuno_wrapper.mk
index 30aac1d..2384baf 100644
--- a/pyuno/Library_pyuno_wrapper.mk
+++ b/pyuno/Library_pyuno_wrapper.mk
@@ -56,4 +56,4 @@ $(eval $(call gb_Library_add_cobjects,pyuno_wrapper,\
     pyuno/source/module/pyuno_dlopenwrapper \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/pyuno/Module_pyuno.mk b/pyuno/Module_pyuno.mk
index 9ce9fe0..a4f7663 100644
--- a/pyuno/Module_pyuno.mk
+++ b/pyuno/Module_pyuno.mk
@@ -93,4 +93,4 @@ endif # SYSTEM_PYTHON
 
 endif # DISABLE_PYTHON
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/readlicense_oo/Module_readlicense_oo.mk b/readlicense_oo/Module_readlicense_oo.mk
index 4a6c679..6cd804e 100644
--- a/readlicense_oo/Module_readlicense_oo.mk
+++ b/readlicense_oo/Module_readlicense_oo.mk
@@ -18,4 +18,4 @@ $(eval $(call gb_Module_add_targets,readlicense_oo,\
 ))
 
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/registry/Executable_regcompare.mk b/registry/Executable_regcompare.mk
index bb3b6dc..9cd8ee6 100644
--- a/registry/Executable_regcompare.mk
+++ b/registry/Executable_regcompare.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_Executable_add_exception_objects,regcompare,\
     registry/tools/regcompare \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/registry/Executable_regmerge.mk b/registry/Executable_regmerge.mk
index 7aafd7d..271d998 100644
--- a/registry/Executable_regmerge.mk
+++ b/registry/Executable_regmerge.mk
@@ -39,4 +39,4 @@ $(eval $(call gb_Executable_add_exception_objects,regmerge,\
     registry/tools/regmerge \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/registry/Executable_regview.mk b/registry/Executable_regview.mk
index 581c381..c13127c 100644
--- a/registry/Executable_regview.mk
+++ b/registry/Executable_regview.mk
@@ -39,4 +39,4 @@ $(eval $(call gb_Executable_add_exception_objects,regview,\
     registry/tools/regview \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 147ee8af..c79100f 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -42,4 +42,4 @@ $(eval $(call gb_Module_add_targets,registry,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index 7005081..35ae07b 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -66,4 +66,4 @@ $(eval $(call gb_Jar_add_sourcefiles,ridl,\
     ridljar/com/sun/star/uno/UnoRuntime \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/Jar_unoloader.mk b/ridljar/Jar_unoloader.mk
index 4654892e..ba9ed27 100644
--- a/ridljar/Jar_unoloader.mk
+++ b/ridljar/Jar_unoloader.mk
@@ -36,4 +36,4 @@ $(eval $(call gb_Jar_add_sourcefiles,unoloader,\
     ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/JunitTest_typedesc.mk b/ridljar/JunitTest_typedesc.mk
index a419871..ed73e8f 100644
--- a/ridljar/JunitTest_typedesc.mk
+++ b/ridljar/JunitTest_typedesc.mk
@@ -39,4 +39,4 @@ $(eval $(call gb_JunitTest_add_classes,ridljar_typedesc,\
     com.sun.star.lib.uno.typedesc.TypeDescription_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/JunitTest_uno.mk b/ridljar/JunitTest_uno.mk
index d166b97..5eb9135 100644
--- a/ridljar/JunitTest_uno.mk
+++ b/ridljar/JunitTest_uno.mk
@@ -43,4 +43,4 @@ $(eval $(call gb_JunitTest_add_classes,ridljar_uno,\
     com.sun.star.uno.UnoRuntime_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/JunitTest_util.mk b/ridljar/JunitTest_util.mk
index e29a65b..6d95d90 100644
--- a/ridljar/JunitTest_util.mk
+++ b/ridljar/JunitTest_util.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_JunitTest_add_classes,ridljar_util,\
     com.sun.star.lib.util.WeakMap_Test \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
index 206e735..4a697e2 100644
--- a/ridljar/Module_ridljar.mk
+++ b/ridljar/Module_ridljar.mk
@@ -45,4 +45,4 @@ $(eval $(call gb_Module_add_subsequentcheck_targets,ridljar,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/Zip_ridl.mk b/ridljar/Zip_ridl.mk
index 1b6c7c2..ca85eb9 100644
--- a/ridljar/Zip_ridl.mk
+++ b/ridljar/Zip_ridl.mk
@@ -56,4 +56,4 @@ $(eval $(call gb_Zip_add_files,ridl_src,\
     com/sun/star/uno/UnoRuntime.java \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ridljar/Zip_unoloader.mk b/ridljar/Zip_unoloader.mk
index 0174743..211eb09 100644
--- a/ridljar/Zip_unoloader.mk
+++ b/ridljar/Zip_unoloader.mk
@@ -32,4 +32,4 @@ $(eval $(call gb_Zip_add_files,unoloader_src,\
     com/sun/star/lib/unoloader/UnoClassLoader.java \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/scaddins/InternalUnoApi_scaddins.mk b/scaddins/InternalUnoApi_scaddins.mk
index a347e82..da3e5ca 100644
--- a/scaddins/InternalUnoApi_scaddins.mk
+++ b/scaddins/InternalUnoApi_scaddins.mk
@@ -53,4 +53,4 @@ $(eval $(call gb_InternalUnoApi_add_idlfiles,scaddins,scaddins/idl/com/sun/star/
     XMiscFunctions \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Configuration_minimizer.mk b/sdext/Configuration_minimizer.mk
index 6af15c1..9fc6ab9 100644
--- a/sdext/Configuration_minimizer.mk
+++ b/sdext/Configuration_minimizer.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_Configuration_add_localized_datas,presentation-minimizer,sdext/
     org/openoffice/Office/extension/SunPresentationMinimizer.xcu \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/CppunitTest_pdfimport.mk b/sdext/CppunitTest_pdfimport.mk
index 3f41b8e..89a068c 100644
--- a/sdext/CppunitTest_pdfimport.mk
+++ b/sdext/CppunitTest_pdfimport.mk
@@ -76,4 +76,4 @@ $(eval $(call gb_CppunitTest_use_components,sdext_pdfimport,\
 
 $(eval $(call gb_CppunitTest_use_configuration,sdext_pdfimport))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Executable_pdf2xml.mk b/sdext/Executable_pdf2xml.mk
index 600e979..1c4927c 100644
--- a/sdext/Executable_pdf2xml.mk
+++ b/sdext/Executable_pdf2xml.mk
@@ -55,4 +55,4 @@ $(eval $(call gb_Executable_add_exception_objects,pdf2xml,\
     sdext/source/pdfimport/test/pdf2xml \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Executable_pdfunzip.mk b/sdext/Executable_pdfunzip.mk
index c3bd395..27c2fab 100644
--- a/sdext/Executable_pdfunzip.mk
+++ b/sdext/Executable_pdfunzip.mk
@@ -54,4 +54,4 @@ $(eval $(call gb_Executable_add_exception_objects,pdfunzip,\
     sdext/source/pdfimport/test/pdfunzip \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Executable_xpdfimport.mk b/sdext/Executable_xpdfimport.mk
index 0d7757d..fa9ab93 100644
--- a/sdext/Executable_xpdfimport.mk
+++ b/sdext/Executable_xpdfimport.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Executable_add_exception_objects,xpdfimport,\
     sdext/source/pdfimport/xpdfwrapper/wrapper_gpl \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Extension_minimizer.mk b/sdext/Extension_minimizer.mk
index 8b56ab8..08073a4 100644
--- a/sdext/Extension_minimizer.mk
+++ b/sdext/Extension_minimizer.mk
@@ -49,4 +49,4 @@ $(eval $(call gb_Extension_add_files,presentation-minimizer,registry/data/org/op
 
 $(eval $(call gb_Extension_add_file,presentation-minimizer,registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu,$(call gb_XcuFile_for_extension,sdext/source/minimizer/registry/data/org/openoffice/Office/extension/SunPresentationMinimizer.xcu)))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Library_minimizer.mk b/sdext/Library_minimizer.mk
index 03fb85b..5bbddac 100644
--- a/sdext/Library_minimizer.mk
+++ b/sdext/Library_minimizer.mk
@@ -63,4 +63,4 @@ $(eval $(call gb_Library_add_exception_objects,SunPresentationMinimizer,\
     sdext/source/minimizer/unodialog \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 77a4c03..ce171f2 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -56,4 +56,4 @@ $(eval $(call gb_Library_add_exception_objects,pdfimport,\
     sdext/source/pdfimport/services \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Library_presenter.mk b/sdext/Library_presenter.mk
index b0950cb..63479c6 100644
--- a/sdext/Library_presenter.mk
+++ b/sdext/Library_presenter.mk
@@ -80,4 +80,4 @@ $(eval $(call gb_Library_add_exception_objects,PresenterScreen,\
     sdext/source/presenter/PresenterWindowManager \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Module_sdext.mk b/sdext/Module_sdext.mk
index 9b870d0..50b14ff 100644
--- a/sdext/Module_sdext.mk
+++ b/sdext/Module_sdext.mk
@@ -57,4 +57,4 @@ $(eval $(call gb_Module_add_check_targets,sdext,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/Rdb_minimizer.mk b/sdext/Rdb_minimizer.mk
index 43ec5de..5a3ad3c 100644
--- a/sdext/Rdb_minimizer.mk
+++ b/sdext/Rdb_minimizer.mk
@@ -31,4 +31,4 @@ $(eval $(call gb_Rdb_add_components,minimizer,\
     sdext/source/minimizer/minimizer \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/sdext/StaticLibrary_pdfimport_s.mk b/sdext/StaticLibrary_pdfimport_s.mk
index 2f9d06d..6e6c6a0 100644
--- a/sdext/StaticLibrary_pdfimport_s.mk
+++ b/sdext/StaticLibrary_pdfimport_s.mk
@@ -78,4 +78,4 @@ $(eval $(call gb_StaticLibrary_add_exception_objects,pdfimport_s,\
     sdext/source/pdfimport/wrapper/wrapper \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/shell/Library_losessioninstall.mk b/shell/Library_losessioninstall.mk
index 8874a3a..b333409 100644
--- a/shell/Library_losessioninstall.mk
+++ b/shell/Library_losessioninstall.mk
@@ -34,4 +34,4 @@ $(eval $(call gb_Library_add_exception_objects,losessioninstall,\
 	shell/source/sessioninstall/services \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/soltools/Executable_adjustvisibility.mk b/soltools/Executable_adjustvisibility.mk
index 0e98c34..5880a72 100644
--- a/soltools/Executable_adjustvisibility.mk
+++ b/soltools/Executable_adjustvisibility.mk
@@ -19,4 +19,4 @@ $(eval $(call gb_Executable_add_exception_objects,adjustvisibility,\
     soltools/adjustvisibility/adjustvisibility \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/soltools/Executable_cpp.mk b/soltools/Executable_cpp.mk
index f0d3d11..0b9b3ea 100644
--- a/soltools/Executable_cpp.mk
+++ b/soltools/Executable_cpp.mk
@@ -39,4 +39,4 @@ $(eval $(call gb_Executable_add_defs,cpp,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/soltools/Executable_javadep.mk b/soltools/Executable_javadep.mk
index 2a44a87..77dd829 100644
--- a/soltools/Executable_javadep.mk
+++ b/soltools/Executable_javadep.mk
@@ -19,4 +19,4 @@ $(eval $(call gb_Executable_add_cobjects,javadep,\
     soltools/javadep/javadep \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/soltools/Executable_ldump4.mk b/soltools/Executable_ldump4.mk
index d104d6f..6a3dda5 100644
--- a/soltools/Executable_ldump4.mk
+++ b/soltools/Executable_ldump4.mk
@@ -14,4 +14,4 @@ $(eval $(call gb_Executable_add_exception_objects,ldump4,\
     soltools/ldump/ldump \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/soltools/Executable_makedepend.mk b/soltools/Executable_makedepend.mk
index c3b7d2f..8f74a3f 100644
--- a/soltools/Executable_makedepend.mk
+++ b/soltools/Executable_makedepend.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_Executable_add_cobjects,makedepend,\
     soltools/mkdepend/pr \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/soltools/Module_soltools.mk b/soltools/Module_soltools.mk
index 95a80214..56fec56 100644
--- a/soltools/Module_soltools.mk
+++ b/soltools/Module_soltools.mk
@@ -31,4 +31,4 @@ $(eval $(call gb_Module_add_targets,soltools,\
 ))
 endif # WNTMSC
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_bootstrap.mk b/stoc/Library_bootstrap.mk
index b7f2a5e..01e086b 100644
--- a/stoc/Library_bootstrap.mk
+++ b/stoc/Library_bootstrap.mk
@@ -90,4 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,bootstrap,\
     stoc/source/tdmanager/tdmgr_tdenumeration \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_introspection.mk b/stoc/Library_introspection.mk
index fe4bc3d..2d31145 100644
--- a/stoc/Library_introspection.mk
+++ b/stoc/Library_introspection.mk
@@ -45,4 +45,4 @@ $(eval $(call gb_Library_add_exception_objects,introspection,\
     stoc/source/inspect/introspection \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_invocadapt.mk b/stoc/Library_invocadapt.mk
index e053e53..773417a 100644
--- a/stoc/Library_invocadapt.mk
+++ b/stoc/Library_invocadapt.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Library_add_exception_objects,invocadapt,\
     stoc/source/invocation_adapterfactory/iafactory \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index 46ca5c3..9869a3d 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Library_add_exception_objects,invocation,\
     stoc/source/invocation/invocation \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_javaloader.mk b/stoc/Library_javaloader.mk
index d30ccd1..1bf5d0c 100644
--- a/stoc/Library_javaloader.mk
+++ b/stoc/Library_javaloader.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Library_add_exception_objects,javaloader,\
     stoc/source/javaloader/javaloader \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_javavm.mk b/stoc/Library_javavm.mk
index 592ca6a..8796f33 100644
--- a/stoc/Library_javavm.mk
+++ b/stoc/Library_javavm.mk
@@ -49,4 +49,4 @@ $(eval $(call gb_Library_add_exception_objects,javavm,\
     stoc/source/javavm/jvmargs \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_namingservice.mk b/stoc/Library_namingservice.mk
index 8dda20d..87d79e9 100644
--- a/stoc/Library_namingservice.mk
+++ b/stoc/Library_namingservice.mk
@@ -44,4 +44,4 @@ $(eval $(call gb_Library_add_exception_objects,namingservice,\
     stoc/source/namingservice/namingservice \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_proxyfac.mk b/stoc/Library_proxyfac.mk
index 75166f0..d4baf63 100644
--- a/stoc/Library_proxyfac.mk
+++ b/stoc/Library_proxyfac.mk
@@ -42,4 +42,4 @@ $(eval $(call gb_Library_add_exception_objects,proxyfac,\
     stoc/source/proxy_factory/proxyfac \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_reflection.mk b/stoc/Library_reflection.mk
index f2d6f57..8fb4513 100644
--- a/stoc/Library_reflection.mk
+++ b/stoc/Library_reflection.mk
@@ -49,4 +49,4 @@ $(eval $(call gb_Library_add_exception_objects,reflection,\
     stoc/source/corereflection/criface \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Library_stocservices.mk b/stoc/Library_stocservices.mk
index 3da842d..46d854e 100644
--- a/stoc/Library_stocservices.mk
+++ b/stoc/Library_stocservices.mk
@@ -55,4 +55,4 @@ $(eval $(call gb_Library_add_exception_objects,stocservices,\
     stoc/source/uriproc/supportsService \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/stoc/Module_stoc.mk b/stoc/Module_stoc.mk
index 1d3e7a6..5401616 100644
--- a/stoc/Module_stoc.mk
+++ b/stoc/Module_stoc.mk
@@ -47,4 +47,4 @@ $(eval $(call gb_Module_add_targets,stoc,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/store/Module_store.mk b/store/Module_store.mk
index 13a102d..9f166ac 100644
--- a/store/Module_store.mk
+++ b/store/Module_store.mk
@@ -31,4 +31,4 @@ $(eval $(call gb_Module_add_targets,store,\
     Package_inc \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/svx/Package_globlmn_hrc.mk b/svx/Package_globlmn_hrc.mk
index 4b1926f..dbb2a30 100644
--- a/svx/Package_globlmn_hrc.mk
+++ b/svx/Package_globlmn_hrc.mk
@@ -29,4 +29,4 @@ $(eval $(call gb_Package_Package,svx_globlmn_hrc,$(call gb_SrsTemplateTarget_get
 
 $(eval $(call gb_Package_add_file,svx_globlmn_hrc,inc/svx/globlmn.hrc,globlmn.hrc))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/testtools/InternalUnoApi_bridgetest.mk b/testtools/InternalUnoApi_bridgetest.mk
index fd627e7..de540e6 100644
--- a/testtools/InternalUnoApi_bridgetest.mk
+++ b/testtools/InternalUnoApi_bridgetest.mk
@@ -43,4 +43,4 @@ $(eval $(call gb_InternalUnoApi_add_idlfiles,bridgetest,testtools/source/bridget
     XPerformanceTest \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/testtools/Library_bridgetest.mk b/testtools/Library_bridgetest.mk
index 6a3063f..d57c4fa 100644
--- a/testtools/Library_bridgetest.mk
+++ b/testtools/Library_bridgetest.mk
@@ -52,4 +52,4 @@ $(eval $(call gb_Library_add_exception_objects,testtools_bridgetest,\
     testtools/source/bridgetest/bridgetest \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/testtools/Library_constructors.mk b/testtools/Library_constructors.mk
index 3de7008..d219372 100644
--- a/testtools/Library_constructors.mk
+++ b/testtools/Library_constructors.mk
@@ -51,4 +51,4 @@ $(eval $(call gb_Library_add_exception_objects,testtools_constructors,\
     testtools/source/bridgetest/constructors \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/testtools/Library_cppobj.mk b/testtools/Library_cppobj.mk
index 1d5fbe6..fdc5241 100644
--- a/testtools/Library_cppobj.mk
+++ b/testtools/Library_cppobj.mk
@@ -57,4 +57,4 @@ $(eval $(call gb_Library_add_exception_objects,testtools_cppobj,\
     testtools/source/bridgetest/cppobj \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/testtools/Module_testtools.mk b/testtools/Module_testtools.mk
index 7115107..fe812de 100644
--- a/testtools/Module_testtools.mk
+++ b/testtools/Module_testtools.mk
@@ -61,4 +61,4 @@ endif
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/testtools/Rdb_uno_services.mk b/testtools/Rdb_uno_services.mk
index 9fc0dea..45dfe2a 100644
--- a/testtools/Rdb_uno_services.mk
+++ b/testtools/Rdb_uno_services.mk
@@ -38,4 +38,4 @@ $(eval $(call gb_Rdb_add_components,uno_services,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/udm/Module_udm.mk b/udm/Module_udm.mk
index fc85a2c..93920e0 100644
--- a/udm/Module_udm.mk
+++ b/udm/Module_udm.mk
@@ -17,4 +17,4 @@ $(eval $(call gb_Module_add_targets,udm,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/unodevtools/Executable_skeletonmaker.mk b/unodevtools/Executable_skeletonmaker.mk
index 40fae4e..433ba38 100644
--- a/unodevtools/Executable_skeletonmaker.mk
+++ b/unodevtools/Executable_skeletonmaker.mk
@@ -63,4 +63,4 @@ $(eval $(call gb_Executable_add_exception_objects,uno-skeletonmaker,\
     unodevtools/source/skeletonmaker/cppcompskeleton \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/unodevtools/Module_unodevtools.mk b/unodevtools/Module_unodevtools.mk
index 09ca03a..16b409a 100644
--- a/unodevtools/Module_unodevtools.mk
+++ b/unodevtools/Module_unodevtools.mk
@@ -34,4 +34,4 @@ $(eval $(call gb_Module_add_targets,unodevtools,\
 
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
index f53c4b4..84e327e 100644
--- a/unoil/Jar_unoil.mk
+++ b/unoil/Jar_unoil.mk
@@ -35,4 +35,4 @@ $(eval $(call gb_Jar_add_packagedirs,unoil,\
     $(call gb_CustomTarget_get_workdir,unoil/javamaker)/com \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 40e7cdd..8153de7 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -45,4 +45,4 @@ $(eval $(call gb_Module_add_targets,unoil,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk
index 1b92759..fbe3e2c 100644
--- a/unoil/Package_climaker.mk
+++ b/unoil/Package_climaker.mk
@@ -31,4 +31,4 @@ $(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.config,cli_ooo
 $(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.dll,cli_oootypes.dll))
 $(eval $(call gb_Package_add_file,unoil_climaker,bin/policy.1.0.cli_oootypes.dll,policy.1.0.cli_oootypes.dll))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk
index 5da7493..48578c1 100644
--- a/unoil/Package_clioootypesversion.mk
+++ b/unoil/Package_clioootypesversion.mk
@@ -29,4 +29,4 @@ $(eval $(call gb_Package_Package,unoil_clioootypesversion,$(SRCDIR)/unoil/climak
 
 $(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 0f75d4c..169307a 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -34,4 +34,4 @@ $(eval $(call gb_Module_add_targets,ure,\
     Zip_uretest \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_distribution.mk b/ure/Package_distribution.mk
index 81a39cf..62631a8 100644
--- a/ure/Package_distribution.mk
+++ b/ure/Package_distribution.mk
@@ -35,4 +35,4 @@ $(eval $(call gb_Package_add_file,ure_distribution,bin/ure/startup.sh,startup.sh
 $(eval $(call gb_Package_add_file,ure_distribution,bin/ure/uno.ini,uno.ini))
 $(eval $(call gb_Package_add_file,ure_distribution,bin/ure/unorc,unorc))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_uretest.mk b/ure/Package_uretest.mk
index 6e2d236..8589162 100644
--- a/ure/Package_uretest.mk
+++ b/ure/Package_uretest.mk
@@ -29,4 +29,4 @@ $(eval $(call gb_Package_Package,ure_uretest,$(patsubst %/,%,$(dir $(call gb_Zip
 
 $(eval $(call gb_Package_add_file,ure_uretest,bin/uretest.zip,uretest.zip))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Rdb_ure.mk b/ure/Rdb_ure.mk
index 6969fa5..d45ba4b 100644
--- a/ure/Rdb_ure.mk
+++ b/ure/Rdb_ure.mk
@@ -54,4 +54,4 @@ $(eval $(call gb_Rdb_add_components,ure/services,\
 ))
 endif
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Zip_uretest.mk b/ure/Zip_uretest.mk
index e3d0b67..38c9871 100644
--- a/ure/Zip_uretest.mk
+++ b/ure/Zip_uretest.mk
@@ -50,4 +50,4 @@ $(eval $(call gb_Zip_add_files,uretest,\
     uretest/types.mf.template \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/vcl/Zip_osxres.mk b/vcl/Zip_osxres.mk
index 212b802..348d010 100644
--- a/vcl/Zip_osxres.mk
+++ b/vcl/Zip_osxres.mk
@@ -103,4 +103,4 @@ $(eval $(call gb_Zip_add_files,osxres,\
     cursors/vtext.png \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_commonwizards.mk b/wizards/Pyuno_commonwizards.mk
index abc6040..0391df1d 100644
--- a/wizards/Pyuno_commonwizards.mk
+++ b/wizards/Pyuno_commonwizards.mk
@@ -71,4 +71,4 @@ $(eval $(call gb_Pyuno_add_files,wizards,\
     ui/event/UnoDataAware.py \
 ))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_fax.mk b/wizards/Pyuno_fax.mk
index cd5990e..a5a1c1d 100644
--- a/wizards/Pyuno_fax.mk
+++ b/wizards/Pyuno_fax.mk
@@ -40,4 +40,4 @@ $(eval $(call gb_Pyuno_add_files,fax,\
 ))
 $(eval $(call gb_Pyuno_set_componentfile_full,fax,wizards/com/sun/star/wizards/fax/fax,vnd.openoffice.pymodule:wizards.fax,.CallWizard))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
diff --git a/wizards/Pyuno_letter.mk b/wizards/Pyuno_letter.mk
index 9d42071..5231849 100644
--- a/wizards/Pyuno_letter.mk
+++ b/wizards/Pyuno_letter.mk
@@ -41,4 +41,4 @@ $(eval $(call gb_Pyuno_add_files,letter,\
 ))
 $(eval $(call gb_Pyuno_set_componentfile_full,letter,wizards/com/sun/star/wizards/letter/letter,vnd.openoffice.pymodule:wizards.letter,.CallWizard))
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+# vim:set noet sw=4 ts=4:
commit fc81393c7f11ffb854fe024b64146b50cf462921
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Jan 26 22:15:04 2013 +0100

    gbuild: remove various pointless calls that don't add anything
    
    Change-Id: I7eccac4fa8890c2873c6bbd7f8f5bf5b0dd006d2

diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 14154cc..1025df8 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -120,10 +120,6 @@ $(eval $(call gb_Library_add_sdi_headers,basctl,basctl/sdi/basslots))
 
 $(eval $(call gb_SdiTarget_SdiTarget,basctl/sdi/basslots,basctl/sdi/baside))
 
-$(eval $(call gb_SdiTarget_set_include,basctl/sdi/basslots,\
-	$$(INCLUDE) \
-))
-
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_system_win32_libs,basctl,\
 	advapi32 \
diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index c42d630..5605cfc 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,crashrep_com))
 
 $(eval $(call gb_Executable_set_targettype_gui,crashrep_com,NO))
 
-$(eval $(call gb_Executable_set_include,crashrep_com,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
diff --git a/desktop/Executable_officeloader.mk b/desktop/Executable_officeloader.mk
index d29e0d3..974610c 100644
--- a/desktop/Executable_officeloader.mk
+++ b/desktop/Executable_officeloader.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,officeloader))
 
-$(eval $(call gb_Executable_set_include,officeloader,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,officeloader,\
     sal \
 	$(gb_UWINAPI) \
diff --git a/desktop/Executable_oosplash.mk b/desktop/Executable_oosplash.mk
index b67e08d..1f52806 100644
--- a/desktop/Executable_oosplash.mk
+++ b/desktop/Executable_oosplash.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,oosplash))
 
 $(eval $(call gb_Executable_set_targettype_gui,oosplash,YES))
 
-$(eval $(call gb_Executable_set_include,oosplash,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,oosplash,\
     sal \
 ))
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 555917e..7d71013 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,quickstart))
 
 $(eval $(call gb_Executable_set_targettype_gui,quickstart,YES))
 
-$(eval $(call gb_Executable_set_include,quickstart,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_system_win32_libs,quickstart,\
     comdlg32 \
     gdi32 \
diff --git a/desktop/Executable_unoinfo.mk b/desktop/Executable_unoinfo.mk
index 40db3a0..841a2b9 100644
--- a/desktop/Executable_unoinfo.mk
+++ b/desktop/Executable_unoinfo.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,unoinfo))
 
-$(eval $(call gb_Executable_set_include,unoinfo,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_static_libraries,unoinfo,\
     ooopathutils \
 ))
diff --git a/desktop/Executable_unopkg.com.mk b/desktop/Executable_unopkg.com.mk
index 9eb961b..946e579 100644
--- a/desktop/Executable_unopkg.com.mk
+++ b/desktop/Executable_unopkg.com.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,unopkg_com))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg_com,NO))
 
-$(eval $(call gb_Executable_set_include,unopkg_com,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_defs,unopkg_com,\
     $(LFS_CFLAGS) \
 ))
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index 769df8b..f624d18 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,migrationoo2))
 
-$(eval $(call gb_Library_set_include,migrationoo2,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_external,migrationoo2,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,migrationoo2))
diff --git a/desktop/Library_migrationoo3.mk b/desktop/Library_migrationoo3.mk
index 7fc3bf9..f397faf 100644
--- a/desktop/Library_migrationoo3.mk
+++ b/desktop/Library_migrationoo3.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,migrationoo3))
 
-$(eval $(call gb_Library_set_include,migrationoo3,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,migrationoo3))
 
 $(eval $(call gb_Library_use_libraries,migrationoo3,\
diff --git a/desktop/Library_offacc.mk b/desktop/Library_offacc.mk
index 6e3c845..2699ff0 100644
--- a/desktop/Library_offacc.mk
+++ b/desktop/Library_offacc.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,offacc))
 
-$(eval $(call gb_Library_set_include,offacc,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,offacc))
 
 $(eval $(call gb_Library_use_libraries,offacc,\
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 952b3cc..6314a64 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,dnd))
 
 $(eval $(call gb_Library_set_componentfile,dnd,dtrans/util/dnd))
 
-$(eval $(call gb_Library_set_include,dnd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,dnd))
 
 $(eval $(call gb_Library_use_libraries,dnd,\
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index 1313b9b..43b2d3c 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,dtrans))
 
 $(eval $(call gb_Library_set_componentfile,dtrans,dtrans/source/generic/dtrans))
 
-$(eval $(call gb_Library_set_include,dtrans,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,dtrans))
 
 $(eval $(call gb_Library_use_libraries,dtrans,\
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index f854602..fcad409 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,ftransl))
 
 $(eval $(call gb_Library_set_componentfile,ftransl,dtrans/util/ftransl))
 
-$(eval $(call gb_Library_set_include,ftransl,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,ftransl))
 
 $(eval $(call gb_Library_use_libraries,ftransl,\
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index b826a42..efb5011 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,mcnttype))
 
 $(eval $(call gb_Library_set_componentfile,mcnttype,dtrans/util/mcnttype))
 
-$(eval $(call gb_Library_set_include,mcnttype,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,mcnttype))
 
 $(eval $(call gb_Library_use_libraries,mcnttype,\
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index 6be9786..9ab2396 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -30,10 +30,6 @@ $(eval $(call gb_Library_Library,sysdtrans))
 
 $(eval $(call gb_Library_set_componentfile,sysdtrans,dtrans/util/sysdtrans))
 
-$(eval $(call gb_Library_set_include,sysdtrans,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,sysdtrans))
 
 $(eval $(call gb_Library_add_defs,sysdtrans,\
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index 554ac68..c854710 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -51,10 +51,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_borderline,\
     icuuc \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,editeng_borderline,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,editeng_borderline,\
     offapi \
     udkapi \
diff --git a/editeng/CppunitTest_editeng_lookuptree.mk b/editeng/CppunitTest_editeng_lookuptree.mk
index 1650db9..1574558 100644
--- a/editeng/CppunitTest_editeng_lookuptree.mk
+++ b/editeng/CppunitTest_editeng_lookuptree.mk
@@ -50,10 +50,6 @@ $(eval $(call gb_CppunitTest_use_externals,editeng_lookuptree,\
     icuuc \
 ))
 
-$(eval $(call gb_CppunitTest_set_include,editeng_lookuptree,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,editeng_lookuptree,\
     offapi \
     udkapi \
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index a5df447..75fae7a 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,fileacc))
 
-$(eval $(call gb_Library_set_include,fileacc,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,fileacc))
 
 $(eval $(call gb_Library_use_libraries,fileacc,\
diff --git a/filter/Library_egi.mk b/filter/Library_egi.mk
index 59dd768..a51ad82 100644
--- a/filter/Library_egi.mk
+++ b/filter/Library_egi.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,egi,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,egi))
 
-$(eval $(call gb_Library_set_include,egi,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,egi,\
 	svt \
 	vcl \
diff --git a/filter/Library_eme.mk b/filter/Library_eme.mk
index a62f16a..1e431e6 100644
--- a/filter/Library_eme.mk
+++ b/filter/Library_eme.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eme,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,eme))
 
-$(eval $(call gb_Library_set_include,eme,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eme,\
 	svt \
 	vcl \
diff --git a/filter/Library_epb.mk b/filter/Library_epb.mk
index 1e9bd20..eb0a05a 100644
--- a/filter/Library_epb.mk
+++ b/filter/Library_epb.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epb,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,epb))
 
-$(eval $(call gb_Library_set_include,epb,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epb,\
 	svt \
 	vcl \
diff --git a/filter/Library_epg.mk b/filter/Library_epg.mk
index 4a97a00..0f32920 100644
--- a/filter/Library_epg.mk
+++ b/filter/Library_epg.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epg,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,epg))
 
-$(eval $(call gb_Library_set_include,epg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epg,\
 	svt \
 	vcl \
diff --git a/filter/Library_epp.mk b/filter/Library_epp.mk
index bd9c4d9..dafdcd8 100644
--- a/filter/Library_epp.mk
+++ b/filter/Library_epp.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,epp,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,epp))
 
-$(eval $(call gb_Library_set_include,epp,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,epp,\
 	svt \
 	vcl \
diff --git a/filter/Library_eps.mk b/filter/Library_eps.mk
index 664ccef..ea757b8 100644
--- a/filter/Library_eps.mk
+++ b/filter/Library_eps.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eps,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,eps))
 
-$(eval $(call gb_Library_set_include,eps,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eps,\
 	svt \
 	vcl \
diff --git a/filter/Library_ept.mk b/filter/Library_ept.mk
index 9f0a442..62e4e95 100644
--- a/filter/Library_ept.mk
+++ b/filter/Library_ept.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ept,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ept))
 
-$(eval $(call gb_Library_set_include,ept,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ept,\
 	svt \
 	vcl \
diff --git a/filter/Library_era.mk b/filter/Library_era.mk
index 3a963a1..f12a836 100644
--- a/filter/Library_era.mk
+++ b/filter/Library_era.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,era,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,era))
 
-$(eval $(call gb_Library_set_include,era,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,era,\
 	svt \
 	vcl \
diff --git a/filter/Library_eti.mk b/filter/Library_eti.mk
index 9f934f6..bbafdc1 100644
--- a/filter/Library_eti.mk
+++ b/filter/Library_eti.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,eti,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,eti))
 
-$(eval $(call gb_Library_set_include,eti,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,eti,\
 	svt \
 	vcl \
diff --git a/filter/Library_exp.mk b/filter/Library_exp.mk
index 628e636..7ea0be4 100644
--- a/filter/Library_exp.mk
+++ b/filter/Library_exp.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,exp,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,exp))
 
-$(eval $(call gb_Library_set_include,exp,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,exp,\
 	svt \
 	vcl \
diff --git a/filter/Library_flash.mk b/filter/Library_flash.mk
index 97dd310..d3fc330 100644
--- a/filter/Library_flash.mk
+++ b/filter/Library_flash.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,flash,filter/source/flash/flash))
 
 $(eval $(call gb_Library_use_sdk_api,flash))
 
-$(eval $(call gb_Library_set_include,flash,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,flash,\
 	svt \
 	vcl \
diff --git a/filter/Library_icd.mk b/filter/Library_icd.mk
index bc4ec54..02f600e 100644
--- a/filter/Library_icd.mk
+++ b/filter/Library_icd.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,icd,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,icd))
 
-$(eval $(call gb_Library_set_include,icd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,icd,\
 	svt \
 	vcl \
diff --git a/filter/Library_icg.mk b/filter/Library_icg.mk
index 43362ad..51e360c 100644
--- a/filter/Library_icg.mk
+++ b/filter/Library_icg.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,icg,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,icg))
 
-$(eval $(call gb_Library_set_include,icg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,icg,\
         comphelper \
 	tk \
diff --git a/filter/Library_idx.mk b/filter/Library_idx.mk
index 69b1cd7..a636972 100644
--- a/filter/Library_idx.mk
+++ b/filter/Library_idx.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,idx,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,idx))
 
-$(eval $(call gb_Library_set_include,idx,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,idx,\
 	vcl \
 	tl \
diff --git a/filter/Library_ime.mk b/filter/Library_ime.mk
index f7a37cc..f7889b4 100644
--- a/filter/Library_ime.mk
+++ b/filter/Library_ime.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ime,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ime))
 
-$(eval $(call gb_Library_set_include,ime,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ime,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipb.mk b/filter/Library_ipb.mk
index a972a53..4175517 100644
--- a/filter/Library_ipb.mk
+++ b/filter/Library_ipb.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipb,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipb))
 
-$(eval $(call gb_Library_set_include,ipb,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipb,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipd.mk b/filter/Library_ipd.mk
index 264cec6..34b1df8 100644
--- a/filter/Library_ipd.mk
+++ b/filter/Library_ipd.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipd,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipd))
 
-$(eval $(call gb_Library_set_include,ipd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipd,\
 	vcl \
 	tl \
diff --git a/filter/Library_ips.mk b/filter/Library_ips.mk
index ba4d536..2a61795 100644
--- a/filter/Library_ips.mk
+++ b/filter/Library_ips.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ips,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ips))
 
-$(eval $(call gb_Library_set_include,ips,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ips,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipt.mk b/filter/Library_ipt.mk
index 283cf8a..68e913c 100644
--- a/filter/Library_ipt.mk
+++ b/filter/Library_ipt.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipt,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipt))
 
-$(eval $(call gb_Library_set_include,ipt,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipt,\
 	vcl \
 	tl \
diff --git a/filter/Library_ipx.mk b/filter/Library_ipx.mk
index 9eeb5fd..5ed39ce 100644
--- a/filter/Library_ipx.mk
+++ b/filter/Library_ipx.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ipx,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ipx))
 
-$(eval $(call gb_Library_set_include,ipx,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ipx,\
 	vcl \
 	tl \
diff --git a/filter/Library_ira.mk b/filter/Library_ira.mk
index 4df5243..16ac76a 100644
--- a/filter/Library_ira.mk
+++ b/filter/Library_ira.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,ira,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,ira))
 
-$(eval $(call gb_Library_set_include,ira,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,ira,\
 	vcl \
 	tl \
diff --git a/filter/Library_itg.mk b/filter/Library_itg.mk
index 2821996..0f6cd33 100644
--- a/filter/Library_itg.mk
+++ b/filter/Library_itg.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,itg,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,itg))
 
-$(eval $(call gb_Library_set_include,itg,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,itg,\
 	vcl \
 	tl \
diff --git a/filter/Library_iti.mk b/filter/Library_iti.mk
index 05cdac1..55224ac 100644
--- a/filter/Library_iti.mk
+++ b/filter/Library_iti.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_use_external,iti,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,iti))
 
-$(eval $(call gb_Library_set_include,iti,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,iti,\
 	vcl \
 	tl \
diff --git a/filter/Library_msfilter.mk b/filter/Library_msfilter.mk
index c4dfb2e..90b6c3a 100644
--- a/filter/Library_msfilter.mk
+++ b/filter/Library_msfilter.mk
@@ -27,10 +27,6 @@ $(eval $(call gb_Library_use_external,msfilter,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,msfilter))
 
-$(eval $(call gb_Library_set_include,msfilter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,msfilter,\
 	-DMSFILTER_DLLIMPLEMENTATION \
 ))
diff --git a/filter/Library_placeware.mk b/filter/Library_placeware.mk
index 8c63643..732c31f 100644
--- a/filter/Library_placeware.mk
+++ b/filter/Library_placeware.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,placeware,filter/source/placeware/pla
 
 $(eval $(call gb_Library_use_sdk_api,placeware))
 
-$(eval $(call gb_Library_set_include,placeware,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,placeware,\
 	cppuhelper \
 	cppu \
diff --git a/filter/Library_t602filter.mk b/filter/Library_t602filter.mk
index b9db721..a0acfe3 100644
--- a/filter/Library_t602filter.mk
+++ b/filter/Library_t602filter.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,t602filter,filter/source/t602/t602fil
 
 $(eval $(call gb_Library_use_sdk_api,t602filter))
 
-$(eval $(call gb_Library_set_include,t602filter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,t602filter,\
 	xo \
 	tl \
diff --git a/filter/Library_textfd.mk b/filter/Library_textfd.mk
index bcb4d90..f367cef 100644
--- a/filter/Library_textfd.mk
+++ b/filter/Library_textfd.mk
@@ -34,10 +34,6 @@ $(eval $(call gb_Library_set_componentfile,textfd,filter/source/textfilterdetect
 
 $(eval $(call gb_Library_use_sdk_api,textfd))
 
-$(eval $(call gb_Library_set_include,textfd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,textfd,\
 	ucbhelper \
 	cppuhelper \
diff --git a/filter/Library_xmlfa.mk b/filter/Library_xmlfa.mk
index d8dec8d..fe1dfae 100644
--- a/filter/Library_xmlfa.mk
+++ b/filter/Library_xmlfa.mk
@@ -25,10 +25,6 @@ $(eval $(call gb_Library_use_external,xmlfa,boost_headers))
 
 $(eval $(call gb_Library_use_sdk_api,xmlfa))
 
-$(eval $(call gb_Library_set_include,xmlfa,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xmlfa,\
 	tl \
 	comphelper \
diff --git a/filter/Library_xmlfd.mk b/filter/Library_xmlfd.mk
index 8972f7b..39f10c2 100644
--- a/filter/Library_xmlfd.mk
+++ b/filter/Library_xmlfd.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,xmlfd,filter/source/xmlfilterdetect/x
 
 $(eval $(call gb_Library_use_sdk_api,xmlfd))
 
-$(eval $(call gb_Library_set_include,xmlfd,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xmlfd,\
 	ucbhelper \
 	cppuhelper \
diff --git a/filter/Library_xsltfilter.mk b/filter/Library_xsltfilter.mk
index e3be0d7..d221bf8 100644
--- a/filter/Library_xsltfilter.mk
+++ b/filter/Library_xsltfilter.mk
@@ -23,10 +23,6 @@ $(eval $(call gb_Library_set_componentfile,xsltfilter,filter/source/xsltfilter/x
 
 $(eval $(call gb_Library_use_sdk_api,xsltfilter))
 
-$(eval $(call gb_Library_set_include,xsltfilter,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_libraries,xsltfilter,\
 	xo \
 	tl \
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index f6b6159..97264ca 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,hwp))
 
-$(eval $(call gb_Library_set_include,hwp,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,hwp))
 
 $(eval $(call gb_Library_use_libraries,hwp,\
diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk
index 70ec6c9..1197350 100644
--- a/i18npool/Executable_genconv_dict.mk
+++ b/i18npool/Executable_genconv_dict.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,genconv_dict))
 
-$(eval $(call gb_Executable_set_include,genconv_dict,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,genconv_dict,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
index 3b63cfc..7d67e1e 100644
--- a/i18npool/Executable_gendict.mk
+++ b/i18npool/Executable_gendict.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,gendict))
 
-$(eval $(call gb_Executable_set_include,gendict,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,gendict,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
index 0795b7b..6baf5d1 100644
--- a/i18npool/Executable_genindex_data.mk
+++ b/i18npool/Executable_genindex_data.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,genindex_data))
 
-$(eval $(call gb_Executable_set_include,genindex_data,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_libraries,genindex_data,\
 	sal \
 	$(gb_UWINAPI) \
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
index ba0be63..d006a80 100644
--- a/i18npool/Executable_saxparser.mk
+++ b/i18npool/Executable_saxparser.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_Executable_Executable,saxparser))
 
-$(eval $(call gb_Executable_set_include,saxparser,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_sdk_api,saxparser))
 
 $(eval $(call gb_Executable_use_libraries,saxparser,\
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
index f7cd5fc..9a91a50 100644
--- a/i18npool/Library_i18nsearch.mk
+++ b/i18npool/Library_i18nsearch.mk
@@ -32,10 +32,6 @@ $(eval $(call gb_Library_use_package,i18nsearch,i18npool_inc))
 
 $(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
 
-$(eval $(call gb_Library_set_include,i18nsearch,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,i18nsearch))
 
 $(eval $(call gb_Library_use_externals,i18nsearch,\
diff --git a/ios/Executable_Viewer.mk b/ios/Executable_Viewer.mk
index 1931b54..e982534 100644
--- a/ios/Executable_Viewer.mk
+++ b/ios/Executable_Viewer.mk
@@ -12,10 +12,6 @@ $(eval $(call gb_Executable_use_externals,Viewer,\
     zlib \
 ))
 
-$(eval $(call gb_Executable_set_include,Viewer,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_system_darwin_frameworks,Viewer,\
     Foundation \
     CoreFoundation \
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index c6f2a78..7966c10 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,lwpft))
 
-$(eval $(call gb_Library_set_include,lwpft,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,lwpft))
 
 $(eval $(call gb_Library_use_libraries,lwpft,\
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index 25fa903..5ea6a3a 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -19,10 +19,6 @@
 
 $(eval $(call gb_Executable_Executable,spadmin.bin))
 
-$(eval $(call gb_Executable_set_include,spadmin.bin,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_external,spadmin.bin,boost_headers))
 
 $(eval $(call gb_Executable_use_static_libraries,spadmin.bin,\
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 701b377..1b9043e 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Library_Library,OGLTrans))
 
-$(eval $(call gb_Library_set_include,OGLTrans,\
-    $$(INCLUDE) \
-))
-
 ifeq ($(strip $(VERBOSE)),TRUE)
 $(eval $(call gb_Library_add_defs,OGLTrans,\
     -DVERBOSE \
diff --git a/svx/Executable_gengal.bin.mk b/svx/Executable_gengal.bin.mk
index 10955f9..e6613e5 100644
--- a/svx/Executable_gengal.bin.mk
+++ b/svx/Executable_gengal.bin.mk
@@ -35,10 +35,6 @@ $(eval $(call gb_Executable_set_include,$(svx_GENGALBIN),\
     -I$(OUTDIR)/inc/offapi \
 ))
 
-$(eval $(call gb_Executable_add_cxxflags,$(svx_GENGALBIN),\
-    $$(CXXFLAGS) \
-))
-
 $(eval $(call gb_Executable_use_external,$(svx_GENGALBIN),boost_headers))
 
 $(eval $(call gb_Executable_use_libraries,$(svx_GENGALBIN),\
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 2ef670e..ccbd292 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -21,10 +21,6 @@ $(eval $(call gb_Library_Library,unordf))
 
 $(eval $(call gb_Library_set_componentfile,unordf,unoxml/source/rdf/unordf))
 
-$(eval $(call gb_Library_set_include,unordf,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,unordf))
 
 $(eval $(call gb_Library_use_libraries,unordf,\
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index a974c33..df7b2b4 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -21,10 +21,6 @@ $(eval $(call gb_Library_Library,unoxml))
 
 $(eval $(call gb_Library_set_componentfile,unoxml,unoxml/source/service/unoxml))
 
-$(eval $(call gb_Library_set_include,unoxml,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_sdk_api,unoxml))
 
 $(eval $(call gb_Library_use_libraries,unoxml,\
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index 40b4c94..d4bbc08 100644
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -35,11 +35,6 @@ $(eval $(call gb_Library_Library,msforms))
 # in case UNO services are exported: declare location of component file
 $(eval $(call gb_Library_set_componentfile,msforms,vbahelper/util/msforms))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,msforms,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_use_external,msforms,boost_headers))
 
 $(eval $(call gb_Library_use_api,msforms,\
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 0537489..1233c5b 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -33,11 +33,6 @@ $(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))
 
-# add any additional include paths for this library here
-$(eval $(call gb_Library_set_include,vbahelper,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Library_add_defs,vbahelper,\
     -DVBAHELPER_DLLIMPLEMENTATION \
 ))
diff --git a/vcl/Executable_ui-previewer.mk b/vcl/Executable_ui-previewer.mk
index 71ed93c..1629c59 100644
--- a/vcl/Executable_ui-previewer.mk
+++ b/vcl/Executable_ui-previewer.mk
@@ -27,10 +27,6 @@
 
 $(eval $(call gb_Executable_Executable,ui-previewer))
 
-$(eval $(call gb_Executable_set_include,ui-previewer,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_use_external,ui-previewer,boost_headers))
 
 $(eval $(call gb_Executable_use_api,ui-previewer,\
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
index c42e024..48c4b26 100644
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -28,10 +28,6 @@
 
 $(eval $(call gb_CppunitTest_CppunitTest,xmlsecurity_qa_certext))
 
-$(eval $(call gb_CppunitTest_set_include,xmlsecurity_qa_certext,\
-	$$(INCLUDE) \
-))
-
 $(eval $(call gb_CppunitTest_use_api,xmlsecurity_qa_certext,\
 	offapi \
 	udkapi \
commit a53586f4efe26b8875107d04001f4ecec760c343
Author: Michael Stahl <mstahl at redhat.com>
Date:   Sat Jan 26 21:19:13 2013 +0100

    gbuild: do not copy boost headers around
    
    - do not use gb_UnpackedTarball_copy_header_files for boost
    - adapt the optimization in concat-deps.c for new path
    - use boost_headers in all LinkTargets that require it
    - add explicit include paths to mysqlc, mysqlcppconn, libvisio, liborcus
    
    Change-Id: I0c43e73ed43cc9d2e6bce8faf55e992d655a0bb9

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index dbdf4a9..aa73937 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -476,6 +476,10 @@ endef
 
 define gb_LinkTarget__use_boost_headers
 $(call gb_LinkTarget_use_unpacked,$(1),boost)
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,boost) \
+	$$(INCLUDE) \
+)
 
 endef
 
diff --git a/accessibility/Library_acc.mk b/accessibility/Library_acc.mk
index d0a0e36..2c1bda1 100644
--- a/accessibility/Library_acc.mk
+++ b/accessibility/Library_acc.mk
@@ -33,6 +33,8 @@ $(eval $(call gb_Library_set_include,acc,\
     -I$(SRCDIR)/accessibility/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,acc,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,acc))
 
 $(eval $(call gb_Library_use_libraries,acc,\
diff --git a/accessibility/Library_java_uno_accessbridge.mk b/accessibility/Library_java_uno_accessbridge.mk
index 3b4c27c..b9eec59 100644
--- a/accessibility/Library_java_uno_accessbridge.mk
+++ b/accessibility/Library_java_uno_accessbridge.mk
@@ -29,6 +29,8 @@ $(eval $(call gb_Library_Library,java_uno_accessbridge))
 
 $(eval $(call gb_Library_use_custom_headers,java_uno_accessbridge,accessibility/bridge/inc))
 
+$(eval $(call gb_Library_use_external,java_uno_accessbridge,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,java_uno_accessbridge,))
 
 $(eval $(call gb_Library_use_libraries,java_uno_accessbridge,\
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 9f4d5b4..5a50d94d 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -28,6 +28,8 @@
 
 $(eval $(call gb_Library_Library,animcore))
 
+$(eval $(call gb_Library_use_external,animcore,boost_headers))
+
 $(eval $(call gb_Library_use_packages,animcore,\
 	animations_inc \
 	comphelper_inc \
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 2dfd7c6..f77da34 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -44,6 +44,8 @@ $(eval $(call gb_Library_add_defs,avmedia,\
 	-DAVMEDIA_DLLIMPLEMENTATION \
 ))
 
+$(eval $(call gb_Library_use_external,avmedia,boost_headers))
+
 $(eval $(call gb_Library_use_libraries,avmedia,\
 	comphelper \
 	ucbhelper \
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index defe843..0e72034 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -35,6 +35,8 @@ $(eval $(call gb_Library_set_include,avmediaQuickTime,\
 	-I$(SRCDIR)/avmedia/source/inc \
 ))
 
+$(eval $(call gb_Library_use_external,avmediaQuickTime,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,avmediaQuickTime));
 
 $(eval $(call gb_Library_use_libraries,avmediaQuickTime,\
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 1e0b5fc..3ea54e8 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -37,6 +37,8 @@ $(eval $(call gb_Library_set_include,avmediagst,\
 ))
 $(eval $(call gb_Library_add_libs,avmediagst,$(GSTREAMER_LIBS)))
 
+$(eval $(call gb_Library_use_external,avmediagst,boost_headers))
+
 $(eval $(call gb_Library_use_sdk_api,avmediagst))
 
 ifeq ($(OS),WNT)
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk

... etc. - the rest is truncated

• Previous message: [Libreoffice-commits] .: 3 commits - helpers/help_hid.lst source/text
• Next message: [Libreoffice-commits] .: Branch 'libreoffice-4-0-0' - sc/source
• Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]