summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2011-08-10 02:12:48 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2011-08-10 02:12:48 +0900
commitb2bd33ea253952ad3f8b4bfe4bd54c4af16cb86e (patch)
tree917d451d8a797dc7547c5872bc5cfe52f07857dd
parentc6043980bbc36d58e1ce63b7a97c66774cd6de06 (diff)
prefer makefile-gmake-mode to plain makefile-mode
-rw-r--r--GNUmakefile.mk2
-rw-r--r--Module_tail_build.mk2
-rw-r--r--Repository.mk2
-rw-r--r--RepositoryExternal.mk2
-rw-r--r--RepositoryFixes.mk2
-rw-r--r--RepositoryModule_ooo.mk2
-rw-r--r--animations/Library_animcore.mk2
-rw-r--r--animations/Module_animations.mk2
-rw-r--r--animations/Package_inc.mk2
-rw-r--r--animations/Package_xml.mk2
-rw-r--r--basctl/AllLangResTarget_basctl.mk2
-rw-r--r--basctl/Library_basctl.mk2
-rw-r--r--basctl/Module_basctl.mk2
-rw-r--r--basctl/Package_xml.mk2
-rw-r--r--basebmp/CppunitTest_basebmp.mk2
-rw-r--r--basebmp/Executable_basebmp_cppunittester_all.mk2
-rw-r--r--basebmp/Library_basebmp.mk2
-rw-r--r--basebmp/Module_basebmp.mk2
-rw-r--r--basebmp/Package_inc.mk2
-rw-r--r--basegfx/CppunitTest_basegfx.mk2
-rw-r--r--basegfx/Executable_basegfx_cppunittester_all.mk2
-rw-r--r--basegfx/Library_basegfx.mk2
-rw-r--r--basegfx/Module_basegfx.mk2
-rw-r--r--basegfx/Package_inc.mk2
-rw-r--r--basegfx/StaticLibrary_basegfx_s.mk2
-rw-r--r--basic/AllLangResTarget_sb.mk2
-rw-r--r--basic/AllLangResTarget_stt.mk2
-rw-r--r--basic/Library_sb.mk2
-rw-r--r--basic/Module_basic.mk2
-rw-r--r--basic/Package_inc.mk2
-rw-r--r--basic/StaticLibrary_app.mk2
-rw-r--r--basic/StaticLibrary_sample.mk2
-rw-r--r--canvas/Library_cairocanvas.mk2
-rw-r--r--canvas/Library_canvasfactory.mk2
-rw-r--r--canvas/Library_canvastools.mk2
-rw-r--r--canvas/Library_directx5canvas.mk2
-rw-r--r--canvas/Library_directx9canvas.mk2
-rw-r--r--canvas/Library_gdipluscanvas.mk2
-rw-r--r--canvas/Library_nullcanvas.mk2
-rw-r--r--canvas/Library_simplecanvas.mk2
-rw-r--r--canvas/Library_vclcanvas.mk2
-rw-r--r--canvas/Module_canvas.mk2
-rw-r--r--canvas/Package_inc.mk2
-rw-r--r--chart2/AllLangResTarget_chartcontroller.mk2
-rw-r--r--chart2/JunitTest_chart2_unoapi.mk2
-rw-r--r--chart2/Library_chartcontroller.mk2
-rw-r--r--chart2/Library_chartmodel.mk2
-rw-r--r--chart2/Library_charttools.mk2
-rw-r--r--chart2/Library_chartview.mk2
-rw-r--r--chart2/Module_chart2.mk2
-rw-r--r--chart2/Package_uiconfig.mk2
-rw-r--r--comphelper/JunitTest_comphelper_complex.mk2
-rw-r--r--comphelper/Library_comphelp.mk2
-rw-r--r--comphelper/Module_comphelper.mk2
-rw-r--r--comphelper/Package_inc.mk2
-rw-r--r--configmgr/JunitTest_configmgr_unoapi.mk2
-rw-r--r--configmgr/Module_configmgr.mk2
-rw-r--r--cppcanvas/Library_cppcanvas.mk2
-rw-r--r--cppcanvas/Library_mtfrenderer.mk2
-rw-r--r--cppcanvas/Module_cppcanvas.mk2
-rw-r--r--cppcanvas/Package_inc.mk2
-rw-r--r--cui/AllLangResTarget_cui.mk2
-rw-r--r--cui/Library_cui.mk2
-rw-r--r--cui/Module_cui.mk2
-rw-r--r--dbaccess/AllLangResTarget_adabasui.mk2
-rw-r--r--dbaccess/AllLangResTarget_dba.mk2
-rw-r--r--dbaccess/AllLangResTarget_dbmm.mk2
-rw-r--r--dbaccess/AllLangResTarget_dbu.mk2
-rw-r--r--dbaccess/AllLangResTarget_dbui.mk2
-rw-r--r--dbaccess/AllLangResTarget_sdbt.mk2
-rw-r--r--dbaccess/Executable_odbcconfig.mk2
-rw-r--r--dbaccess/JunitTest_dbaccess_complex.mk2
-rw-r--r--dbaccess/JunitTest_dbaccess_unoapi.mk2
-rw-r--r--dbaccess/Library_adabasui.mk2
-rw-r--r--dbaccess/Library_dba.mk2
-rw-r--r--dbaccess/Library_dbaxml.mk2
-rw-r--r--dbaccess/Library_dbmm.mk2
-rw-r--r--dbaccess/Library_dbu.mk2
-rw-r--r--dbaccess/Library_dbui.mk2
-rw-r--r--dbaccess/Library_sdbt.mk2
-rw-r--r--dbaccess/Module_dbaccess.mk2
-rw-r--r--dbaccess/Package_inc.mk2
-rw-r--r--dbaccess/Package_uiconfig.mk2
-rw-r--r--dbaccess/Package_xml.mk2
-rw-r--r--drawinglayer/Library_drawinglayer.mk2
-rw-r--r--drawinglayer/Module_drawinglayer.mk2
-rw-r--r--drawinglayer/Package_inc.mk2
-rw-r--r--dtrans/Library_dnd.mk2
-rw-r--r--dtrans/Library_dtrans.mk2
-rw-r--r--dtrans/Library_ftransl.mk2
-rw-r--r--dtrans/Library_mcnttype.mk2
-rw-r--r--dtrans/Library_sysdtrans.mk2
-rw-r--r--dtrans/Makefile2
-rw-r--r--dtrans/Module_dtrans.mk2
-rw-r--r--dtrans/Package_xml.mk2
-rw-r--r--dtrans/StaticLibrary_dtobj.mk2
-rw-r--r--editeng/AllLangResTarget_editeng.mk2
-rw-r--r--editeng/CppunitTest_editeng_borderline.mk2
-rw-r--r--editeng/Library_editeng.mk2
-rw-r--r--[-rwxr-xr-x]editeng/Makefile0
-rw-r--r--editeng/Module_editeng.mk2
-rw-r--r--editeng/Package_inc.mk2
-rw-r--r--fileaccess/Library_fileacc.mk2
-rw-r--r--fileaccess/Module_fileaccess.mk2
-rw-r--r--forms/AllLangResTarget_frm.mk2
-rw-r--r--forms/JunitTest_forms_complex.mk2
-rw-r--r--forms/JunitTest_forms_unoapi.mk2
-rw-r--r--forms/Library_frm.mk2
-rw-r--r--forms/Module_forms.mk2
-rw-r--r--forms/Package_unotypes.mk2
-rw-r--r--formula/AllLangResTarget_for.mk2
-rw-r--r--formula/AllLangResTarget_forui.mk2
-rw-r--r--formula/Library_for.mk2
-rw-r--r--formula/Library_forui.mk2
-rw-r--r--formula/Module_formula.mk2
-rw-r--r--formula/Package_inc.mk2
-rw-r--r--framework/AllLangResTarget_fwe.mk2
-rw-r--r--framework/JunitTest_framework_complex.mk2
-rw-r--r--framework/JunitTest_framework_unoapi.mk2
-rw-r--r--framework/Library_fwe.mk2
-rw-r--r--framework/Library_fwi.mk2
-rw-r--r--framework/Library_fwk.mk2
-rw-r--r--framework/Library_fwl.mk2
-rw-r--r--framework/Library_fwm.mk2
-rw-r--r--framework/Library_lomenubar.mk2
-rw-r--r--framework/Module_framework.mk2
-rw-r--r--framework/Package_dtd.mk2
-rw-r--r--framework/Package_inc.mk2
-rw-r--r--framework/Package_uiconfig.mk2
-rw-r--r--framework/Package_unotypes.mk2
-rw-r--r--hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk2
-rw-r--r--hwpfilter/Library_hwp.mk2
-rw-r--r--hwpfilter/Module_hwpfilter.mk2
-rw-r--r--idl/Executable_svidl.mk2
-rw-r--r--idl/Module_idl.mk2
-rw-r--r--linguistic/JunitTest_linguistic_complex.mk2
-rw-r--r--linguistic/JunitTest_linguistic_unoapi.mk2
-rw-r--r--linguistic/Library_lng.mk2
-rw-r--r--linguistic/Module_linguistic.mk2
-rw-r--r--linguistic/Package_inc.mk2
-rw-r--r--lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk2
-rw-r--r--lotuswordpro/Library_lwpft.mk2
-rw-r--r--lotuswordpro/Module_lotuswordpro.mk2
-rw-r--r--offapi/Module_offapi.mk2
-rw-r--r--offapi/Package_offapi_idl.mk2
-rw-r--r--offapi/Package_offapi_inc.mk2
-rw-r--r--offapi/UnoApi_offapi.mk2
-rw-r--r--offapi/UnoApi_types.mk2
-rw-r--r--oovbaapi/Module_oovbaapi.mk2
-rw-r--r--oovbaapi/Package_oovbaapi_idl.mk2
-rw-r--r--oovbaapi/Package_oovbaapi_inc.mk2
-rw-r--r--oovbaapi/UnoApi_oovbaapi.mk2
-rw-r--r--oox/Library_oox.mk2
-rw-r--r--oox/Module_oox.mk2
-rw-r--r--oox/Package_generated.mk2
-rw-r--r--oox/Package_inc.mk2
-rw-r--r--oox/Package_source.mk2
-rw-r--r--oox/Package_tokens.mk2
-rw-r--r--padmin/AllLangResTarget_spa.mk2
-rw-r--r--padmin/Executable_spadmin.bin.mk2
-rw-r--r--padmin/Library_spa.mk2
-rw-r--r--padmin/Module_padmin.mk2
-rw-r--r--padmin/Package_inc.mk2
-rw-r--r--qadevOOo/JunitTest_qadevOOo_unoapi.mk2
-rw-r--r--qadevOOo/Module_qadevOOo.mk2
-rw-r--r--regexp/Library_regexp.mk2
-rw-r--r--regexp/Module_regexp.mk2
-rw-r--r--regexp/Package_inc.mk2
-rw-r--r--reportdesign/AllLangResTarget_rpt.mk2
-rw-r--r--reportdesign/AllLangResTarget_rptui.mk2
-rw-r--r--reportdesign/JunitTest_reportdesign_complex.mk2
-rw-r--r--reportdesign/Library_rpt.mk2
-rw-r--r--reportdesign/Library_rptui.mk2
-rw-r--r--reportdesign/Library_rptxml.mk2
-rw-r--r--reportdesign/Module_reportdesign.mk2
-rw-r--r--reportdesign/Package_uiconfig.mk2
-rw-r--r--rsc/Executable_rsc.mk2
-rw-r--r--rsc/Makefile2
-rw-r--r--rsc/Module_rsc.mk2
-rw-r--r--rsc/Package_inc.mk2
-rw-r--r--rsc/Package_yacc.mk2
-rw-r--r--rsc/source/parser/Makefile2
-rw-r--r--sal/CppunitTest_sal_osl_mutex.mk2
-rw-r--r--sal/CppunitTest_sal_osl_pipe.mk2
-rw-r--r--sal/CppunitTest_sal_osl_profile.mk2
-rw-r--r--sal/CppunitTest_sal_osl_setthreadname.mk2
-rw-r--r--sal/CppunitTest_sal_rtl_math.mk2
-rw-r--r--sal/Module_sal.mk2
-rw-r--r--sax/CppunitTest_sax.mk2
-rw-r--r--sax/Executable_sax_cppunittester_all.mk2
-rw-r--r--sax/Library_expwrap.mk2
-rw-r--r--sax/Library_fastsax.mk2
-rw-r--r--sax/Library_sax.mk2
-rw-r--r--sax/Module_sax.mk2
-rw-r--r--sax/Package_inc.mk2
-rw-r--r--sc/AllLangResTarget_sc.mk2
-rw-r--r--sc/CppunitTest_sc_test_filters.mk2
-rw-r--r--sc/CppunitTest_sc_ucalc.mk2
-rw-r--r--sc/Library_sc.mk2
-rw-r--r--sc/Library_scd.mk2
-rw-r--r--sc/Library_scfilt.mk2
-rw-r--r--sc/Library_scui.mk2
-rw-r--r--sc/Library_vbaobj.mk2
-rw-r--r--sc/Module_sc.mk2
-rw-r--r--sc/Package_uiconfig.mk2
-rw-r--r--sc/Package_xml.mk2
-rw-r--r--scaddins/AllLangResTarget_analysis.mk2
-rw-r--r--scaddins/AllLangResTarget_date.mk2
-rw-r--r--scaddins/Library_analysis.mk2
-rw-r--r--scaddins/Library_date.mk2
-rw-r--r--scaddins/Module_scaddins.mk2
-rw-r--r--sccomp/AllLangResTarget_solver.mk2
-rw-r--r--sccomp/Library_solver.mk2
-rw-r--r--sccomp/Module_sccomp.mk2
-rw-r--r--sd/AllLangResTarget_sd.mk2
-rw-r--r--sd/CppunitTest_sd_uimpress.mk2
-rw-r--r--sd/JunitTest_sd_unoapi.mk2
-rw-r--r--sd/Library_sd.mk2
-rw-r--r--sd/Library_sdd.mk2
-rw-r--r--sd/Library_sdfilt.mk2
-rw-r--r--sd/Library_sdui.mk2
-rw-r--r--sd/Module_sd.mk2
-rw-r--r--sd/Package_inc.mk2
-rw-r--r--sd/Package_uiconfig.mk2
-rw-r--r--sd/Package_web.mk2
-rw-r--r--sd/Package_xml.mk2
-rw-r--r--sfx2/AllLangResTarget_sfx2.mk2
-rw-r--r--sfx2/CppunitTest_sfx2_metadatable.mk2
-rw-r--r--sfx2/JunitTest_sfx2_complex.mk2
-rw-r--r--sfx2/JunitTest_sfx2_unoapi.mk2
-rw-r--r--sfx2/Library_qstart.mk2
-rw-r--r--sfx2/Library_sfx.mk2
-rw-r--r--[-rwxr-xr-x]sfx2/Makefile0
-rw-r--r--sfx2/Module_sfx2.mk2
-rw-r--r--sfx2/Package_inc.mk2
-rw-r--r--sfx2/Package_sdi.mk2
-rw-r--r--slideshow/CppunitTest_slideshow.mk2
-rw-r--r--slideshow/Executable_demoshow.mk2
-rw-r--r--slideshow/Library_OGLTrans.mk2
-rw-r--r--slideshow/Library_slideshow.mk2
-rw-r--r--slideshow/Module_slideshow.mk2
-rw-r--r--solenv/gbuild/AllLangResTarget.mk2
-rw-r--r--solenv/gbuild/BuildDirs.mk2
-rw-r--r--solenv/gbuild/ComponentTarget.mk2
-rw-r--r--solenv/gbuild/CppunitTest.mk2
-rw-r--r--solenv/gbuild/CustomTarget.mk2
-rw-r--r--solenv/gbuild/Deliver.mk2
-rw-r--r--solenv/gbuild/Executable.mk2
-rw-r--r--solenv/gbuild/Helper.mk2
-rw-r--r--solenv/gbuild/Jar.mk2
-rw-r--r--solenv/gbuild/JavaClassSet.mk2
-rw-r--r--solenv/gbuild/JunitTest.mk2
-rw-r--r--solenv/gbuild/Library.mk2
-rw-r--r--solenv/gbuild/LinkTarget.mk2
-rw-r--r--solenv/gbuild/Module.mk2
-rw-r--r--solenv/gbuild/Output.mk2
-rw-r--r--solenv/gbuild/Package.mk2
-rw-r--r--solenv/gbuild/PrecompiledHeaders.mk2
-rw-r--r--solenv/gbuild/RdbTarget.mk2
-rw-r--r--solenv/gbuild/SdiTarget.mk2
-rw-r--r--solenv/gbuild/StaticLibrary.mk2
-rw-r--r--solenv/gbuild/TargetLocations.mk2
-rw-r--r--solenv/gbuild/Tempfile.mk2
-rw-r--r--solenv/gbuild/UnoApiTarget.mk2
-rw-r--r--solenv/gbuild/WinResTarget.mk2
-rw-r--r--solenv/gbuild/Zip.mk2
-rw-r--r--solenv/gbuild/gbuild.mk2
-rw-r--r--solenv/gbuild/gbuild_simple.mk2
-rw-r--r--solenv/gbuild/platform/android.mk2
-rw-r--r--solenv/gbuild/platform/dragonfly.mk2
-rw-r--r--solenv/gbuild/platform/freebsd.mk2
-rw-r--r--solenv/gbuild/platform/ios.mk2
-rw-r--r--solenv/gbuild/platform/linux-ARM.mk2
-rw-r--r--solenv/gbuild/platform/linux-AXP.mk2
-rw-r--r--solenv/gbuild/platform/linux-GODSON.mk2
-rw-r--r--solenv/gbuild/platform/linux-HPPA.mk2
-rw-r--r--solenv/gbuild/platform/linux-IA64.mk2
-rw-r--r--solenv/gbuild/platform/linux-INTEL.mk2
-rw-r--r--solenv/gbuild/platform/linux-M68K.mk2
-rw-r--r--solenv/gbuild/platform/linux-POWERPC.mk2
-rw-r--r--solenv/gbuild/platform/linux-POWERPC64.mk2
-rw-r--r--solenv/gbuild/platform/linux-S390.mk2
-rw-r--r--solenv/gbuild/platform/linux-S390X.mk2
-rw-r--r--solenv/gbuild/platform/linux-SPARC.mk2
-rw-r--r--solenv/gbuild/platform/linux-X86_64.mk2
-rw-r--r--solenv/gbuild/platform/linux.mk2
-rw-r--r--solenv/gbuild/platform/macosx.mk2
-rw-r--r--solenv/gbuild/platform/netbsd.mk2
-rw-r--r--solenv/gbuild/platform/openbsd.mk2
-rw-r--r--solenv/gbuild/platform/solaris.mk2
-rw-r--r--solenv/gbuild/platform/unxgcc.mk2
-rw-r--r--solenv/gbuild/platform/windows.mk2
-rw-r--r--solenv/gbuild/platform/winmingw.mk2
-rw-r--r--sot/JunitTest_sot_complex.mk2
-rw-r--r--sot/Library_sot.mk2
-rw-r--r--sot/Module_sot.mk2
-rw-r--r--sot/Package_inc.mk2
-rw-r--r--starmath/AllLangResTarget_sm.mk2
-rw-r--r--starmath/CppunitTest_starmath_qa_cppunit.mk2
-rw-r--r--starmath/JunitTest_sm_unoapi.mk2
-rw-r--r--starmath/JunitTest_starmath_unoapi.mk2
-rw-r--r--starmath/Library_sm.mk2
-rw-r--r--starmath/Library_smd.mk2
-rw-r--r--starmath/Module_starmath.mk2
-rw-r--r--starmath/Package_uiconfig.mk2
-rw-r--r--svl/AllLangResTarget_svl.mk2
-rw-r--r--svl/JunitTest_svl_complex.mk2
-rw-r--r--svl/Library_fsstorage.mk2
-rw-r--r--svl/Library_passwordcontainer.mk2
-rw-r--r--svl/Library_svl.mk2
-rw-r--r--svl/Module_svl.mk2
-rw-r--r--svl/Package_inc.mk2
-rw-r--r--svtools/AllLangResTarget_productregistration.mk2
-rw-r--r--svtools/AllLangResTarget_svt.mk2
-rw-r--r--svtools/CppunitTest_svtools_filters_test.mk2
-rw-r--r--svtools/Executable_bmp.mk2
-rw-r--r--svtools/Executable_bmpsum.mk2
-rw-r--r--svtools/Executable_g2g.mk2
-rw-r--r--svtools/JunitTest_svtools_unoapi.mk2
-rw-r--r--svtools/Library_hatchwindowfactory.mk2
-rw-r--r--svtools/Library_productregistration.mk2
-rw-r--r--svtools/Library_svt.mk2
-rw-r--r--svtools/Module_svtools.mk2
-rw-r--r--svtools/Package_inc.mk2
-rw-r--r--svx/AllLangResTarget_gal.mk2
-rw-r--r--svx/AllLangResTarget_ofa.mk2
-rw-r--r--svx/AllLangResTarget_svx.mk2
-rw-r--r--svx/AllLangResTarget_textconversiondlgs.mk2
-rw-r--r--svx/JunitTest_svx_unoapi.mk2
-rw-r--r--svx/Library_svx.mk2
-rw-r--r--svx/Library_svxcore.mk2
-rw-r--r--svx/Library_textconversiondlgs.mk2
-rw-r--r--svx/Module_svx.mk2
-rw-r--r--svx/Package_inc.mk2
-rw-r--r--svx/Package_sdi.mk2
-rw-r--r--sw/AllLangResTarget_sw.mk2
-rw-r--r--sw/CppunitTest_sw_swdoc_test.mk2
-rw-r--r--sw/CppunitTest_sw_test_filters.mk2
-rw-r--r--sw/JunitTest_sw_complex.mk2
-rw-r--r--sw/JunitTest_sw_unoapi.mk2
-rw-r--r--sw/Library_msword.mk2
-rw-r--r--sw/Library_sw.mk2
-rw-r--r--sw/Library_swd.mk2
-rw-r--r--sw/Library_swui.mk2
-rw-r--r--sw/Library_vbaswobj.mk2
-rw-r--r--sw/Module_sw.mk2
-rw-r--r--sw/Package_misc.mk2
-rw-r--r--sw/Package_uiconfig.mk2
-rw-r--r--sw/Package_xml.mk2
-rw-r--r--toolkit/AllLangResTarget_tk.mk2
-rw-r--r--toolkit/JunitTest_toolkit_unoapi.mk2
-rw-r--r--toolkit/Library_tk.mk2
-rw-r--r--toolkit/Module_toolkit.mk2
-rw-r--r--toolkit/Package_inc.mk2
-rw-r--r--toolkit/Package_source.mk2
-rw-r--r--toolkit/Package_util.mk2
-rw-r--r--tools/CppunitTest_tools_test.mk2
-rw-r--r--tools/Executable_bestreversemap.mk2
-rw-r--r--tools/Executable_mkunroll.mk2
-rw-r--r--tools/Executable_rscdep.mk2
-rw-r--r--tools/Executable_so_checksum.mk2
-rw-r--r--tools/Executable_tools_cppunittester_all.mk2
-rw-r--r--tools/Library_tl.mk2
-rw-r--r--tools/Module_tools.mk2
-rw-r--r--tools/Package_inc.mk2
-rw-r--r--tools/Package_reversemap.mk2
-rw-r--r--tools/StaticLibrary_ooopathutils.mk2
-rw-r--r--tools/StaticLibrary_toolshelpers.mk2
-rw-r--r--ucb/JunitTest_ucb_complex.mk2
-rw-r--r--ucb/JunitTest_ucb_unoapi.mk2
-rw-r--r--ucb/Module_ucb.mk2
-rw-r--r--ucbhelper/Library_ucbhelper.mk2
-rw-r--r--ucbhelper/Module_ucbhelper.mk2
-rw-r--r--ucbhelper/Package_inc.mk2
-rw-r--r--udkapi/Module_udkapi.mk2
-rw-r--r--udkapi/Package_udkapi_idl.mk2
-rw-r--r--udkapi/Package_udkapi_inc.mk2
-rw-r--r--udkapi/UnoApi_udkapi.mk2
-rw-r--r--udkapi/UnoApi_uretypes.mk2
-rw-r--r--unotools/JunitTest_unotools_complex.mk2
-rw-r--r--unotools/Library_utl.mk2
-rw-r--r--unotools/Module_unotools.mk2
-rw-r--r--unotools/Package_inc.mk2
-rw-r--r--unoxml/JunitTest_unordf_complex.mk2
-rw-r--r--unoxml/JunitTest_unoxml_complex.mk2
-rw-r--r--unoxml/Library_unordf.mk2
-rw-r--r--unoxml/Library_unoxml.mk2
-rw-r--r--unoxml/Module_unoxml.mk2
-rw-r--r--vbahelper/Library_msforms.mk2
-rw-r--r--vbahelper/Library_vbahelper.mk2
-rw-r--r--[-rwxr-xr-x]vbahelper/Makefile0
-rw-r--r--vbahelper/Module_vbahelper.mk2
-rw-r--r--vbahelper/Package_inc.mk2
-rw-r--r--vcl/AllLangResTarget_vcl.mk2
-rw-r--r--vcl/Library_desktop_detector.mk2
-rw-r--r--vcl/Library_vcl.mk2
-rw-r--r--vcl/Library_vclplug_gen.mk2
-rw-r--r--vcl/Library_vclplug_gtk.mk2
-rw-r--r--vcl/Library_vclplug_gtk3.mk2
-rw-r--r--vcl/Library_vclplug_kde.mk2
-rw-r--r--vcl/Library_vclplug_kde4.mk2
-rw-r--r--vcl/Library_vclplug_svp.mk2
-rw-r--r--vcl/Module_vcl.mk2
-rw-r--r--vcl/Package_afmhash.mk2
-rw-r--r--vcl/Package_inc.mk2
-rw-r--r--vcl/Package_kde4moc.mk2
-rw-r--r--vcl/Package_osx.mk2
-rw-r--r--vcl/StaticLibrary_vclmain.mk2
-rw-r--r--vcl/WinResTarget_vcl.mk2
-rw-r--r--wizards/AllLangResTarget_cal.mk2
-rw-r--r--wizards/AllLangResTarget_dbw.mk2
-rw-r--r--wizards/AllLangResTarget_eur.mk2
-rw-r--r--wizards/AllLangResTarget_imp.mk2
-rw-r--r--wizards/AllLangResTarget_tpl.mk2
-rw-r--r--wizards/AllLangResTarget_wwz.mk2
-rw-r--r--wizards/AllLangResTarget_wzi.mk2
-rw-r--r--wizards/Jar_agenda.mk2
-rw-r--r--wizards/Jar_commonwizards.mk2
-rw-r--r--wizards/Jar_fax.mk2
-rw-r--r--wizards/Jar_form.mk2
-rw-r--r--wizards/Jar_letter.mk2
-rw-r--r--wizards/Jar_query.mk2
-rw-r--r--wizards/Jar_report.mk2
-rw-r--r--wizards/Jar_reportbuilder.mk2
-rw-r--r--wizards/Jar_table.mk2
-rw-r--r--wizards/Jar_web.mk2
-rw-r--r--wizards/Module_wizards.mk2
-rw-r--r--wizards/Zip_depot.mk2
-rw-r--r--wizards/Zip_euro.mk2
-rw-r--r--wizards/Zip_form.mk2
-rw-r--r--wizards/Zip_gimmicks.mk2
-rw-r--r--wizards/Zip_import.mk2
-rw-r--r--wizards/Zip_launcher.mk2
-rw-r--r--wizards/Zip_schedule.mk2
-rw-r--r--wizards/Zip_share.mk2
-rw-r--r--wizards/Zip_standard.mk2
-rw-r--r--wizards/Zip_template.mk2
-rw-r--r--wizards/Zip_tools.mk2
-rw-r--r--wizards/Zip_tutorials.mk2
-rw-r--r--wizards/Zip_usr.mk2
-rw-r--r--wizards/Zip_web.mk2
-rw-r--r--writerfilter/CppunitTest_writerfilter_doctok.mk2
-rw-r--r--writerfilter/CppunitTest_writerfilter_rtftok.mk2
-rw-r--r--writerfilter/JunitTest_writerfilter_complex.mk2
-rw-r--r--writerfilter/Library_doctok.mk2
-rw-r--r--writerfilter/Library_ooxml.mk2
-rw-r--r--writerfilter/Library_resourcemodel.mk2
-rw-r--r--writerfilter/Library_rtftok.mk2
-rw-r--r--writerfilter/Library_writerfilter.mk2
-rw-r--r--writerfilter/Library_writerfilter_uno.mk2
-rw-r--r--[-rwxr-xr-x]writerfilter/Makefile0
-rw-r--r--writerfilter/Module_writerfilter.mk2
-rw-r--r--writerfilter/Package_writerfilter_generated.mk2
-rw-r--r--writerperfect/Library_msworks.mk2
-rw-r--r--writerperfect/Library_visioimport.mk2
-rw-r--r--writerperfect/Library_wpft.mk2
-rw-r--r--writerperfect/Library_wpgimport.mk2
-rw-r--r--writerperfect/Module_writerperfect.mk2
-rw-r--r--writerperfect/StaticLibrary_writerperfect.mk2
-rw-r--r--xmloff/JunitTest_xmloff_unoapi.mk2
-rw-r--r--xmloff/Library_xo.mk2
-rw-r--r--xmloff/Library_xof.mk2
-rw-r--r--[-rwxr-xr-x]xmloff/Makefile0
-rw-r--r--xmloff/Module_xmloff.mk2
-rw-r--r--xmloff/Package_dtd.mk2
-rw-r--r--xmloff/Package_inc.mk2
-rw-r--r--xmlreader/Library_xmlreader.mk2
-rw-r--r--xmlreader/Module_xmlreader.mk2
-rw-r--r--xmlreader/Package_inc.mk2
-rw-r--r--xmlscript/Library_xcr.mk2
-rw-r--r--xmlscript/Module_xmlscript.mk2
-rw-r--r--xmlscript/Package_dtd.mk2
-rw-r--r--xmlscript/Package_inc.mk2
473 files changed, 468 insertions, 468 deletions
diff --git a/GNUmakefile.mk b/GNUmakefile.mk
index d2cbe23b1d9c..e25b46e61189 100644
--- a/GNUmakefile.mk
+++ b/GNUmakefile.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 6002046a3c1d..da4122bb16c6 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/Repository.mk b/Repository.mk
index fd4962871e8a..e74335153458 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 03151b80ef22..c0c97050add4 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index eb390a5bbb39..b2ec7cf033e4 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index 60c14d92a0d2..d583dd33d983 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/animations/Library_animcore.mk b/animations/Library_animcore.mk
index 962c91a78026..cbc702b72adc 100644
--- a/animations/Library_animcore.mk
+++ b/animations/Library_animcore.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/animations/Module_animations.mk b/animations/Module_animations.mk
index 468f77dd5634..66789d505591 100644
--- a/animations/Module_animations.mk
+++ b/animations/Module_animations.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/animations/Package_inc.mk b/animations/Package_inc.mk
index ebc03bfaa609..c72b909f5750 100644
--- a/animations/Package_inc.mk
+++ b/animations/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/animations/Package_xml.mk b/animations/Package_xml.mk
index 3883a7dd3fae..c97bec07db94 100644
--- a/animations/Package_xml.mk
+++ b/animations/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basctl/AllLangResTarget_basctl.mk b/basctl/AllLangResTarget_basctl.mk
index ed9c4d5a0fc4..1611f9a506e2 100644
--- a/basctl/AllLangResTarget_basctl.mk
+++ b/basctl/AllLangResTarget_basctl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index 61ea991e116f..c8069807dbf2 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basctl/Module_basctl.mk b/basctl/Module_basctl.mk
index 57ab3293f541..7ff2a7e117d8 100644
--- a/basctl/Module_basctl.mk
+++ b/basctl/Module_basctl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basctl/Package_xml.mk b/basctl/Package_xml.mk
index c20b7a87e332..c420e5391767 100644
--- a/basctl/Package_xml.mk
+++ b/basctl/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basebmp/CppunitTest_basebmp.mk b/basebmp/CppunitTest_basebmp.mk
index 7230f006f8eb..90d7de57e445 100644
--- a/basebmp/CppunitTest_basebmp.mk
+++ b/basebmp/CppunitTest_basebmp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basebmp/Executable_basebmp_cppunittester_all.mk b/basebmp/Executable_basebmp_cppunittester_all.mk
index c9511382aa55..c2cd64554e5d 100644
--- a/basebmp/Executable_basebmp_cppunittester_all.mk
+++ b/basebmp/Executable_basebmp_cppunittester_all.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/basebmp/Library_basebmp.mk b/basebmp/Library_basebmp.mk
index 1730cc276366..80b811cb5b53 100644
--- a/basebmp/Library_basebmp.mk
+++ b/basebmp/Library_basebmp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basebmp/Module_basebmp.mk b/basebmp/Module_basebmp.mk
index c6f610714bc3..b3da038c0de7 100644
--- a/basebmp/Module_basebmp.mk
+++ b/basebmp/Module_basebmp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basebmp/Package_inc.mk b/basebmp/Package_inc.mk
index 68cd37eb3f6b..eeec45f35e4e 100644
--- a/basebmp/Package_inc.mk
+++ b/basebmp/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basegfx/CppunitTest_basegfx.mk b/basegfx/CppunitTest_basegfx.mk
index df33393ef3a2..4b116e1f215c 100644
--- a/basegfx/CppunitTest_basegfx.mk
+++ b/basegfx/CppunitTest_basegfx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basegfx/Executable_basegfx_cppunittester_all.mk b/basegfx/Executable_basegfx_cppunittester_all.mk
index 08d41bb9ff84..71a2a17a1756 100644
--- a/basegfx/Executable_basegfx_cppunittester_all.mk
+++ b/basegfx/Executable_basegfx_cppunittester_all.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index 50d2add17784..ea3b2702560e 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basegfx/Module_basegfx.mk b/basegfx/Module_basegfx.mk
index af207027ac75..4c382b187452 100644
--- a/basegfx/Module_basegfx.mk
+++ b/basegfx/Module_basegfx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basegfx/Package_inc.mk b/basegfx/Package_inc.mk
index 70fd1d32cfc1..73ebd7293948 100644
--- a/basegfx/Package_inc.mk
+++ b/basegfx/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basegfx/StaticLibrary_basegfx_s.mk b/basegfx/StaticLibrary_basegfx_s.mk
index e64f5653cfd0..d79307560af3 100644
--- a/basegfx/StaticLibrary_basegfx_s.mk
+++ b/basegfx/StaticLibrary_basegfx_s.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/AllLangResTarget_sb.mk b/basic/AllLangResTarget_sb.mk
index 8362e9391d31..964ed7b289ef 100644
--- a/basic/AllLangResTarget_sb.mk
+++ b/basic/AllLangResTarget_sb.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/AllLangResTarget_stt.mk b/basic/AllLangResTarget_stt.mk
index 38b28adf952b..417729a419af 100644
--- a/basic/AllLangResTarget_stt.mk
+++ b/basic/AllLangResTarget_stt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/Library_sb.mk b/basic/Library_sb.mk
index 6bc5013e5d3e..ee96f7163258 100644
--- a/basic/Library_sb.mk
+++ b/basic/Library_sb.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/Module_basic.mk b/basic/Module_basic.mk
index 49a693406761..e7f93935b9b9 100644
--- a/basic/Module_basic.mk
+++ b/basic/Module_basic.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/Package_inc.mk b/basic/Package_inc.mk
index 2ff19beb98b7..7c0af3f9446a 100644
--- a/basic/Package_inc.mk
+++ b/basic/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/StaticLibrary_app.mk b/basic/StaticLibrary_app.mk
index 3166775e04b9..15b7c17f1150 100644
--- a/basic/StaticLibrary_app.mk
+++ b/basic/StaticLibrary_app.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/basic/StaticLibrary_sample.mk b/basic/StaticLibrary_sample.mk
index 364e2b3b5676..b48ff08f721c 100644
--- a/basic/StaticLibrary_sample.mk
+++ b/basic/StaticLibrary_sample.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_cairocanvas.mk b/canvas/Library_cairocanvas.mk
index a83be4387bc2..3cfa430e753d 100644
--- a/canvas/Library_cairocanvas.mk
+++ b/canvas/Library_cairocanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_canvasfactory.mk b/canvas/Library_canvasfactory.mk
index 0d96fb53abbb..82b47bbb4f82 100644
--- a/canvas/Library_canvasfactory.mk
+++ b/canvas/Library_canvasfactory.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_canvastools.mk b/canvas/Library_canvastools.mk
index 3caca89082e2..ac79feea7025 100644
--- a/canvas/Library_canvastools.mk
+++ b/canvas/Library_canvastools.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_directx5canvas.mk b/canvas/Library_directx5canvas.mk
index aeb31cc2a73b..f27391d6e03c 100644
--- a/canvas/Library_directx5canvas.mk
+++ b/canvas/Library_directx5canvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_directx9canvas.mk b/canvas/Library_directx9canvas.mk
index 05d28c78527b..ac505057b671 100644
--- a/canvas/Library_directx9canvas.mk
+++ b/canvas/Library_directx9canvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_gdipluscanvas.mk b/canvas/Library_gdipluscanvas.mk
index bb7d9d198947..3a16a482d096 100644
--- a/canvas/Library_gdipluscanvas.mk
+++ b/canvas/Library_gdipluscanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_nullcanvas.mk b/canvas/Library_nullcanvas.mk
index a2b19828da33..b52592791a08 100644
--- a/canvas/Library_nullcanvas.mk
+++ b/canvas/Library_nullcanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_simplecanvas.mk b/canvas/Library_simplecanvas.mk
index 376a3dba54a4..60308611ca1a 100644
--- a/canvas/Library_simplecanvas.mk
+++ b/canvas/Library_simplecanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Library_vclcanvas.mk b/canvas/Library_vclcanvas.mk
index 4461c5ec0ba8..ddc6aec59bd8 100644
--- a/canvas/Library_vclcanvas.mk
+++ b/canvas/Library_vclcanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Module_canvas.mk b/canvas/Module_canvas.mk
index 54c8952cb502..3dfc40411454 100644
--- a/canvas/Module_canvas.mk
+++ b/canvas/Module_canvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/canvas/Package_inc.mk b/canvas/Package_inc.mk
index c65536b573da..f3892ca98753 100644
--- a/canvas/Package_inc.mk
+++ b/canvas/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/chart2/AllLangResTarget_chartcontroller.mk b/chart2/AllLangResTarget_chartcontroller.mk
index 14bfce0c1e29..600196c4c769 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/JunitTest_chart2_unoapi.mk b/chart2/JunitTest_chart2_unoapi.mk
index 26a1460706b0..989502478f23 100644
--- a/chart2/JunitTest_chart2_unoapi.mk
+++ b/chart2/JunitTest_chart2_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index 95cbef867979..7c9960b63e1d 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
index e5ad81bd6e23..f1f73ced9f7c 100644
--- a/chart2/Library_chartmodel.mk
+++ b/chart2/Library_chartmodel.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
index c618038721f6..f6a1a42bc22a 100644
--- a/chart2/Library_charttools.mk
+++ b/chart2/Library_charttools.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
index 841ed6981d24..972a0c21dcf9 100644
--- a/chart2/Library_chartview.mk
+++ b/chart2/Library_chartview.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index 4ecb2b952b20..b8b2a4f6e0b9 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/chart2/Package_uiconfig.mk b/chart2/Package_uiconfig.mk
index 9c77dd676fd0..d9787084e33f 100644
--- a/chart2/Package_uiconfig.mk
+++ b/chart2/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/comphelper/JunitTest_comphelper_complex.mk b/comphelper/JunitTest_comphelper_complex.mk
index 3b5880e7e3b2..adf616b220d0 100644
--- a/comphelper/JunitTest_comphelper_complex.mk
+++ b/comphelper/JunitTest_comphelper_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/comphelper/Library_comphelp.mk b/comphelper/Library_comphelp.mk
index c7af7730cdfb..80e233d1640f 100644
--- a/comphelper/Library_comphelp.mk
+++ b/comphelper/Library_comphelp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/comphelper/Module_comphelper.mk b/comphelper/Module_comphelper.mk
index 77f583c329ba..e1220edb9e77 100644
--- a/comphelper/Module_comphelper.mk
+++ b/comphelper/Module_comphelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/comphelper/Package_inc.mk b/comphelper/Package_inc.mk
index 19ff4182e5c5..25c6f4b8e538 100644
--- a/comphelper/Package_inc.mk
+++ b/comphelper/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/configmgr/JunitTest_configmgr_unoapi.mk b/configmgr/JunitTest_configmgr_unoapi.mk
index a2b52d9c3f7d..3f1537fd8cc2 100644
--- a/configmgr/JunitTest_configmgr_unoapi.mk
+++ b/configmgr/JunitTest_configmgr_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/configmgr/Module_configmgr.mk b/configmgr/Module_configmgr.mk
index 140dd72ff94b..0481c29c50ed 100644
--- a/configmgr/Module_configmgr.mk
+++ b/configmgr/Module_configmgr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/cppcanvas/Library_cppcanvas.mk b/cppcanvas/Library_cppcanvas.mk
index 022e7cdbc611..6493829f4d80 100644
--- a/cppcanvas/Library_cppcanvas.mk
+++ b/cppcanvas/Library_cppcanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/cppcanvas/Library_mtfrenderer.mk b/cppcanvas/Library_mtfrenderer.mk
index 8dd2bc97ded2..52e2387ccdc5 100644
--- a/cppcanvas/Library_mtfrenderer.mk
+++ b/cppcanvas/Library_mtfrenderer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/cppcanvas/Module_cppcanvas.mk b/cppcanvas/Module_cppcanvas.mk
index c6683a053ad2..edf7d83c9f3e 100644
--- a/cppcanvas/Module_cppcanvas.mk
+++ b/cppcanvas/Module_cppcanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/cppcanvas/Package_inc.mk b/cppcanvas/Package_inc.mk
index a37fe9d79de6..090fc6cb974f 100644
--- a/cppcanvas/Package_inc.mk
+++ b/cppcanvas/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index b0ac2f591338..5784412b7d29 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 51f2b46b73cc..94d8a4a71603 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/cui/Module_cui.mk b/cui/Module_cui.mk
index 1644c79dcffd..8b7117bdc062 100644
--- a/cui/Module_cui.mk
+++ b/cui/Module_cui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/AllLangResTarget_adabasui.mk b/dbaccess/AllLangResTarget_adabasui.mk
index d7458477c057..cc7325ff0c04 100644
--- a/dbaccess/AllLangResTarget_adabasui.mk
+++ b/dbaccess/AllLangResTarget_adabasui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/AllLangResTarget_dba.mk b/dbaccess/AllLangResTarget_dba.mk
index 421b3fdcbd25..092dfc7ba306 100644
--- a/dbaccess/AllLangResTarget_dba.mk
+++ b/dbaccess/AllLangResTarget_dba.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/AllLangResTarget_dbmm.mk b/dbaccess/AllLangResTarget_dbmm.mk
index 03d200777a92..2eb73d5da0d5 100644
--- a/dbaccess/AllLangResTarget_dbmm.mk
+++ b/dbaccess/AllLangResTarget_dbmm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index b63acd6321ac..73cb4095f614 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/AllLangResTarget_dbui.mk b/dbaccess/AllLangResTarget_dbui.mk
index a4dd39bf1adc..7478fc2c4474 100644
--- a/dbaccess/AllLangResTarget_dbui.mk
+++ b/dbaccess/AllLangResTarget_dbui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dbaccess/AllLangResTarget_sdbt.mk b/dbaccess/AllLangResTarget_sdbt.mk
index 3370f78b11eb..3cd41326cf2a 100644
--- a/dbaccess/AllLangResTarget_sdbt.mk
+++ b/dbaccess/AllLangResTarget_sdbt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Executable_odbcconfig.mk b/dbaccess/Executable_odbcconfig.mk
index da0eefd115d7..2f74b9678ae6 100644
--- a/dbaccess/Executable_odbcconfig.mk
+++ b/dbaccess/Executable_odbcconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/JunitTest_dbaccess_complex.mk b/dbaccess/JunitTest_dbaccess_complex.mk
index d093a727b89f..0479955e2e8a 100644
--- a/dbaccess/JunitTest_dbaccess_complex.mk
+++ b/dbaccess/JunitTest_dbaccess_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dbaccess/JunitTest_dbaccess_unoapi.mk b/dbaccess/JunitTest_dbaccess_unoapi.mk
index 504d45535ae4..9b9331381da3 100644
--- a/dbaccess/JunitTest_dbaccess_unoapi.mk
+++ b/dbaccess/JunitTest_dbaccess_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Library_adabasui.mk b/dbaccess/Library_adabasui.mk
index 49e8a3c9fd0f..b8eadad37244 100644
--- a/dbaccess/Library_adabasui.mk
+++ b/dbaccess/Library_adabasui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Library_dba.mk b/dbaccess/Library_dba.mk
index ec1e86961728..69501aa680c4 100644
--- a/dbaccess/Library_dba.mk
+++ b/dbaccess/Library_dba.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Library_dbaxml.mk b/dbaccess/Library_dbaxml.mk
index 786f3ae2b76b..7a3866d295f1 100644
--- a/dbaccess/Library_dbaxml.mk
+++ b/dbaccess/Library_dbaxml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Library_dbmm.mk b/dbaccess/Library_dbmm.mk
index 4bb7345f54a2..864b49213e82 100644
--- a/dbaccess/Library_dbmm.mk
+++ b/dbaccess/Library_dbmm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index a4db5a6ab317..52295d3711b1 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Library_dbui.mk b/dbaccess/Library_dbui.mk
index ba1a58af14ea..7a9117aa1cbd 100644
--- a/dbaccess/Library_dbui.mk
+++ b/dbaccess/Library_dbui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dbaccess/Library_sdbt.mk b/dbaccess/Library_sdbt.mk
index 011076553b1a..698337085384 100644
--- a/dbaccess/Library_sdbt.mk
+++ b/dbaccess/Library_sdbt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Module_dbaccess.mk b/dbaccess/Module_dbaccess.mk
index 380dba994180..73b3e58774a0 100644
--- a/dbaccess/Module_dbaccess.mk
+++ b/dbaccess/Module_dbaccess.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Package_inc.mk b/dbaccess/Package_inc.mk
index 05f271d6db81..9dd8fc819112 100644
--- a/dbaccess/Package_inc.mk
+++ b/dbaccess/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Package_uiconfig.mk b/dbaccess/Package_uiconfig.mk
index 0e2636c367a2..f66af974a02a 100644
--- a/dbaccess/Package_uiconfig.mk
+++ b/dbaccess/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dbaccess/Package_xml.mk b/dbaccess/Package_xml.mk
index fcf03a6f8612..b683d56ed1c0 100644
--- a/dbaccess/Package_xml.mk
+++ b/dbaccess/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/drawinglayer/Library_drawinglayer.mk b/drawinglayer/Library_drawinglayer.mk
index 133364bcc06d..de5cb2bbb1d4 100644
--- a/drawinglayer/Library_drawinglayer.mk
+++ b/drawinglayer/Library_drawinglayer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/drawinglayer/Module_drawinglayer.mk b/drawinglayer/Module_drawinglayer.mk
index 05f45482163d..95f6cc26096d 100644
--- a/drawinglayer/Module_drawinglayer.mk
+++ b/drawinglayer/Module_drawinglayer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/drawinglayer/Package_inc.mk b/drawinglayer/Package_inc.mk
index 8c5880448f68..4066f6dcc8ab 100644
--- a/drawinglayer/Package_inc.mk
+++ b/drawinglayer/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/dtrans/Library_dnd.mk b/dtrans/Library_dnd.mk
index 68ce8c63ed85..1f6feb581c64 100644
--- a/dtrans/Library_dnd.mk
+++ b/dtrans/Library_dnd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Library_dtrans.mk b/dtrans/Library_dtrans.mk
index e409227fca8b..27992c05a504 100644
--- a/dtrans/Library_dtrans.mk
+++ b/dtrans/Library_dtrans.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Library_ftransl.mk b/dtrans/Library_ftransl.mk
index b9502b52d633..ee1308f9b8f7 100644
--- a/dtrans/Library_ftransl.mk
+++ b/dtrans/Library_ftransl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Library_mcnttype.mk b/dtrans/Library_mcnttype.mk
index 0ada8504f1e3..7f020f2bdd7e 100644
--- a/dtrans/Library_mcnttype.mk
+++ b/dtrans/Library_mcnttype.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Library_sysdtrans.mk b/dtrans/Library_sysdtrans.mk
index bb3b15bae0bb..66f0e303a743 100644
--- a/dtrans/Library_sysdtrans.mk
+++ b/dtrans/Library_sysdtrans.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Makefile b/dtrans/Makefile
index a1b344d72564..3abf1ae8b6bb 100644
--- a/dtrans/Makefile
+++ b/dtrans/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Module_dtrans.mk b/dtrans/Module_dtrans.mk
index 0900e6bb24ae..3cd02008aeb5 100644
--- a/dtrans/Module_dtrans.mk
+++ b/dtrans/Module_dtrans.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/Package_xml.mk b/dtrans/Package_xml.mk
index acf6b5093f2d..571967ab4332 100644
--- a/dtrans/Package_xml.mk
+++ b/dtrans/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/dtrans/StaticLibrary_dtobj.mk b/dtrans/StaticLibrary_dtobj.mk
index a10daee9de35..bf69b2006ba7 100644
--- a/dtrans/StaticLibrary_dtobj.mk
+++ b/dtrans/StaticLibrary_dtobj.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/editeng/AllLangResTarget_editeng.mk b/editeng/AllLangResTarget_editeng.mk
index 9d29ee31f7c8..9e939ff1fa23 100644
--- a/editeng/AllLangResTarget_editeng.mk
+++ b/editeng/AllLangResTarget_editeng.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/editeng/CppunitTest_editeng_borderline.mk b/editeng/CppunitTest_editeng_borderline.mk
index ab409d9dbcb9..9af0e51e19cb 100644
--- a/editeng/CppunitTest_editeng_borderline.mk
+++ b/editeng/CppunitTest_editeng_borderline.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index c04e0d2460fc..9403002ff36e 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/editeng/Makefile b/editeng/Makefile
index 8d71119918b6..8d71119918b6 100755..100644
--- a/editeng/Makefile
+++ b/editeng/Makefile
diff --git a/editeng/Module_editeng.mk b/editeng/Module_editeng.mk
index 4666d9119f22..fd49b94f5ffe 100644
--- a/editeng/Module_editeng.mk
+++ b/editeng/Module_editeng.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/editeng/Package_inc.mk b/editeng/Package_inc.mk
index 485f1bb00cd0..184556c1e136 100644
--- a/editeng/Package_inc.mk
+++ b/editeng/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/fileaccess/Library_fileacc.mk b/fileaccess/Library_fileacc.mk
index 81bbff0d559e..664cf2c15620 100644
--- a/fileaccess/Library_fileacc.mk
+++ b/fileaccess/Library_fileacc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/fileaccess/Module_fileaccess.mk b/fileaccess/Module_fileaccess.mk
index dab8ea6baeb2..8514f090347a 100644
--- a/fileaccess/Module_fileaccess.mk
+++ b/fileaccess/Module_fileaccess.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/forms/AllLangResTarget_frm.mk b/forms/AllLangResTarget_frm.mk
index 4b7a69247aa3..d8a232def240 100644
--- a/forms/AllLangResTarget_frm.mk
+++ b/forms/AllLangResTarget_frm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/forms/JunitTest_forms_complex.mk b/forms/JunitTest_forms_complex.mk
index 91a4b56153db..62c83f4fddab 100644
--- a/forms/JunitTest_forms_complex.mk
+++ b/forms/JunitTest_forms_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/forms/JunitTest_forms_unoapi.mk b/forms/JunitTest_forms_unoapi.mk
index 9fc231278932..97bd610e5863 100644
--- a/forms/JunitTest_forms_unoapi.mk
+++ b/forms/JunitTest_forms_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/forms/Library_frm.mk b/forms/Library_frm.mk
index 6b2eac9fb4cd..33b2f8db6c40 100644
--- a/forms/Library_frm.mk
+++ b/forms/Library_frm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/forms/Module_forms.mk b/forms/Module_forms.mk
index 4e4b308230e4..6f147224330b 100644
--- a/forms/Module_forms.mk
+++ b/forms/Module_forms.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/forms/Package_unotypes.mk b/forms/Package_unotypes.mk
index 5641ac26d693..baff97f6ba46 100644
--- a/forms/Package_unotypes.mk
+++ b/forms/Package_unotypes.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/formula/AllLangResTarget_for.mk b/formula/AllLangResTarget_for.mk
index d83b88be0dcd..3eb792f8f15b 100644
--- a/formula/AllLangResTarget_for.mk
+++ b/formula/AllLangResTarget_for.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/formula/AllLangResTarget_forui.mk b/formula/AllLangResTarget_forui.mk
index 06b44bc18f56..a099191b1efe 100644
--- a/formula/AllLangResTarget_forui.mk
+++ b/formula/AllLangResTarget_forui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/formula/Library_for.mk b/formula/Library_for.mk
index 5c944be89fd2..c14dcf3590de 100644
--- a/formula/Library_for.mk
+++ b/formula/Library_for.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/formula/Library_forui.mk b/formula/Library_forui.mk
index 1ec688a6b9e4..83fea2e756db 100644
--- a/formula/Library_forui.mk
+++ b/formula/Library_forui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/formula/Module_formula.mk b/formula/Module_formula.mk
index eff40c7371b2..d5f58eab84b1 100644
--- a/formula/Module_formula.mk
+++ b/formula/Module_formula.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/formula/Package_inc.mk b/formula/Package_inc.mk
index 127085fd4bfb..11300cd1b92a 100644
--- a/formula/Package_inc.mk
+++ b/formula/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/framework/AllLangResTarget_fwe.mk b/framework/AllLangResTarget_fwe.mk
index d2184442b936..6b9474ec2421 100644
--- a/framework/AllLangResTarget_fwe.mk
+++ b/framework/AllLangResTarget_fwe.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/JunitTest_framework_complex.mk b/framework/JunitTest_framework_complex.mk
index 28b5fb9d176b..e91e9d1e657d 100644
--- a/framework/JunitTest_framework_complex.mk
+++ b/framework/JunitTest_framework_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/JunitTest_framework_unoapi.mk b/framework/JunitTest_framework_unoapi.mk
index 91723038270a..5321ad4e434a 100644
--- a/framework/JunitTest_framework_unoapi.mk
+++ b/framework/JunitTest_framework_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Library_fwe.mk b/framework/Library_fwe.mk
index 47e4bd37c6be..767e011d13a8 100644
--- a/framework/Library_fwe.mk
+++ b/framework/Library_fwe.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 3db6f7883fe1..8ffd1c632996 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Library_fwk.mk b/framework/Library_fwk.mk
index b517e0dd63dc..8dacdda7762a 100644
--- a/framework/Library_fwk.mk
+++ b/framework/Library_fwk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Library_fwl.mk b/framework/Library_fwl.mk
index ae2975606de4..8028a7879140 100644
--- a/framework/Library_fwl.mk
+++ b/framework/Library_fwl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Library_fwm.mk b/framework/Library_fwm.mk
index ad7836db208f..936fcda1e1fe 100644
--- a/framework/Library_fwm.mk
+++ b/framework/Library_fwm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Library_lomenubar.mk b/framework/Library_lomenubar.mk
index 7452318280ef..45df847c1192 100644
--- a/framework/Library_lomenubar.mk
+++ b/framework/Library_lomenubar.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/framework/Module_framework.mk b/framework/Module_framework.mk
index b6264478e8c7..52f7ae71814d 100644
--- a/framework/Module_framework.mk
+++ b/framework/Module_framework.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Package_dtd.mk b/framework/Package_dtd.mk
index f58e303dfc36..6b61b43d6fa9 100644
--- a/framework/Package_dtd.mk
+++ b/framework/Package_dtd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Package_inc.mk b/framework/Package_inc.mk
index 390621ccf664..0425f5e0d931 100644
--- a/framework/Package_inc.mk
+++ b/framework/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Package_uiconfig.mk b/framework/Package_uiconfig.mk
index 0b20d1288a5d..71d17c0c27a8 100644
--- a/framework/Package_uiconfig.mk
+++ b/framework/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/framework/Package_unotypes.mk b/framework/Package_unotypes.mk
index bbbdce97bdba..2072a46c00d0 100644
--- a/framework/Package_unotypes.mk
+++ b/framework/Package_unotypes.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
index ffb5d94e6d02..71579c9e6444 100644
--- a/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
+++ b/hwpfilter/CppunitTest_hwpfilter_test_hwpfilter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/hwpfilter/Library_hwp.mk b/hwpfilter/Library_hwp.mk
index 5158b884261c..8f47cf59654f 100644
--- a/hwpfilter/Library_hwp.mk
+++ b/hwpfilter/Library_hwp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/hwpfilter/Module_hwpfilter.mk b/hwpfilter/Module_hwpfilter.mk
index b67c15b0bbb6..95390e57b107 100644
--- a/hwpfilter/Module_hwpfilter.mk
+++ b/hwpfilter/Module_hwpfilter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/idl/Executable_svidl.mk b/idl/Executable_svidl.mk
index e73f15e27cd4..f38edd1d181a 100644
--- a/idl/Executable_svidl.mk
+++ b/idl/Executable_svidl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/idl/Module_idl.mk b/idl/Module_idl.mk
index 25fe263fc356..e96ac00ba9a4 100644
--- a/idl/Module_idl.mk
+++ b/idl/Module_idl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/linguistic/JunitTest_linguistic_complex.mk b/linguistic/JunitTest_linguistic_complex.mk
index 699fd8bddb44..ffd3e0b13378 100644
--- a/linguistic/JunitTest_linguistic_complex.mk
+++ b/linguistic/JunitTest_linguistic_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/linguistic/JunitTest_linguistic_unoapi.mk b/linguistic/JunitTest_linguistic_unoapi.mk
index 736f7d5b44c1..24a7b3334aa5 100644
--- a/linguistic/JunitTest_linguistic_unoapi.mk
+++ b/linguistic/JunitTest_linguistic_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/linguistic/Library_lng.mk b/linguistic/Library_lng.mk
index dc41819a04bb..69f48edea7d6 100644
--- a/linguistic/Library_lng.mk
+++ b/linguistic/Library_lng.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/linguistic/Module_linguistic.mk b/linguistic/Module_linguistic.mk
index f43333298a94..fbb1808229dd 100644
--- a/linguistic/Module_linguistic.mk
+++ b/linguistic/Module_linguistic.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/linguistic/Package_inc.mk b/linguistic/Package_inc.mk
index d2ef475d2d6a..f691b0ac1d21 100644
--- a/linguistic/Package_inc.mk
+++ b/linguistic/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
index 12a0d5aebe79..8fa7f4f03337 100644
--- a/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
+++ b/lotuswordpro/CppunitTest_lotuswordpro_test_lotuswordpro.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/lotuswordpro/Library_lwpft.mk b/lotuswordpro/Library_lwpft.mk
index 6ffc6a0119e1..ecf13d8593be 100644
--- a/lotuswordpro/Library_lwpft.mk
+++ b/lotuswordpro/Library_lwpft.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/lotuswordpro/Module_lotuswordpro.mk b/lotuswordpro/Module_lotuswordpro.mk
index f8427c98a435..193276786b80 100644
--- a/lotuswordpro/Module_lotuswordpro.mk
+++ b/lotuswordpro/Module_lotuswordpro.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/offapi/Module_offapi.mk b/offapi/Module_offapi.mk
index 7f1ee0f4f574..6f77ab6d8633 100644
--- a/offapi/Module_offapi.mk
+++ b/offapi/Module_offapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/offapi/Package_offapi_idl.mk b/offapi/Package_offapi_idl.mk
index a5c0c409140d..e1a01fb6c9f1 100644
--- a/offapi/Package_offapi_idl.mk
+++ b/offapi/Package_offapi_idl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/offapi/Package_offapi_inc.mk b/offapi/Package_offapi_inc.mk
index 580ef0166986..f7f7634f16c6 100644
--- a/offapi/Package_offapi_inc.mk
+++ b/offapi/Package_offapi_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 4e9311f78fb5..8e49a6b8e2f9 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/offapi/UnoApi_types.mk b/offapi/UnoApi_types.mk
index 4dfdf5780555..df0da0603c27 100644
--- a/offapi/UnoApi_types.mk
+++ b/offapi/UnoApi_types.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/oovbaapi/Module_oovbaapi.mk b/oovbaapi/Module_oovbaapi.mk
index a42d8efb4137..7d35c00a68b5 100644
--- a/oovbaapi/Module_oovbaapi.mk
+++ b/oovbaapi/Module_oovbaapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/oovbaapi/Package_oovbaapi_idl.mk b/oovbaapi/Package_oovbaapi_idl.mk
index f241b6520427..891f15a43198 100644
--- a/oovbaapi/Package_oovbaapi_idl.mk
+++ b/oovbaapi/Package_oovbaapi_idl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/oovbaapi/Package_oovbaapi_inc.mk b/oovbaapi/Package_oovbaapi_inc.mk
index a72157bbe324..bb8b5e661532 100644
--- a/oovbaapi/Package_oovbaapi_inc.mk
+++ b/oovbaapi/Package_oovbaapi_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index 1b1304ea7f80..6babc5ae3876 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/oox/Library_oox.mk b/oox/Library_oox.mk
index c0aa99045256..f80f67024b1a 100644
--- a/oox/Library_oox.mk
+++ b/oox/Library_oox.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/oox/Module_oox.mk b/oox/Module_oox.mk
index d0f92a0057f2..ba74468c331d 100644
--- a/oox/Module_oox.mk
+++ b/oox/Module_oox.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/oox/Package_generated.mk b/oox/Package_generated.mk
index 14f9a0df2eab..66f18e0f3919 100644
--- a/oox/Package_generated.mk
+++ b/oox/Package_generated.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/oox/Package_inc.mk b/oox/Package_inc.mk
index 275b50911e6c..ca2907920065 100644
--- a/oox/Package_inc.mk
+++ b/oox/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/oox/Package_source.mk b/oox/Package_source.mk
index 12d948889811..fd27b48b5755 100644
--- a/oox/Package_source.mk
+++ b/oox/Package_source.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/oox/Package_tokens.mk b/oox/Package_tokens.mk
index 1d54085317a0..5eb2073589dc 100644
--- a/oox/Package_tokens.mk
+++ b/oox/Package_tokens.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/padmin/AllLangResTarget_spa.mk b/padmin/AllLangResTarget_spa.mk
index 6202446d9c8c..bd76b9251859 100644
--- a/padmin/AllLangResTarget_spa.mk
+++ b/padmin/AllLangResTarget_spa.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/padmin/Executable_spadmin.bin.mk b/padmin/Executable_spadmin.bin.mk
index a2c051220214..b4081c3eb73b 100644
--- a/padmin/Executable_spadmin.bin.mk
+++ b/padmin/Executable_spadmin.bin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/padmin/Library_spa.mk b/padmin/Library_spa.mk
index f52072187258..6bba1dd05fc4 100644
--- a/padmin/Library_spa.mk
+++ b/padmin/Library_spa.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/padmin/Module_padmin.mk b/padmin/Module_padmin.mk
index 2bde73dd8608..2a752d315d93 100644
--- a/padmin/Module_padmin.mk
+++ b/padmin/Module_padmin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/padmin/Package_inc.mk b/padmin/Package_inc.mk
index 96aea23dbcbf..dacd14d745cf 100644
--- a/padmin/Package_inc.mk
+++ b/padmin/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/qadevOOo/JunitTest_qadevOOo_unoapi.mk b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
index ea8aaf43a2bf..78da759cbf42 100644
--- a/qadevOOo/JunitTest_qadevOOo_unoapi.mk
+++ b/qadevOOo/JunitTest_qadevOOo_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/qadevOOo/Module_qadevOOo.mk b/qadevOOo/Module_qadevOOo.mk
index 093b13a29667..53612f384ad9 100644
--- a/qadevOOo/Module_qadevOOo.mk
+++ b/qadevOOo/Module_qadevOOo.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/regexp/Library_regexp.mk b/regexp/Library_regexp.mk
index 430ae33ab845..bd3352e6dc14 100644
--- a/regexp/Library_regexp.mk
+++ b/regexp/Library_regexp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/regexp/Module_regexp.mk b/regexp/Module_regexp.mk
index 8d410394538d..5a9cf241175d 100644
--- a/regexp/Module_regexp.mk
+++ b/regexp/Module_regexp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/regexp/Package_inc.mk b/regexp/Package_inc.mk
index 568f3c796736..ad53154468bb 100644
--- a/regexp/Package_inc.mk
+++ b/regexp/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/reportdesign/AllLangResTarget_rpt.mk b/reportdesign/AllLangResTarget_rpt.mk
index 2367bd37ae6d..efec684f2552 100644
--- a/reportdesign/AllLangResTarget_rpt.mk
+++ b/reportdesign/AllLangResTarget_rpt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/reportdesign/AllLangResTarget_rptui.mk b/reportdesign/AllLangResTarget_rptui.mk
index a67822d4d97b..c41b5b8fdee2 100644
--- a/reportdesign/AllLangResTarget_rptui.mk
+++ b/reportdesign/AllLangResTarget_rptui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/reportdesign/JunitTest_reportdesign_complex.mk b/reportdesign/JunitTest_reportdesign_complex.mk
index 1787814ccc15..1fcf77fa5dc5 100644
--- a/reportdesign/JunitTest_reportdesign_complex.mk
+++ b/reportdesign/JunitTest_reportdesign_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/reportdesign/Library_rpt.mk b/reportdesign/Library_rpt.mk
index b3b3eaed6ff5..05a760ab0405 100644
--- a/reportdesign/Library_rpt.mk
+++ b/reportdesign/Library_rpt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/reportdesign/Library_rptui.mk b/reportdesign/Library_rptui.mk
index f231440c3748..4a0cdb85a601 100644
--- a/reportdesign/Library_rptui.mk
+++ b/reportdesign/Library_rptui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/reportdesign/Library_rptxml.mk b/reportdesign/Library_rptxml.mk
index af0aec7d7b9f..431409837e02 100644
--- a/reportdesign/Library_rptxml.mk
+++ b/reportdesign/Library_rptxml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/reportdesign/Module_reportdesign.mk b/reportdesign/Module_reportdesign.mk
index 19431bb70409..3aef129c0e8c 100644
--- a/reportdesign/Module_reportdesign.mk
+++ b/reportdesign/Module_reportdesign.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/reportdesign/Package_uiconfig.mk b/reportdesign/Package_uiconfig.mk
index 392301616bb3..0ab2c6d3c50b 100644
--- a/reportdesign/Package_uiconfig.mk
+++ b/reportdesign/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/rsc/Executable_rsc.mk b/rsc/Executable_rsc.mk
index 1ed63c9965ee..d4b175c44bbe 100644
--- a/rsc/Executable_rsc.mk
+++ b/rsc/Executable_rsc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/rsc/Makefile b/rsc/Makefile
index a1b344d72564..3abf1ae8b6bb 100644
--- a/rsc/Makefile
+++ b/rsc/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/rsc/Module_rsc.mk b/rsc/Module_rsc.mk
index a04b23b50222..490e573ac502 100644
--- a/rsc/Module_rsc.mk
+++ b/rsc/Module_rsc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/rsc/Package_inc.mk b/rsc/Package_inc.mk
index 24474a89f4cf..eee82b0a0a89 100644
--- a/rsc/Package_inc.mk
+++ b/rsc/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/rsc/Package_yacc.mk b/rsc/Package_yacc.mk
index 18d02d5b210d..c9905fc1cdb7 100644
--- a/rsc/Package_yacc.mk
+++ b/rsc/Package_yacc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/rsc/source/parser/Makefile b/rsc/source/parser/Makefile
index 25367e88726c..29039d8729aa 100644
--- a/rsc/source/parser/Makefile
+++ b/rsc/source/parser/Makefile
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sal/CppunitTest_sal_osl_mutex.mk b/sal/CppunitTest_sal_osl_mutex.mk
index 08e6f093dec7..795f071fa5a9 100644
--- a/sal/CppunitTest_sal_osl_mutex.mk
+++ b/sal/CppunitTest_sal_osl_mutex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sal/CppunitTest_sal_osl_pipe.mk b/sal/CppunitTest_sal_osl_pipe.mk
index 21563543438d..c0a0b29655b5 100644
--- a/sal/CppunitTest_sal_osl_pipe.mk
+++ b/sal/CppunitTest_sal_osl_pipe.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sal/CppunitTest_sal_osl_profile.mk b/sal/CppunitTest_sal_osl_profile.mk
index 96cf34632a5b..56c038d9b925 100644
--- a/sal/CppunitTest_sal_osl_profile.mk
+++ b/sal/CppunitTest_sal_osl_profile.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sal/CppunitTest_sal_osl_setthreadname.mk b/sal/CppunitTest_sal_osl_setthreadname.mk
index d5c6c4c92f3f..086d116c80eb 100644
--- a/sal/CppunitTest_sal_osl_setthreadname.mk
+++ b/sal/CppunitTest_sal_osl_setthreadname.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sal/CppunitTest_sal_rtl_math.mk b/sal/CppunitTest_sal_rtl_math.mk
index aad3c1ef0d36..3e410fe1af34 100644
--- a/sal/CppunitTest_sal_rtl_math.mk
+++ b/sal/CppunitTest_sal_rtl_math.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index a03ad7446992..bee84db46d64 100644
--- a/sal/Module_sal.mk
+++ b/sal/Module_sal.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sax/CppunitTest_sax.mk b/sax/CppunitTest_sax.mk
index 661566406f67..7a30ddcb8111 100644
--- a/sax/CppunitTest_sax.mk
+++ b/sax/CppunitTest_sax.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sax/Executable_sax_cppunittester_all.mk b/sax/Executable_sax_cppunittester_all.mk
index c39fe8b4f7e8..0ec10a8a379d 100644
--- a/sax/Executable_sax_cppunittester_all.mk
+++ b/sax/Executable_sax_cppunittester_all.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sax/Library_expwrap.mk b/sax/Library_expwrap.mk
index 591c39750f93..ea040a1a7075 100644
--- a/sax/Library_expwrap.mk
+++ b/sax/Library_expwrap.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sax/Library_fastsax.mk b/sax/Library_fastsax.mk
index f94435c33def..51d0e91c2404 100644
--- a/sax/Library_fastsax.mk
+++ b/sax/Library_fastsax.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sax/Library_sax.mk b/sax/Library_sax.mk
index 3614be181fba..f6c2059c1230 100644
--- a/sax/Library_sax.mk
+++ b/sax/Library_sax.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sax/Module_sax.mk b/sax/Module_sax.mk
index b55aebe699a5..9276e9823fa2 100644
--- a/sax/Module_sax.mk
+++ b/sax/Module_sax.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sax/Package_inc.mk b/sax/Package_inc.mk
index 0c27922f0c62..151120510e3e 100644
--- a/sax/Package_inc.mk
+++ b/sax/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index adbedf5a8fe4..e789ac3ada05 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/CppunitTest_sc_test_filters.mk b/sc/CppunitTest_sc_test_filters.mk
index 0b469bcfd8c8..dd4733869242 100644
--- a/sc/CppunitTest_sc_test_filters.mk
+++ b/sc/CppunitTest_sc_test_filters.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/sc/CppunitTest_sc_ucalc.mk b/sc/CppunitTest_sc_ucalc.mk
index cf5d4a898f00..d7a1adf3551f 100644
--- a/sc/CppunitTest_sc_ucalc.mk
+++ b/sc/CppunitTest_sc_ucalc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 10a71a8a70ce..70cd612517a0 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/Library_scd.mk b/sc/Library_scd.mk
index 459ec4891b2f..cc879c845a3a 100644
--- a/sc/Library_scd.mk
+++ b/sc/Library_scd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/Library_scfilt.mk b/sc/Library_scfilt.mk
index 99e028cc6d47..ce6cee1664ee 100644
--- a/sc/Library_scfilt.mk
+++ b/sc/Library_scfilt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/Library_scui.mk b/sc/Library_scui.mk
index 74db5b57d4c4..f57673483f71 100644
--- a/sc/Library_scui.mk
+++ b/sc/Library_scui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/Library_vbaobj.mk b/sc/Library_vbaobj.mk
index 54f626af1b78..0b5fb7db6eec 100644
--- a/sc/Library_vbaobj.mk
+++ b/sc/Library_vbaobj.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index ecf5fa7db589..8ecdf25eca5d 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/sc/Package_uiconfig.mk b/sc/Package_uiconfig.mk
index b37e1e349626..18eb76dc2e57 100644
--- a/sc/Package_uiconfig.mk
+++ b/sc/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sc/Package_xml.mk b/sc/Package_xml.mk
index e58d2a068e09..e56ca17710cd 100644
--- a/sc/Package_xml.mk
+++ b/sc/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/scaddins/AllLangResTarget_analysis.mk b/scaddins/AllLangResTarget_analysis.mk
index 07d5bed462a0..3cc38af64526 100644
--- a/scaddins/AllLangResTarget_analysis.mk
+++ b/scaddins/AllLangResTarget_analysis.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/scaddins/AllLangResTarget_date.mk b/scaddins/AllLangResTarget_date.mk
index cf78ddb23272..0c130b665a03 100644
--- a/scaddins/AllLangResTarget_date.mk
+++ b/scaddins/AllLangResTarget_date.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/scaddins/Library_analysis.mk b/scaddins/Library_analysis.mk
index b062ce1f97de..eecfc7f10e61 100644
--- a/scaddins/Library_analysis.mk
+++ b/scaddins/Library_analysis.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/scaddins/Library_date.mk b/scaddins/Library_date.mk
index 50a9c6e3b390..6e4b11d04ed4 100644
--- a/scaddins/Library_date.mk
+++ b/scaddins/Library_date.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/scaddins/Module_scaddins.mk b/scaddins/Module_scaddins.mk
index 054857440c24..8d1e7c7c7981 100644
--- a/scaddins/Module_scaddins.mk
+++ b/scaddins/Module_scaddins.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sccomp/AllLangResTarget_solver.mk b/sccomp/AllLangResTarget_solver.mk
index 613417f0546a..554663d07467 100644
--- a/sccomp/AllLangResTarget_solver.mk
+++ b/sccomp/AllLangResTarget_solver.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sccomp/Library_solver.mk b/sccomp/Library_solver.mk
index a9e96454e392..ba9493a4d68b 100644
--- a/sccomp/Library_solver.mk
+++ b/sccomp/Library_solver.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sccomp/Module_sccomp.mk b/sccomp/Module_sccomp.mk
index 27ba12963db0..634c0e2f868b 100644
--- a/sccomp/Module_sccomp.mk
+++ b/sccomp/Module_sccomp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index de99782b604a..e4875f8d6a96 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/CppunitTest_sd_uimpress.mk b/sd/CppunitTest_sd_uimpress.mk
index d577ee24b6c7..f218156afed2 100644
--- a/sd/CppunitTest_sd_uimpress.mk
+++ b/sd/CppunitTest_sd_uimpress.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/JunitTest_sd_unoapi.mk b/sd/JunitTest_sd_unoapi.mk
index d086924fe798..17fcb8920d8e 100644
--- a/sd/JunitTest_sd_unoapi.mk
+++ b/sd/JunitTest_sd_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 45f8c5782146..c00b5e1bb173 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Library_sdd.mk b/sd/Library_sdd.mk
index 2e2b0707fb93..08c8c8a70ffc 100644
--- a/sd/Library_sdd.mk
+++ b/sd/Library_sdd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Library_sdfilt.mk b/sd/Library_sdfilt.mk
index cc35e73e44d8..cc0701abc189 100644
--- a/sd/Library_sdfilt.mk
+++ b/sd/Library_sdfilt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 2dea17d244e7..4305fe2fa19b 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk
index a0224a959ef0..c374fb1b82a6 100644
--- a/sd/Module_sd.mk
+++ b/sd/Module_sd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Package_inc.mk b/sd/Package_inc.mk
index 38cf7b2e2601..5547541012c3 100644
--- a/sd/Package_inc.mk
+++ b/sd/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Package_uiconfig.mk b/sd/Package_uiconfig.mk
index 4a10261170fc..c807cbb51b20 100644
--- a/sd/Package_uiconfig.mk
+++ b/sd/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Package_web.mk b/sd/Package_web.mk
index c117d807fc91..7c02f26f3096 100644
--- a/sd/Package_web.mk
+++ b/sd/Package_web.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sd/Package_xml.mk b/sd/Package_xml.mk
index 4e5f7195b232..10e530408be4 100644
--- a/sd/Package_xml.mk
+++ b/sd/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index 559c9bb6817c..f849ce81a741 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/CppunitTest_sfx2_metadatable.mk b/sfx2/CppunitTest_sfx2_metadatable.mk
index 927cdc203f52..2047e874a3a2 100644
--- a/sfx2/CppunitTest_sfx2_metadatable.mk
+++ b/sfx2/CppunitTest_sfx2_metadatable.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/JunitTest_sfx2_complex.mk b/sfx2/JunitTest_sfx2_complex.mk
index f0dcf301d275..e287265a814c 100644
--- a/sfx2/JunitTest_sfx2_complex.mk
+++ b/sfx2/JunitTest_sfx2_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/JunitTest_sfx2_unoapi.mk b/sfx2/JunitTest_sfx2_unoapi.mk
index 8bd0ab37dd8e..4f15dc51988a 100644
--- a/sfx2/JunitTest_sfx2_unoapi.mk
+++ b/sfx2/JunitTest_sfx2_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk
index 50445d1b411b..80e794260494 100644
--- a/sfx2/Library_qstart.mk
+++ b/sfx2/Library_qstart.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index fe2feaad43a2..dea5d32fa7bc 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/Makefile b/sfx2/Makefile
index 8d71119918b6..8d71119918b6 100755..100644
--- a/sfx2/Makefile
+++ b/sfx2/Makefile
diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk
index 301c037d436a..4084d3927ead 100644
--- a/sfx2/Module_sfx2.mk
+++ b/sfx2/Module_sfx2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/Package_inc.mk b/sfx2/Package_inc.mk
index 11ecc6d376aa..86eaa6509168 100644
--- a/sfx2/Package_inc.mk
+++ b/sfx2/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sfx2/Package_sdi.mk b/sfx2/Package_sdi.mk
index 44e640a09137..a2100066afc6 100644
--- a/sfx2/Package_sdi.mk
+++ b/sfx2/Package_sdi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/slideshow/CppunitTest_slideshow.mk b/slideshow/CppunitTest_slideshow.mk
index 21e21a04c614..0b88fa787ae7 100644
--- a/slideshow/CppunitTest_slideshow.mk
+++ b/slideshow/CppunitTest_slideshow.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/slideshow/Executable_demoshow.mk b/slideshow/Executable_demoshow.mk
index 5beee999bc39..3d3c0b844b2c 100644
--- a/slideshow/Executable_demoshow.mk
+++ b/slideshow/Executable_demoshow.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index d859071dafc7..f3dd3162a165 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/slideshow/Library_slideshow.mk b/slideshow/Library_slideshow.mk
index 51494303fdc2..7095e59cb93a 100644
--- a/slideshow/Library_slideshow.mk
+++ b/slideshow/Library_slideshow.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/slideshow/Module_slideshow.mk b/slideshow/Module_slideshow.mk
index e3c2b0568cfe..d52e9c21ff43 100644
--- a/slideshow/Module_slideshow.mk
+++ b/slideshow/Module_slideshow.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 7999e0322d8a..27b63bcfea48 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/BuildDirs.mk b/solenv/gbuild/BuildDirs.mk
index 6c19db07e6d5..6cb575af98ac 100644
--- a/solenv/gbuild/BuildDirs.mk
+++ b/solenv/gbuild/BuildDirs.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/ComponentTarget.mk b/solenv/gbuild/ComponentTarget.mk
index 790a7883c44a..b884ce042d4b 100644
--- a/solenv/gbuild/ComponentTarget.mk
+++ b/solenv/gbuild/ComponentTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 043fdcdf520b..8f28cd41f5e2 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 0fc8d28eca7d..2b5b68175ce6 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Deliver.mk b/solenv/gbuild/Deliver.mk
index 03911891967b..eb5c20c36136 100644
--- a/solenv/gbuild/Deliver.mk
+++ b/solenv/gbuild/Deliver.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index bd353769efde..04ade99e428d 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4c9f2de8f66e..675ef20e4ee9 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index 6b0fd9c633a9..92ec247cccb7 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index fac036e91594..6d8f6a4557c5 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk
index dbd246b7c7c3..6df4246ebf8c 100644
--- a/solenv/gbuild/JunitTest.mk
+++ b/solenv/gbuild/JunitTest.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 455bd8ff4cf2..7a79ad84739d 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 25f9737fb403..c8005edb0cbc 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index 7ecd947c6867..2bc078bfb959 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index 681721ec46b1..09885de2175e 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Package.mk b/solenv/gbuild/Package.mk
index 40ef5b7d5c1f..23ec530009ff 100644
--- a/solenv/gbuild/Package.mk
+++ b/solenv/gbuild/Package.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 9ef2b7d60beb..9e32630f492e 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 6d8b95f96cf4..6136a568fa79 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/solenv/gbuild/SdiTarget.mk b/solenv/gbuild/SdiTarget.mk
index da2939e7e1ac..f8d7b4c8bec9 100644
--- a/solenv/gbuild/SdiTarget.mk
+++ b/solenv/gbuild/SdiTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/StaticLibrary.mk b/solenv/gbuild/StaticLibrary.mk
index d0224969ade3..841f70c699e0 100644
--- a/solenv/gbuild/StaticLibrary.mk
+++ b/solenv/gbuild/StaticLibrary.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b959eed56370..d92a0e79da3f 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/Tempfile.mk b/solenv/gbuild/Tempfile.mk
index bad6bd4a1a40..e7e927986298 100644
--- a/solenv/gbuild/Tempfile.mk
+++ b/solenv/gbuild/Tempfile.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Write string to temporary file by chopping into pieces that
# fit the commandline
# parameters: filename, maxitems (for one write), string
diff --git a/solenv/gbuild/UnoApiTarget.mk b/solenv/gbuild/UnoApiTarget.mk
index 99dc5578e4fd..935c5eab105f 100644
--- a/solenv/gbuild/UnoApiTarget.mk
+++ b/solenv/gbuild/UnoApiTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 4ed592f7df4d..c9faa8b6758e 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# WinResTarget class
diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk
index 15d0da8cbedd..aa0bb10f3537 100644
--- a/solenv/gbuild/Zip.mk
+++ b/solenv/gbuild/Zip.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index aed26318c4a7..0ee9675954b7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 0d056dac98c3..721bef76c4db 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/android.mk
index 647fd24dbfd6..03f85ec49712 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/android.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/dragonfly.mk
index f84d32540b15..30a58de01425 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/dragonfly.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/freebsd.mk
index e776076447fd..a8a79666ffab 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/freebsd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/ios.mk
index 29305bda63d0..2f19603cf6ca 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/ios.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/linux-ARM.mk
index 3354305a7f96..72132ca72e73 100644
--- a/solenv/gbuild/platform/linux-ARM.mk
+++ b/solenv/gbuild/platform/linux-ARM.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/linux-AXP.mk
index 5698d743f128..f7c8a593ffa2 100644
--- a/solenv/gbuild/platform/linux-AXP.mk
+++ b/solenv/gbuild/platform/linux-AXP.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/linux-GODSON.mk
index d0b48895a1c7..2bf9cf7618d4 100644
--- a/solenv/gbuild/platform/linux-GODSON.mk
+++ b/solenv/gbuild/platform/linux-GODSON.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/linux-HPPA.mk
index a2d2109ac5e3..26a1ef23a378 100644
--- a/solenv/gbuild/platform/linux-HPPA.mk
+++ b/solenv/gbuild/platform/linux-HPPA.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/linux-IA64.mk
index d72eedcdcb34..3994cbf836f0 100644
--- a/solenv/gbuild/platform/linux-IA64.mk
+++ b/solenv/gbuild/platform/linux-IA64.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-INTEL.mk b/solenv/gbuild/platform/linux-INTEL.mk
index b20f9d0b8ff8..4410ed0e9c88 100644
--- a/solenv/gbuild/platform/linux-INTEL.mk
+++ b/solenv/gbuild/platform/linux-INTEL.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/linux-M68K.mk
index 5e6034068b57..d5e9088fb75c 100644
--- a/solenv/gbuild/platform/linux-M68K.mk
+++ b/solenv/gbuild/platform/linux-M68K.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/linux-POWERPC.mk
index 9616a6d21a0b..495efb49bee8 100644
--- a/solenv/gbuild/platform/linux-POWERPC.mk
+++ b/solenv/gbuild/platform/linux-POWERPC.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-POWERPC64.mk b/solenv/gbuild/platform/linux-POWERPC64.mk
index e3e94bd00fa1..5b46a6226725 100644
--- a/solenv/gbuild/platform/linux-POWERPC64.mk
+++ b/solenv/gbuild/platform/linux-POWERPC64.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/linux-S390.mk
index 39a6472af1b0..79689f7e1d33 100644
--- a/solenv/gbuild/platform/linux-S390.mk
+++ b/solenv/gbuild/platform/linux-S390.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-S390X.mk b/solenv/gbuild/platform/linux-S390X.mk
index 776a22e44455..5e4a81ed5943 100644
--- a/solenv/gbuild/platform/linux-S390X.mk
+++ b/solenv/gbuild/platform/linux-S390X.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/linux-SPARC.mk
index a976f2ba5d8b..b10a2dff7f69 100644
--- a/solenv/gbuild/platform/linux-SPARC.mk
+++ b/solenv/gbuild/platform/linux-SPARC.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/linux-X86_64.mk
index d72eedcdcb34..3994cbf836f0 100644
--- a/solenv/gbuild/platform/linux-X86_64.mk
+++ b/solenv/gbuild/platform/linux-X86_64.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/linux.mk b/solenv/gbuild/platform/linux.mk
index 8624d9effa1d..f3df98185dc2 100644
--- a/solenv/gbuild/platform/linux.mk
+++ b/solenv/gbuild/platform/linux.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 00f0dd0c77e9..97f04a24d99a 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/netbsd.mk
index d274e9760003..1785285a595a 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/netbsd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/openbsd.mk
index 00f76e2557f3..f3740c9629ef 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/openbsd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index aa351ad16baf..301b1832ebca 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 9210c937e509..e30c52212224 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index a4a9f7e53a7d..44e2fc13ee9a 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index fee27f929c33..c4e3a1143f77 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sot/JunitTest_sot_complex.mk b/sot/JunitTest_sot_complex.mk
index 24d479128d6c..a6d83143d335 100644
--- a/sot/JunitTest_sot_complex.mk
+++ b/sot/JunitTest_sot_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sot/Library_sot.mk b/sot/Library_sot.mk
index 97419691f1a2..bf2a8142982f 100644
--- a/sot/Library_sot.mk
+++ b/sot/Library_sot.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sot/Module_sot.mk b/sot/Module_sot.mk
index 969bd39fd57e..f71abc14d9ea 100644
--- a/sot/Module_sot.mk
+++ b/sot/Module_sot.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sot/Package_inc.mk b/sot/Package_inc.mk
index daf85fee12ba..f875a90254b1 100644
--- a/sot/Package_inc.mk
+++ b/sot/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/starmath/AllLangResTarget_sm.mk b/starmath/AllLangResTarget_sm.mk
index 390429de054b..c4089add0c87 100644
--- a/starmath/AllLangResTarget_sm.mk
+++ b/starmath/AllLangResTarget_sm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/starmath/CppunitTest_starmath_qa_cppunit.mk b/starmath/CppunitTest_starmath_qa_cppunit.mk
index cb5a10977a9a..4583e0406eb1 100644
--- a/starmath/CppunitTest_starmath_qa_cppunit.mk
+++ b/starmath/CppunitTest_starmath_qa_cppunit.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/starmath/JunitTest_sm_unoapi.mk b/starmath/JunitTest_sm_unoapi.mk
index 09cfae1ace1f..129a5236e998 100644
--- a/starmath/JunitTest_sm_unoapi.mk
+++ b/starmath/JunitTest_sm_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/starmath/JunitTest_starmath_unoapi.mk b/starmath/JunitTest_starmath_unoapi.mk
index d73caad3c50b..8a203361c081 100644
--- a/starmath/JunitTest_starmath_unoapi.mk
+++ b/starmath/JunitTest_starmath_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk
index 034bf60a668a..86e833f00421 100644
--- a/starmath/Library_sm.mk
+++ b/starmath/Library_sm.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/starmath/Library_smd.mk b/starmath/Library_smd.mk
index 44c43a88f53d..6f98c93349b9 100644
--- a/starmath/Library_smd.mk
+++ b/starmath/Library_smd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/starmath/Module_starmath.mk b/starmath/Module_starmath.mk
index 596e8a906aef..b3763c21c01c 100644
--- a/starmath/Module_starmath.mk
+++ b/starmath/Module_starmath.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/starmath/Package_uiconfig.mk b/starmath/Package_uiconfig.mk
index 9fbe5a2b1c94..46a0d3f489d9 100644
--- a/starmath/Package_uiconfig.mk
+++ b/starmath/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/AllLangResTarget_svl.mk b/svl/AllLangResTarget_svl.mk
index e16a41c01fe3..70edac226053 100644
--- a/svl/AllLangResTarget_svl.mk
+++ b/svl/AllLangResTarget_svl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/JunitTest_svl_complex.mk b/svl/JunitTest_svl_complex.mk
index 4bf7850dcb3e..ae6260a00494 100644
--- a/svl/JunitTest_svl_complex.mk
+++ b/svl/JunitTest_svl_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/Library_fsstorage.mk b/svl/Library_fsstorage.mk
index ef5b28a30d96..442ecfaee1e9 100644
--- a/svl/Library_fsstorage.mk
+++ b/svl/Library_fsstorage.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk
index 00020aff77dd..0d75e60717fe 100644
--- a/svl/Library_passwordcontainer.mk
+++ b/svl/Library_passwordcontainer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk
index fe8bb234771b..b091d71efc69 100644
--- a/svl/Library_svl.mk
+++ b/svl/Library_svl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/Module_svl.mk b/svl/Module_svl.mk
index d05a91b2d441..880db26e3c98 100644
--- a/svl/Module_svl.mk
+++ b/svl/Module_svl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svl/Package_inc.mk b/svl/Package_inc.mk
index 272845229644..5f65c0330bce 100644
--- a/svl/Package_inc.mk
+++ b/svl/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/AllLangResTarget_productregistration.mk b/svtools/AllLangResTarget_productregistration.mk
index a370c5085d3c..8a1ffe28af64 100644
--- a/svtools/AllLangResTarget_productregistration.mk
+++ b/svtools/AllLangResTarget_productregistration.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk
index 11959fae94ff..e5d0a5b1c8aa 100644
--- a/svtools/AllLangResTarget_svt.mk
+++ b/svtools/AllLangResTarget_svt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/CppunitTest_svtools_filters_test.mk b/svtools/CppunitTest_svtools_filters_test.mk
index 325ed977b312..b580db6d6d95 100644
--- a/svtools/CppunitTest_svtools_filters_test.mk
+++ b/svtools/CppunitTest_svtools_filters_test.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index f964063bd9d9..c65ff4c2e2c9 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 1ed92c80b844..671efdfc91ea 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 2fbe4d65bf3a..576d41806c7b 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/JunitTest_svtools_unoapi.mk b/svtools/JunitTest_svtools_unoapi.mk
index 8392aa9c7d39..4716809bd31c 100644
--- a/svtools/JunitTest_svtools_unoapi.mk
+++ b/svtools/JunitTest_svtools_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Library_hatchwindowfactory.mk b/svtools/Library_hatchwindowfactory.mk
index c94ed98c888e..47814d345a73 100644
--- a/svtools/Library_hatchwindowfactory.mk
+++ b/svtools/Library_hatchwindowfactory.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Library_productregistration.mk b/svtools/Library_productregistration.mk
index 8506760a2c3c..3cd1f4b63eae 100644
--- a/svtools/Library_productregistration.mk
+++ b/svtools/Library_productregistration.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 232e3649b1ec..b2fc5e15fe94 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Module_svtools.mk b/svtools/Module_svtools.mk
index f63637781a08..f335dbe5fc27 100644
--- a/svtools/Module_svtools.mk
+++ b/svtools/Module_svtools.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk
index d385b2f7128f..3586c52dde1c 100644
--- a/svtools/Package_inc.mk
+++ b/svtools/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/AllLangResTarget_gal.mk b/svx/AllLangResTarget_gal.mk
index 8701b7eb86ea..c2d109fa57d1 100644
--- a/svx/AllLangResTarget_gal.mk
+++ b/svx/AllLangResTarget_gal.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
index 6eed22e2d1c9..63e03ffd9a5f 100644
--- a/svx/AllLangResTarget_ofa.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/AllLangResTarget_svx.mk b/svx/AllLangResTarget_svx.mk
index 52ab1160553d..d030b534baf3 100644
--- a/svx/AllLangResTarget_svx.mk
+++ b/svx/AllLangResTarget_svx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/AllLangResTarget_textconversiondlgs.mk b/svx/AllLangResTarget_textconversiondlgs.mk
index ac8c679adb7c..238745ffd055 100644
--- a/svx/AllLangResTarget_textconversiondlgs.mk
+++ b/svx/AllLangResTarget_textconversiondlgs.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/JunitTest_svx_unoapi.mk b/svx/JunitTest_svx_unoapi.mk
index f385a74e6a75..53cc49381bf3 100644
--- a/svx/JunitTest_svx_unoapi.mk
+++ b/svx/JunitTest_svx_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6fe55eb8d81b..ddc8f58a435a 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index 11712812e27e..27f8907be484 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index 53ee339dee76..066fabb8fee8 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk
index 18eccf18cdfa..9a3091f63d09 100644
--- a/svx/Module_svx.mk
+++ b/svx/Module_svx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index e34aaf23cf0b..60b576ab0b32 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/svx/Package_sdi.mk b/svx/Package_sdi.mk
index b7e3cae238b9..82d7b9e41395 100644
--- a/svx/Package_sdi.mk
+++ b/svx/Package_sdi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index e90d22c95792..cd5a4bc8af4b 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/CppunitTest_sw_swdoc_test.mk b/sw/CppunitTest_sw_swdoc_test.mk
index e882a6b327be..b685b8eed627 100644
--- a/sw/CppunitTest_sw_swdoc_test.mk
+++ b/sw/CppunitTest_sw_swdoc_test.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/sw/CppunitTest_sw_test_filters.mk b/sw/CppunitTest_sw_test_filters.mk
index a3bfd2f833f7..dc28412c3a83 100644
--- a/sw/CppunitTest_sw_test_filters.mk
+++ b/sw/CppunitTest_sw_test_filters.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index 83e856ac9cc7..a9259f3a3e26 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/JunitTest_sw_unoapi.mk b/sw/JunitTest_sw_unoapi.mk
index 0c58c5c06234..1e64feb93469 100644
--- a/sw/JunitTest_sw_unoapi.mk
+++ b/sw/JunitTest_sw_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Library_msword.mk b/sw/Library_msword.mk
index b58b41cfc878..2f395e1bff19 100644
--- a/sw/Library_msword.mk
+++ b/sw/Library_msword.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 9271a0d799c2..0636bdf34b2a 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Library_swd.mk b/sw/Library_swd.mk
index 402f86817821..08245f0d251b 100644
--- a/sw/Library_swd.mk
+++ b/sw/Library_swd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Library_swui.mk b/sw/Library_swui.mk
index f82e85880a98..cc12e447d025 100644
--- a/sw/Library_swui.mk
+++ b/sw/Library_swui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Library_vbaswobj.mk b/sw/Library_vbaswobj.mk
index 4c4a8fb7c2fd..69588413d05a 100644
--- a/sw/Library_vbaswobj.mk
+++ b/sw/Library_vbaswobj.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 685c1bb41f6c..67932a88fabf 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Package_misc.mk b/sw/Package_misc.mk
index ea22c0010363..c40df0c07197 100644
--- a/sw/Package_misc.mk
+++ b/sw/Package_misc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Package_uiconfig.mk b/sw/Package_uiconfig.mk
index 8a38ae3e1f76..57e7f0be7e83 100644
--- a/sw/Package_uiconfig.mk
+++ b/sw/Package_uiconfig.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/sw/Package_xml.mk b/sw/Package_xml.mk
index f292231b6ff8..019daa13d312 100644
--- a/sw/Package_xml.mk
+++ b/sw/Package_xml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/AllLangResTarget_tk.mk b/toolkit/AllLangResTarget_tk.mk
index a9a31e26f37d..645426898fc0 100644
--- a/toolkit/AllLangResTarget_tk.mk
+++ b/toolkit/AllLangResTarget_tk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/JunitTest_toolkit_unoapi.mk b/toolkit/JunitTest_toolkit_unoapi.mk
index 791cb166f3e1..01cebea65cfe 100644
--- a/toolkit/JunitTest_toolkit_unoapi.mk
+++ b/toolkit/JunitTest_toolkit_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk
index 56748dff5315..ca599fef7f9f 100644
--- a/toolkit/Library_tk.mk
+++ b/toolkit/Library_tk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk
index 9257d33a07df..1ea85f3fbf90 100644
--- a/toolkit/Module_toolkit.mk
+++ b/toolkit/Module_toolkit.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/Package_inc.mk b/toolkit/Package_inc.mk
index 8b8f63402cd1..61feff56d3f1 100644
--- a/toolkit/Package_inc.mk
+++ b/toolkit/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/Package_source.mk b/toolkit/Package_source.mk
index 6c3fdaccf853..f84ff8186701 100644
--- a/toolkit/Package_source.mk
+++ b/toolkit/Package_source.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/toolkit/Package_util.mk b/toolkit/Package_util.mk
index 4c50b0dabf12..58cd563546d6 100644
--- a/toolkit/Package_util.mk
+++ b/toolkit/Package_util.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/CppunitTest_tools_test.mk b/tools/CppunitTest_tools_test.mk
index 03954f8caf8d..5808e3a5f18e 100644
--- a/tools/CppunitTest_tools_test.mk
+++ b/tools/CppunitTest_tools_test.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/tools/Executable_bestreversemap.mk b/tools/Executable_bestreversemap.mk
index c201464de98f..97112cdf86df 100644
--- a/tools/Executable_bestreversemap.mk
+++ b/tools/Executable_bestreversemap.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/tools/Executable_mkunroll.mk b/tools/Executable_mkunroll.mk
index fd55c3a173d3..5c60850d0bc1 100644
--- a/tools/Executable_mkunroll.mk
+++ b/tools/Executable_mkunroll.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/Executable_rscdep.mk b/tools/Executable_rscdep.mk
index 42c95514cdd0..ba3cef72cd5b 100644
--- a/tools/Executable_rscdep.mk
+++ b/tools/Executable_rscdep.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/Executable_so_checksum.mk b/tools/Executable_so_checksum.mk
index 3d46e2fbdc58..29ac8cc9c25b 100644
--- a/tools/Executable_so_checksum.mk
+++ b/tools/Executable_so_checksum.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/Executable_tools_cppunittester_all.mk b/tools/Executable_tools_cppunittester_all.mk
index 28ed5c65b6a8..a5325f9d741b 100644
--- a/tools/Executable_tools_cppunittester_all.mk
+++ b/tools/Executable_tools_cppunittester_all.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 87f09b9d0bfc..0a79ada1c928 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index 0948d0b69302..dc8fbbcd43e4 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/Package_inc.mk b/tools/Package_inc.mk
index a5d0ca24dc63..4ccb7299d7b1 100644
--- a/tools/Package_inc.mk
+++ b/tools/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk
index 52cecfab3bac..14adf9b06912 100644
--- a/tools/Package_reversemap.mk
+++ b/tools/Package_reversemap.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/tools/StaticLibrary_ooopathutils.mk b/tools/StaticLibrary_ooopathutils.mk
index f5c27025904f..e32c947ded78 100644
--- a/tools/StaticLibrary_ooopathutils.mk
+++ b/tools/StaticLibrary_ooopathutils.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/tools/StaticLibrary_toolshelpers.mk b/tools/StaticLibrary_toolshelpers.mk
index d239178a404d..7ef012377c49 100644
--- a/tools/StaticLibrary_toolshelpers.mk
+++ b/tools/StaticLibrary_toolshelpers.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/ucb/JunitTest_ucb_complex.mk b/ucb/JunitTest_ucb_complex.mk
index 1cdbbb9afde9..bd013ee2c3ab 100644
--- a/ucb/JunitTest_ucb_complex.mk
+++ b/ucb/JunitTest_ucb_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/ucb/JunitTest_ucb_unoapi.mk b/ucb/JunitTest_ucb_unoapi.mk
index 1e83f1306254..9d00396a2720 100644
--- a/ucb/JunitTest_ucb_unoapi.mk
+++ b/ucb/JunitTest_ucb_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/ucb/Module_ucb.mk b/ucb/Module_ucb.mk
index 465929bb3b99..47df6d3af61c 100644
--- a/ucb/Module_ucb.mk
+++ b/ucb/Module_ucb.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/ucbhelper/Library_ucbhelper.mk b/ucbhelper/Library_ucbhelper.mk
index e7d8398d88e3..c048c46d5095 100644
--- a/ucbhelper/Library_ucbhelper.mk
+++ b/ucbhelper/Library_ucbhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/ucbhelper/Module_ucbhelper.mk b/ucbhelper/Module_ucbhelper.mk
index b5e1d47e119f..05a561740fff 100644
--- a/ucbhelper/Module_ucbhelper.mk
+++ b/ucbhelper/Module_ucbhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/ucbhelper/Package_inc.mk b/ucbhelper/Package_inc.mk
index 1cbe250fadf1..0ef822ec10ba 100644
--- a/ucbhelper/Package_inc.mk
+++ b/ucbhelper/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/udkapi/Module_udkapi.mk b/udkapi/Module_udkapi.mk
index 976b27c98881..d25344355f66 100644
--- a/udkapi/Module_udkapi.mk
+++ b/udkapi/Module_udkapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/udkapi/Package_udkapi_idl.mk b/udkapi/Package_udkapi_idl.mk
index 782ff0d3d78e..4c6591fb944a 100644
--- a/udkapi/Package_udkapi_idl.mk
+++ b/udkapi/Package_udkapi_idl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/udkapi/Package_udkapi_inc.mk b/udkapi/Package_udkapi_inc.mk
index 48bbc43a518b..3fc8a1b609d8 100644
--- a/udkapi/Package_udkapi_inc.mk
+++ b/udkapi/Package_udkapi_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/udkapi/UnoApi_udkapi.mk b/udkapi/UnoApi_udkapi.mk
index 389b104bb83b..966bfe58b2f7 100644
--- a/udkapi/UnoApi_udkapi.mk
+++ b/udkapi/UnoApi_udkapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/udkapi/UnoApi_uretypes.mk b/udkapi/UnoApi_uretypes.mk
index 91368b523572..d61d07912ec2 100644
--- a/udkapi/UnoApi_uretypes.mk
+++ b/udkapi/UnoApi_uretypes.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/unotools/JunitTest_unotools_complex.mk b/unotools/JunitTest_unotools_complex.mk
index 54c5c71a1943..4469a21f3ae4 100644
--- a/unotools/JunitTest_unotools_complex.mk
+++ b/unotools/JunitTest_unotools_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/unotools/Library_utl.mk b/unotools/Library_utl.mk
index ad12dce09ce1..617169f64d9d 100644
--- a/unotools/Library_utl.mk
+++ b/unotools/Library_utl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/unotools/Module_unotools.mk b/unotools/Module_unotools.mk
index a733906915a0..19486607f118 100644
--- a/unotools/Module_unotools.mk
+++ b/unotools/Module_unotools.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# OpenOffice.org - a multi-platform office productivity suite
diff --git a/unotools/Package_inc.mk b/unotools/Package_inc.mk
index 2da66be727cd..a616cf92c2ab 100644
--- a/unotools/Package_inc.mk
+++ b/unotools/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/unoxml/JunitTest_unordf_complex.mk b/unoxml/JunitTest_unordf_complex.mk
index d4945d27de88..ce897704edd2 100644
--- a/unoxml/JunitTest_unordf_complex.mk
+++ b/unoxml/JunitTest_unordf_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/unoxml/JunitTest_unoxml_complex.mk b/unoxml/JunitTest_unoxml_complex.mk
index 68171f9cf462..beeb2f728490 100644
--- a/unoxml/JunitTest_unoxml_complex.mk
+++ b/unoxml/JunitTest_unoxml_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/unoxml/Library_unordf.mk b/unoxml/Library_unordf.mk
index 00c8af66a3c7..2d0276a01a97 100644
--- a/unoxml/Library_unordf.mk
+++ b/unoxml/Library_unordf.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/unoxml/Library_unoxml.mk b/unoxml/Library_unoxml.mk
index 8e06022ee871..8014bace26cb 100644
--- a/unoxml/Library_unoxml.mk
+++ b/unoxml/Library_unoxml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/unoxml/Module_unoxml.mk b/unoxml/Module_unoxml.mk
index a189b78b94fe..295546ae4da4 100644
--- a/unoxml/Module_unoxml.mk
+++ b/unoxml/Module_unoxml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vbahelper/Library_msforms.mk b/vbahelper/Library_msforms.mk
index ee1f3c1f9f71..2f6e26df295c 100644
--- a/vbahelper/Library_msforms.mk
+++ b/vbahelper/Library_msforms.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vbahelper/Library_vbahelper.mk b/vbahelper/Library_vbahelper.mk
index 719cdce0a212..6ce7185c2974 100644
--- a/vbahelper/Library_vbahelper.mk
+++ b/vbahelper/Library_vbahelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vbahelper/Makefile b/vbahelper/Makefile
index 8d71119918b6..8d71119918b6 100755..100644
--- a/vbahelper/Makefile
+++ b/vbahelper/Makefile
diff --git a/vbahelper/Module_vbahelper.mk b/vbahelper/Module_vbahelper.mk
index 39b829fd0d9f..d272fb11e1ee 100644
--- a/vbahelper/Module_vbahelper.mk
+++ b/vbahelper/Module_vbahelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vbahelper/Package_inc.mk b/vbahelper/Package_inc.mk
index c688940c5c0b..ffdc2f43d6f7 100644
--- a/vbahelper/Package_inc.mk
+++ b/vbahelper/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk
index 41b351d6d392..b84b9aad4398 100644
--- a/vcl/AllLangResTarget_vcl.mk
+++ b/vcl/AllLangResTarget_vcl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_desktop_detector.mk b/vcl/Library_desktop_detector.mk
index 2c426573f631..2bae9ef0a25e 100644
--- a/vcl/Library_desktop_detector.mk
+++ b/vcl/Library_desktop_detector.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 67ccf44fae47..66d003c9d63d 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 29ebb4d80815..4ba10d2ccbad 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vclplug_gtk.mk b/vcl/Library_vclplug_gtk.mk
index d155b2ba4dae..2e1983ecdb84 100644
--- a/vcl/Library_vclplug_gtk.mk
+++ b/vcl/Library_vclplug_gtk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 5846c35d9bd4..4642923ca0b8 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vclplug_kde.mk b/vcl/Library_vclplug_kde.mk
index 99f11ab37981..19c42e073a59 100644
--- a/vcl/Library_vclplug_kde.mk
+++ b/vcl/Library_vclplug_kde.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vclplug_kde4.mk b/vcl/Library_vclplug_kde4.mk
index 2b0e2692e915..8476fafe8e25 100644
--- a/vcl/Library_vclplug_kde4.mk
+++ b/vcl/Library_vclplug_kde4.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Library_vclplug_svp.mk b/vcl/Library_vclplug_svp.mk
index 107578353048..d6a67f826e46 100644
--- a/vcl/Library_vclplug_svp.mk
+++ b/vcl/Library_vclplug_svp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk
index 9b5a3e65ff38..224a68a6c95b 100644
--- a/vcl/Module_vcl.mk
+++ b/vcl/Module_vcl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Package_afmhash.mk b/vcl/Package_afmhash.mk
index 52aeea7a0718..cc7cd58744cc 100644
--- a/vcl/Package_afmhash.mk
+++ b/vcl/Package_afmhash.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/vcl/Package_inc.mk b/vcl/Package_inc.mk
index d1b4920cb05a..a973a0353ec9 100644
--- a/vcl/Package_inc.mk
+++ b/vcl/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/Package_kde4moc.mk b/vcl/Package_kde4moc.mk
index e146d8929d7b..c7b5af39f57b 100644
--- a/vcl/Package_kde4moc.mk
+++ b/vcl/Package_kde4moc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/vcl/Package_osx.mk b/vcl/Package_osx.mk
index af4efd6a1271..17df37a131f5 100644
--- a/vcl/Package_osx.mk
+++ b/vcl/Package_osx.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/StaticLibrary_vclmain.mk b/vcl/StaticLibrary_vclmain.mk
index 9d4733158eb2..52dbf0034ea7 100644
--- a/vcl/StaticLibrary_vclmain.mk
+++ b/vcl/StaticLibrary_vclmain.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index 31d65fe92cef..2a6bc80fb96e 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_cal.mk b/wizards/AllLangResTarget_cal.mk
index 36cc8a772765..4f812bb6f4c2 100644
--- a/wizards/AllLangResTarget_cal.mk
+++ b/wizards/AllLangResTarget_cal.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_dbw.mk b/wizards/AllLangResTarget_dbw.mk
index 5d3c557d7267..f9e1ee11b599 100644
--- a/wizards/AllLangResTarget_dbw.mk
+++ b/wizards/AllLangResTarget_dbw.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_eur.mk b/wizards/AllLangResTarget_eur.mk
index 6fa0fd57a533..d2ff342b2fdc 100644
--- a/wizards/AllLangResTarget_eur.mk
+++ b/wizards/AllLangResTarget_eur.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_imp.mk b/wizards/AllLangResTarget_imp.mk
index ff3b2eefa6b6..afbc44918d92 100644
--- a/wizards/AllLangResTarget_imp.mk
+++ b/wizards/AllLangResTarget_imp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_tpl.mk b/wizards/AllLangResTarget_tpl.mk
index a7d178cdff26..d2326fb9bf07 100644
--- a/wizards/AllLangResTarget_tpl.mk
+++ b/wizards/AllLangResTarget_tpl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_wwz.mk b/wizards/AllLangResTarget_wwz.mk
index 8bfeab492d80..a81dcb09faba 100644
--- a/wizards/AllLangResTarget_wwz.mk
+++ b/wizards/AllLangResTarget_wwz.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/AllLangResTarget_wzi.mk b/wizards/AllLangResTarget_wzi.mk
index 62cdd2a8285e..8566dc9fa014 100644
--- a/wizards/AllLangResTarget_wzi.mk
+++ b/wizards/AllLangResTarget_wzi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_agenda.mk b/wizards/Jar_agenda.mk
index 4f6fd1036b56..eb5423e1e31e 100644
--- a/wizards/Jar_agenda.mk
+++ b/wizards/Jar_agenda.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_commonwizards.mk b/wizards/Jar_commonwizards.mk
index dcc4c6d7b67e..b2dbb4a94571 100644
--- a/wizards/Jar_commonwizards.mk
+++ b/wizards/Jar_commonwizards.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_fax.mk b/wizards/Jar_fax.mk
index 941fd050a304..7a86e605694a 100644
--- a/wizards/Jar_fax.mk
+++ b/wizards/Jar_fax.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_form.mk b/wizards/Jar_form.mk
index 02c5ce40917f..d4e04aa60b7b 100644
--- a/wizards/Jar_form.mk
+++ b/wizards/Jar_form.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_letter.mk b/wizards/Jar_letter.mk
index 2f69f799210e..aaa73327c90b 100644
--- a/wizards/Jar_letter.mk
+++ b/wizards/Jar_letter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_query.mk b/wizards/Jar_query.mk
index a9a580749c06..62ea5e67345a 100644
--- a/wizards/Jar_query.mk
+++ b/wizards/Jar_query.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_report.mk b/wizards/Jar_report.mk
index 80caacbc8761..770cbdb5c04b 100644
--- a/wizards/Jar_report.mk
+++ b/wizards/Jar_report.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_reportbuilder.mk b/wizards/Jar_reportbuilder.mk
index c8e8a647010f..74faf137e747 100644
--- a/wizards/Jar_reportbuilder.mk
+++ b/wizards/Jar_reportbuilder.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_table.mk b/wizards/Jar_table.mk
index b99b741f4fe6..f65ab18d6bfa 100644
--- a/wizards/Jar_table.mk
+++ b/wizards/Jar_table.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Jar_web.mk b/wizards/Jar_web.mk
index 1fe0401ea84a..340fa4ec4e33 100644
--- a/wizards/Jar_web.mk
+++ b/wizards/Jar_web.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Module_wizards.mk b/wizards/Module_wizards.mk
index 42cb8b8a0e79..7f08d0f08cfe 100644
--- a/wizards/Module_wizards.mk
+++ b/wizards/Module_wizards.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_depot.mk b/wizards/Zip_depot.mk
index 02c5c07f3d1b..8dd5fef64c33 100644
--- a/wizards/Zip_depot.mk
+++ b/wizards/Zip_depot.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_euro.mk b/wizards/Zip_euro.mk
index ffd173bb53cf..ac71ce946978 100644
--- a/wizards/Zip_euro.mk
+++ b/wizards/Zip_euro.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_form.mk b/wizards/Zip_form.mk
index 619be95b991b..8a2d577484c9 100644
--- a/wizards/Zip_form.mk
+++ b/wizards/Zip_form.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_gimmicks.mk b/wizards/Zip_gimmicks.mk
index 491a5964adb8..1099756f6bee 100644
--- a/wizards/Zip_gimmicks.mk
+++ b/wizards/Zip_gimmicks.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_import.mk b/wizards/Zip_import.mk
index e09b6dff0d2d..1cabc80d74d4 100644
--- a/wizards/Zip_import.mk
+++ b/wizards/Zip_import.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_launcher.mk b/wizards/Zip_launcher.mk
index bd1a99ed654d..1fb18b0421e5 100644
--- a/wizards/Zip_launcher.mk
+++ b/wizards/Zip_launcher.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_schedule.mk b/wizards/Zip_schedule.mk
index 7ef68a84bd93..ec294746608e 100644
--- a/wizards/Zip_schedule.mk
+++ b/wizards/Zip_schedule.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_share.mk b/wizards/Zip_share.mk
index 2d6a6597e7ef..5f90a1a3a289 100644
--- a/wizards/Zip_share.mk
+++ b/wizards/Zip_share.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_standard.mk b/wizards/Zip_standard.mk
index f63539fd4e12..87bbb4a43814 100644
--- a/wizards/Zip_standard.mk
+++ b/wizards/Zip_standard.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_template.mk b/wizards/Zip_template.mk
index 1cb2030094da..238a3752736f 100644
--- a/wizards/Zip_template.mk
+++ b/wizards/Zip_template.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_tools.mk b/wizards/Zip_tools.mk
index bb51103ba868..f7231138109d 100644
--- a/wizards/Zip_tools.mk
+++ b/wizards/Zip_tools.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_tutorials.mk b/wizards/Zip_tutorials.mk
index c9b56aa44dc6..6c0608a6e505 100644
--- a/wizards/Zip_tutorials.mk
+++ b/wizards/Zip_tutorials.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_usr.mk b/wizards/Zip_usr.mk
index 8f0d2fbe3bb2..efb2968c63ec 100644
--- a/wizards/Zip_usr.mk
+++ b/wizards/Zip_usr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/wizards/Zip_web.mk b/wizards/Zip_web.mk
index 599c0cb19a29..c552440b5414 100644
--- a/wizards/Zip_web.mk
+++ b/wizards/Zip_web.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerfilter/CppunitTest_writerfilter_doctok.mk b/writerfilter/CppunitTest_writerfilter_doctok.mk
index ecba3de9aae4..f04202cf0fb8 100644
--- a/writerfilter/CppunitTest_writerfilter_doctok.mk
+++ b/writerfilter/CppunitTest_writerfilter_doctok.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerfilter/CppunitTest_writerfilter_rtftok.mk b/writerfilter/CppunitTest_writerfilter_rtftok.mk
index de88dc695077..e6ad45f93b50 100644
--- a/writerfilter/CppunitTest_writerfilter_rtftok.mk
+++ b/writerfilter/CppunitTest_writerfilter_rtftok.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
diff --git a/writerfilter/JunitTest_writerfilter_complex.mk b/writerfilter/JunitTest_writerfilter_complex.mk
index 565fe25b10b6..cf238a25e8a0 100644
--- a/writerfilter/JunitTest_writerfilter_complex.mk
+++ b/writerfilter/JunitTest_writerfilter_complex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerfilter/Library_doctok.mk b/writerfilter/Library_doctok.mk
index e7b1a024a3e3..5be4387123e6 100644
--- a/writerfilter/Library_doctok.mk
+++ b/writerfilter/Library_doctok.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Library_ooxml.mk b/writerfilter/Library_ooxml.mk
index 203d39bd2b09..ca3665be6637 100644
--- a/writerfilter/Library_ooxml.mk
+++ b/writerfilter/Library_ooxml.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Library_resourcemodel.mk b/writerfilter/Library_resourcemodel.mk
index ca63541d8707..ed27349de588 100644
--- a/writerfilter/Library_resourcemodel.mk
+++ b/writerfilter/Library_resourcemodel.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Library_rtftok.mk b/writerfilter/Library_rtftok.mk
index d5d536da08c2..136aad1a8beb 100644
--- a/writerfilter/Library_rtftok.mk
+++ b/writerfilter/Library_rtftok.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Library_writerfilter.mk b/writerfilter/Library_writerfilter.mk
index 1994340eaf11..69ca17242a55 100644
--- a/writerfilter/Library_writerfilter.mk
+++ b/writerfilter/Library_writerfilter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Library_writerfilter_uno.mk b/writerfilter/Library_writerfilter_uno.mk
index 245eabec44e9..2e9e61dd1907 100644
--- a/writerfilter/Library_writerfilter_uno.mk
+++ b/writerfilter/Library_writerfilter_uno.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Makefile b/writerfilter/Makefile
index 8d71119918b6..8d71119918b6 100755..100644
--- a/writerfilter/Makefile
+++ b/writerfilter/Makefile
diff --git a/writerfilter/Module_writerfilter.mk b/writerfilter/Module_writerfilter.mk
index 92d0ab565b25..83946c2c5edf 100644
--- a/writerfilter/Module_writerfilter.mk
+++ b/writerfilter/Module_writerfilter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
# Version: MPL 1.1 / GPLv3+ / LGPLv3+
#
# The contents of this file are subject to the Mozilla Public License Version
diff --git a/writerfilter/Package_writerfilter_generated.mk b/writerfilter/Package_writerfilter_generated.mk
index fe9aea3d741c..3a7b8ceb79d5 100644
--- a/writerfilter/Package_writerfilter_generated.mk
+++ b/writerfilter/Package_writerfilter_generated.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerperfect/Library_msworks.mk b/writerperfect/Library_msworks.mk
index ca23ec6e169b..a00106c810c5 100644
--- a/writerperfect/Library_msworks.mk
+++ b/writerperfect/Library_msworks.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerperfect/Library_visioimport.mk b/writerperfect/Library_visioimport.mk
index 6b0423ab5cc5..e32ea32ddf2a 100644
--- a/writerperfect/Library_visioimport.mk
+++ b/writerperfect/Library_visioimport.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerperfect/Library_wpft.mk b/writerperfect/Library_wpft.mk
index 9b552a6412db..ecc43862437d 100644
--- a/writerperfect/Library_wpft.mk
+++ b/writerperfect/Library_wpft.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerperfect/Library_wpgimport.mk b/writerperfect/Library_wpgimport.mk
index 99c70f8554dc..d83cc98f29d7 100644
--- a/writerperfect/Library_wpgimport.mk
+++ b/writerperfect/Library_wpgimport.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerperfect/Module_writerperfect.mk b/writerperfect/Module_writerperfect.mk
index 9784a03f79a0..9d0c77ad3f51 100644
--- a/writerperfect/Module_writerperfect.mk
+++ b/writerperfect/Module_writerperfect.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/writerperfect/StaticLibrary_writerperfect.mk b/writerperfect/StaticLibrary_writerperfect.mk
index cb3106a59cd3..a31e4da1b980 100644
--- a/writerperfect/StaticLibrary_writerperfect.mk
+++ b/writerperfect/StaticLibrary_writerperfect.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/JunitTest_xmloff_unoapi.mk b/xmloff/JunitTest_xmloff_unoapi.mk
index a2fac786c027..cc57b329c6b4 100644
--- a/xmloff/JunitTest_xmloff_unoapi.mk
+++ b/xmloff/JunitTest_xmloff_unoapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk
index b279bc21f713..9f1cc21d2e6e 100644
--- a/xmloff/Library_xo.mk
+++ b/xmloff/Library_xo.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk
index d57ecda14bbc..e855693314fa 100644
--- a/xmloff/Library_xof.mk
+++ b/xmloff/Library_xof.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/Makefile b/xmloff/Makefile
index 8d71119918b6..8d71119918b6 100755..100644
--- a/xmloff/Makefile
+++ b/xmloff/Makefile
diff --git a/xmloff/Module_xmloff.mk b/xmloff/Module_xmloff.mk
index fae1d7ac4dc9..db84838136d1 100644
--- a/xmloff/Module_xmloff.mk
+++ b/xmloff/Module_xmloff.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/Package_dtd.mk b/xmloff/Package_dtd.mk
index 2219c145b704..4c17c55488b6 100644
--- a/xmloff/Package_dtd.mk
+++ b/xmloff/Package_dtd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmloff/Package_inc.mk b/xmloff/Package_inc.mk
index 2b9e1733cebd..1d349bf3262e 100644
--- a/xmloff/Package_inc.mk
+++ b/xmloff/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlreader/Library_xmlreader.mk b/xmlreader/Library_xmlreader.mk
index 8e2e04072089..24ebbc1ac94b 100644
--- a/xmlreader/Library_xmlreader.mk
+++ b/xmlreader/Library_xmlreader.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlreader/Module_xmlreader.mk b/xmlreader/Module_xmlreader.mk
index f9d655d47c55..6f6702f48e61 100644
--- a/xmlreader/Module_xmlreader.mk
+++ b/xmlreader/Module_xmlreader.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlreader/Package_inc.mk b/xmlreader/Package_inc.mk
index 3c2bc604a81c..ab2b5576e351 100644
--- a/xmlreader/Package_inc.mk
+++ b/xmlreader/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlscript/Library_xcr.mk b/xmlscript/Library_xcr.mk
index c6812afc87f8..c956cdd7eac1 100644
--- a/xmlscript/Library_xcr.mk
+++ b/xmlscript/Library_xcr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlscript/Module_xmlscript.mk b/xmlscript/Module_xmlscript.mk
index de357494038c..ce46bf552adc 100644
--- a/xmlscript/Module_xmlscript.mk
+++ b/xmlscript/Module_xmlscript.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlscript/Package_dtd.mk b/xmlscript/Package_dtd.mk
index 4f26161693ab..bd9cdf469320 100644
--- a/xmlscript/Package_dtd.mk
+++ b/xmlscript/Package_dtd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
diff --git a/xmlscript/Package_inc.mk b/xmlscript/Package_inc.mk
index 016fb8d36f01..5bba0c720185 100644
--- a/xmlscript/Package_inc.mk
+++ b/xmlscript/Package_inc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#*************************************************************************
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.