Mon Apr 28 07:37:09 PDT 2014

Library_merged.mk                                     |    2 +-
 apple_remote/Library_AppleRemote.mk                   |    2 +-
 apple_remote/Module_apple_remote.mk                   |    2 +-
 avmedia/AllLangResTarget_avmedia.mk                   |    2 +-
 avmedia/Library_avmedia.mk                            |    2 +-
 avmedia/Library_avmediaQuickTime.mk                   |    2 +-
 avmedia/Library_avmediagst.mk                         |    2 +-
 avmedia/Library_avmediagst_0_10.mk                    |    2 +-
 avmedia/Library_avmediavlc.mk                         |    2 +-
 avmedia/Library_avmediawin.mk                         |    2 +-
 avmedia/Module_avmedia.mk                             |    2 +-
 bean/Library_officebean.mk                            |    2 +-
 binaryurp/CppunitTest_binaryurp_test-cache.mk         |    2 +-
 binaryurp/CppunitTest_binaryurp_test-unmarshal.mk     |    2 +-
 binaryurp/Library_binaryurp.mk                        |    2 +-
 binaryurp/Module_binaryurp.mk                         |    2 +-
 canvas/StaticLibrary_directxcanvas.mk                 |    2 +-
 codemaker/StaticLibrary_codemaker.mk                  |    2 +-
 codemaker/StaticLibrary_codemaker_cpp.mk              |    2 +-
 codemaker/StaticLibrary_codemaker_java.mk             |    2 +-
 cppu/Library_affine_uno_uno.mk                        |    2 +-
 cppu/Library_cppu.mk                                  |    2 +-
 cppu/Library_log_uno_uno.mk                           |    2 +-
 cppu/Library_purpenvhelper.mk                         |    2 +-
 cppu/Library_unsafe_uno_uno.mk                        |    2 +-
 cppu/Module_cppu.mk                                   |    2 +-
 cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk |    2 +-
 cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk      |    2 +-
 cppuhelper/CppunitTest_cppuhelper_qa_weak.mk          |    2 +-
 cppuhelper/Library_cppuhelper.mk                      |    2 +-
 cppuhelper/Module_cppuhelper.mk                       |    2 +-
 desktop/StaticLibrary_winextendloaderenv.mk           |    2 +-
 desktop/StaticLibrary_winlauncher.mk                  |    2 +-
 extensions/AllLangResTarget_abp.mk                    |    2 +-
 extensions/AllLangResTarget_bib.mk                    |    2 +-
 extensions/AllLangResTarget_dbp.mk                    |    2 +-
 extensions/AllLangResTarget_pcr.mk                    |    2 +-
 extensions/AllLangResTarget_scn.mk                    |    2 +-
 extensions/AllLangResTarget_upd.mk                    |    2 +-
 extensions/AllLangResTarget_updchk.mk                 |    2 +-
 extensions/Configuration_updchk.mk                    |    2 +-
 extensions/CppunitTest_extensions_test_update.mk      |    2 +-
 extensions/Executable_nsplugin.mk                     |    2 +-
 extensions/Executable_pluginapp.bin.mk                |    2 +-
 extensions/Library_OOoSpotlightImporter.mk            |    2 +-
 extensions/Library_abp.mk                             |    2 +-
 extensions/Library_bib.mk                             |    2 +-
 extensions/Library_dbp.mk                             |    2 +-
 extensions/Library_ldapbe2.mk                         |    2 +-
 extensions/Library_log.mk                             |    2 +-
 extensions/Library_npsoplugin.mk                      |    2 +-
 extensions/Library_oleautobridge.mk                   |    2 +-
 extensions/Library_pcr.mk                             |    2 +-
 extensions/Library_pl.mk                              |    2 +-
 extensions/Library_res.mk                             |    2 +-
 extensions/Library_scn.mk                             |    2 +-
 extensions/Library_so_activex.mk                      |    2 +-
 extensions/Library_so_activex_x64.mk                  |    2 +-
 extensions/Library_updatecheckui.mk                   |    2 +-
 extensions/Library_updatefeed.mk                      |    2 +-
 extensions/Library_updchk.mk                          |    2 +-
 extensions/StaticLibrary_npsoenv.mk                   |    2 +-
 extensions/StaticLibrary_plugcon.mk                   |    2 +-
 extensions/WinResTarget_activex.mk                    |    2 +-
 extensions/WinResTarget_npsoplugin.mk                 |    2 +-
 fpicker/AllLangResTarget_fps_office.mk                |    2 +-
 fpicker/Library_fps.mk                                |    2 +-
 fpicker/Library_fps_aqua.mk                           |    2 +-
 fpicker/Library_fps_office.mk                         |    2 +-
 fpicker/Module_fpicker.mk                             |    2 +-
 l10ntools/StaticLibrary_transex.mk                    |    2 +-
 lingucomponent/Library_MacOSXSpell.mk                 |    2 +-
 lingucomponent/Library_guesslang.mk                   |    2 +-
 lingucomponent/Library_hyphen.mk                      |    2 +-
 lingucomponent/Library_lnth.mk                        |    2 +-
 lingucomponent/Library_spell.mk                       |    2 +-
 lingucomponent/Module_lingucomponent.mk               |    2 +-
 lingucomponent/StaticLibrary_ulingu.mk                |    2 +-
 o3tl/CppunitTest_o3tl_tests.mk                        |    2 +-
 odk/CppunitTest_checkapi.mk                           |    2 +-
 odk/CustomTarget_allheaders.mk                        |    2 +-
 officecfg/CppunitTest_officecfg_cppheader_test.mk     |    2 +-
 officecfg/CustomTarget_registry.mk                    |    2 +-
 package/Library_package2.mk                           |    2 +-
 package/Library_xstor.mk                              |    2 +-
 package/Module_package.mk                             |    2 +-
 package/Package_dtd.mk                                |    2 +-
 registry/StaticLibrary_registry_helper.mk             |    2 +-
 sal/CppunitTest_Module_DLL.mk                         |    2 +-
 sal/CppunitTest_sal_bytesequence.mk                   |    2 +-
 sal/CppunitTest_sal_osl_condition.mk                  |    2 +-
 sal/CppunitTest_sal_osl_file.mk                       |    2 +-
 sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk   |    2 +-
 sal/CppunitTest_sal_osl_module.mk                     |    2 +-
 sal/CppunitTest_sal_osl_old_test_file.mk              |    2 +-
 sal/CppunitTest_sal_osl_process.mk                    |    2 +-
 sal/CppunitTest_sal_osl_security.mk                   |    2 +-
 sal/CppunitTest_sal_osl_thread.mk                     |    2 +-
 sal/CppunitTest_sal_rtl_alloc.mk                      |    2 +-
 sal/CppunitTest_sal_rtl_cipher.mk                     |    2 +-
 sal/CppunitTest_sal_rtl_crc32.mk                      |    2 +-
 sal/CppunitTest_sal_rtl_digest.mk                     |    2 +-
 sal/CppunitTest_sal_rtl_doublelock.mk                 |    2 +-
 sal/CppunitTest_sal_rtl_locale.mk                     |    2 +-
 sal/CppunitTest_sal_rtl_ostringbuffer.mk              |    2 +-
 sal/CppunitTest_sal_rtl_oustring.mk                   |    2 +-
 sal/CppunitTest_sal_rtl_oustringbuffer.mk             |    2 +-
 sal/CppunitTest_sal_rtl_process.mk                    |    2 +-
 sal/CppunitTest_sal_rtl_strings.mk                    |    2 +-
 sal/CppunitTest_sal_tcwf.mk                           |    2 +-
 sal/CppunitTest_sal_types.mk                          |    2 +-
 sal/Executable_cppunittester.mk                       |    2 +-
 sal/Executable_osl_process_child.mk                   |    2 +-
 sal/Library_lo-bootstrap.mk                           |    2 +-
 sal/Library_sal.mk                                    |    2 +-
 sal/Library_sal_textenc.mk                            |    2 +-
 sal/Library_uwinapi.mk                                |    2 +-
 sal/Module_sal.mk                                     |    2 +-
 sal/StaticLibrary_salcpprt.mk                         |    2 +-
 salhelper/Library_salhelper.mk                        |    2 +-
 salhelper/Module_salhelper.mk                         |    2 +-
 scripting/Jar_HelloWorld.mk                           |    2 +-
 scripting/Jar_Highlight.mk                            |    2 +-
 scripting/Jar_MemoryUsage.mk                          |    2 +-
 scripting/Jar_ScriptFramework.mk                      |    2 +-
 scripting/Jar_ScriptProviderForBeanShell.mk           |    2 +-
 scripting/Jar_ScriptProviderForJava.mk                |    2 +-
 scripting/Jar_ScriptProviderForJavaScript.mk          |    2 +-
 scripting/Library_basprov.mk                          |    2 +-
 scripting/Library_dlgprov.mk                          |    2 +-
 scripting/Library_protocolhandler.mk                  |    2 +-
 scripting/Library_scriptframe.mk                      |    2 +-
 scripting/Library_stringresource.mk                   |    2 +-
 scripting/Library_vbaevents.mk                        |    2 +-
 scripting/Module_scripting.mk                         |    2 +-
 scripting/Package_ScriptsBeanShell.mk                 |    2 +-
 scripting/Package_ScriptsJavaScript.mk                |    2 +-
 scripting/Package_ScriptsPython.mk                    |    2 +-
 scripting/Package_scriptbindinglib.mk                 |    2 +-
 scripting/Pyuno_mailmerge.mk                          |    2 +-
 solenv/gbuild/extensions/pre_MergedLibsList.mk        |    2 +-
 testtools/StaticLibrary_bridgetest.mk                 |    2 +-
 vcl/Executable_kdefilepicker.mk                       |    2 +-
 vcl/Executable_tdefilepicker.mk                       |    2 +-
 winaccessibility/Library_uacccom.mk                   |    2 +-
 winaccessibility/Library_winaccessibility.mk          |    2 +-
 winaccessibility/WinResTarget_uacccom.mk              |    2 +-
 xmlsecurity/AllLangResTarget_xsec.mk                  |    2 +-
 xmlsecurity/CppunitTest_qa_certext.mk                 |    2 +-
 xmlsecurity/Library_xmlsecurity.mk                    |    2 +-
 xmlsecurity/Library_xsec_fw.mk                        |    2 +-
 xmlsecurity/Library_xsec_xmlsec.mk                    |    2 +-
 xmlsecurity/Module_xmlsecurity.mk                     |    2 +-
 153 files changed, 153 insertions(+), 153 deletions(-)

New commits:
commit 541761d7b8c8ec8f1927989c6c0694174de73644
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date:   Mon Apr 28 23:33:04 2014 +0900

    prefer makefile-gmake-mode
    
    Change-Id: I9cc9bfbddd3a90e00eee3e674994e5d6207f9034

diff --git a/Library_merged.mk b/Library_merged.mk
index 2d7b0f2..ecc72ab 100644
--- a/Library_merged.mk
+++ b/Library_merged.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/apple_remote/Library_AppleRemote.mk b/apple_remote/Library_AppleRemote.mk
index 2ae5291..cf48553 100644
--- a/apple_remote/Library_AppleRemote.mk
+++ b/apple_remote/Library_AppleRemote.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/apple_remote/Module_apple_remote.mk b/apple_remote/Module_apple_remote.mk
index d534ad2..235b31b 100644
--- a/apple_remote/Module_apple_remote.mk
+++ b/apple_remote/Module_apple_remote.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/AllLangResTarget_avmedia.mk b/avmedia/AllLangResTarget_avmedia.mk
index 25bb9cf..3ffd6e0 100644
--- a/avmedia/AllLangResTarget_avmedia.mk
+++ b/avmedia/AllLangResTarget_avmedia.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Library_avmedia.mk b/avmedia/Library_avmedia.mk
index 6dbcb53..a77fb29 100644
--- a/avmedia/Library_avmedia.mk
+++ b/avmedia/Library_avmedia.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Library_avmediaQuickTime.mk b/avmedia/Library_avmediaQuickTime.mk
index 4f02f0e..2c8f5f0 100644
--- a/avmedia/Library_avmediaQuickTime.mk
+++ b/avmedia/Library_avmediaQuickTime.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Library_avmediagst.mk b/avmedia/Library_avmediagst.mk
index 08f4bca..42a6a49 100644
--- a/avmedia/Library_avmediagst.mk
+++ b/avmedia/Library_avmediagst.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Library_avmediagst_0_10.mk b/avmedia/Library_avmediagst_0_10.mk
index bbb0d73..d355076 100644
--- a/avmedia/Library_avmediagst_0_10.mk
+++ b/avmedia/Library_avmediagst_0_10.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Library_avmediavlc.mk b/avmedia/Library_avmediavlc.mk
index 2f6bf9d..12b006c 100644
--- a/avmedia/Library_avmediavlc.mk
+++ b/avmedia/Library_avmediavlc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Library_avmediawin.mk b/avmedia/Library_avmediawin.mk
index 1725aa0..015eb40 100644
--- a/avmedia/Library_avmediawin.mk
+++ b/avmedia/Library_avmediawin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk
index 4a80ad9..5884cbe 100644
--- a/avmedia/Module_avmedia.mk
+++ b/avmedia/Module_avmedia.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/bean/Library_officebean.mk b/bean/Library_officebean.mk
index f05fa30..a865e74 100644
--- a/bean/Library_officebean.mk
+++ b/bean/Library_officebean.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/binaryurp/CppunitTest_binaryurp_test-cache.mk b/binaryurp/CppunitTest_binaryurp_test-cache.mk
index 5dfe086..59191f3 100644
--- a/binaryurp/CppunitTest_binaryurp_test-cache.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-cache.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
index cbd6201..b4da09a 100644
--- a/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
+++ b/binaryurp/CppunitTest_binaryurp_test-unmarshal.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/binaryurp/Library_binaryurp.mk b/binaryurp/Library_binaryurp.mk
index b03e4d3..05f5470 100644
--- a/binaryurp/Library_binaryurp.mk
+++ b/binaryurp/Library_binaryurp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/binaryurp/Module_binaryurp.mk b/binaryurp/Module_binaryurp.mk
index 4f00dfe..fcfd303 100644
--- a/binaryurp/Module_binaryurp.mk
+++ b/binaryurp/Module_binaryurp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/canvas/StaticLibrary_directxcanvas.mk b/canvas/StaticLibrary_directxcanvas.mk
index 7258ec2..9025b13 100644
--- a/canvas/StaticLibrary_directxcanvas.mk
+++ b/canvas/StaticLibrary_directxcanvas.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/codemaker/StaticLibrary_codemaker.mk b/codemaker/StaticLibrary_codemaker.mk
index 9061d95..bc0fd19 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk b/codemaker/StaticLibrary_codemaker_cpp.mk
index bbe91b9..bf1a79f 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/codemaker/StaticLibrary_codemaker_java.mk b/codemaker/StaticLibrary_codemaker_java.mk
index b4a594f..42343a6 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppu/Library_affine_uno_uno.mk b/cppu/Library_affine_uno_uno.mk
index 2df3ab9..aeae6ed 100644
--- a/cppu/Library_affine_uno_uno.mk
+++ b/cppu/Library_affine_uno_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppu/Library_cppu.mk b/cppu/Library_cppu.mk
index 820e88f..437cd42 100644
--- a/cppu/Library_cppu.mk
+++ b/cppu/Library_cppu.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppu/Library_log_uno_uno.mk b/cppu/Library_log_uno_uno.mk
index 62d306f..410f12c 100644
--- a/cppu/Library_log_uno_uno.mk
+++ b/cppu/Library_log_uno_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppu/Library_purpenvhelper.mk b/cppu/Library_purpenvhelper.mk
index 4b47335..7264311 100644
--- a/cppu/Library_purpenvhelper.mk
+++ b/cppu/Library_purpenvhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppu/Library_unsafe_uno_uno.mk b/cppu/Library_unsafe_uno_uno.mk
index b6bdad6..59867ba 100644
--- a/cppu/Library_unsafe_uno_uno.mk
+++ b/cppu/Library_unsafe_uno_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppu/Module_cppu.mk b/cppu/Module_cppu.mk
index 90c9d51..51abe4d 100644
--- a/cppu/Module_cppu.mk
+++ b/cppu/Module_cppu.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
index 2d9c632..b398824 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_ifcontainer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
index c0e3339..b59b36a 100644
--- a/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_cppu_unourl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
index 5ad62fa..d5792d7 100644
--- a/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
+++ b/cppuhelper/CppunitTest_cppuhelper_qa_weak.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppuhelper/Library_cppuhelper.mk b/cppuhelper/Library_cppuhelper.mk
index a2ebf8c..bfcc16a 100644
--- a/cppuhelper/Library_cppuhelper.mk
+++ b/cppuhelper/Library_cppuhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/cppuhelper/Module_cppuhelper.mk b/cppuhelper/Module_cppuhelper.mk
index ba1b008..35bb7b7 100644
--- a/cppuhelper/Module_cppuhelper.mk
+++ b/cppuhelper/Module_cppuhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk
index 4e87b8f..fc1c071 100644
--- a/desktop/StaticLibrary_winextendloaderenv.mk
+++ b/desktop/StaticLibrary_winextendloaderenv.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/desktop/StaticLibrary_winlauncher.mk b/desktop/StaticLibrary_winlauncher.mk
index 1ebefcc..46bed0d 100644
--- a/desktop/StaticLibrary_winlauncher.mk
+++ b/desktop/StaticLibrary_winlauncher.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_abp.mk b/extensions/AllLangResTarget_abp.mk
index 88c0c96..61a4c34 100644
--- a/extensions/AllLangResTarget_abp.mk
+++ b/extensions/AllLangResTarget_abp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_bib.mk b/extensions/AllLangResTarget_bib.mk
index e804755..d027d8f 100644
--- a/extensions/AllLangResTarget_bib.mk
+++ b/extensions/AllLangResTarget_bib.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_dbp.mk b/extensions/AllLangResTarget_dbp.mk
index 61603dd..01d9322 100644
--- a/extensions/AllLangResTarget_dbp.mk
+++ b/extensions/AllLangResTarget_dbp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_pcr.mk b/extensions/AllLangResTarget_pcr.mk
index 3548617..0480dfc 100644
--- a/extensions/AllLangResTarget_pcr.mk
+++ b/extensions/AllLangResTarget_pcr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_scn.mk b/extensions/AllLangResTarget_scn.mk
index 57fd122..2dfa1a2 100644
--- a/extensions/AllLangResTarget_scn.mk
+++ b/extensions/AllLangResTarget_scn.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_upd.mk b/extensions/AllLangResTarget_upd.mk
index c7fe124..c05b888 100644
--- a/extensions/AllLangResTarget_upd.mk
+++ b/extensions/AllLangResTarget_upd.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/AllLangResTarget_updchk.mk b/extensions/AllLangResTarget_updchk.mk
index b4a29d2..48669eb 100644
--- a/extensions/AllLangResTarget_updchk.mk
+++ b/extensions/AllLangResTarget_updchk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Configuration_updchk.mk b/extensions/Configuration_updchk.mk
index 09412e9..394a1ae 100644
--- a/extensions/Configuration_updchk.mk
+++ b/extensions/Configuration_updchk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/CppunitTest_extensions_test_update.mk b/extensions/CppunitTest_extensions_test_update.mk
index ededb36..4eebeb5 100644
--- a/extensions/CppunitTest_extensions_test_update.mk
+++ b/extensions/CppunitTest_extensions_test_update.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Executable_nsplugin.mk b/extensions/Executable_nsplugin.mk
index 103130e62..1e9ced1 100644
--- a/extensions/Executable_nsplugin.mk
+++ b/extensions/Executable_nsplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Executable_pluginapp.bin.mk b/extensions/Executable_pluginapp.bin.mk
index 531aabd..e24390e 100644
--- a/extensions/Executable_pluginapp.bin.mk
+++ b/extensions/Executable_pluginapp.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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_OOoSpotlightImporter.mk b/extensions/Library_OOoSpotlightImporter.mk
index fab34bb..ac55f1e 100644
--- a/extensions/Library_OOoSpotlightImporter.mk
+++ b/extensions/Library_OOoSpotlightImporter.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_abp.mk b/extensions/Library_abp.mk
index b8b15ac..543042c 100644
--- a/extensions/Library_abp.mk
+++ b/extensions/Library_abp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_bib.mk b/extensions/Library_bib.mk
index 9b00c26..2eff260 100644
--- a/extensions/Library_bib.mk
+++ b/extensions/Library_bib.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_dbp.mk b/extensions/Library_dbp.mk
index 62de95b..10019aa 100644
--- a/extensions/Library_dbp.mk
+++ b/extensions/Library_dbp.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk
index 6547a23..0364d58 100644
--- a/extensions/Library_ldapbe2.mk
+++ b/extensions/Library_ldapbe2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_log.mk b/extensions/Library_log.mk
index 1227f9d..1abd7b7 100644
--- a/extensions/Library_log.mk
+++ b/extensions/Library_log.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 74bdb8a..4f385d9 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_oleautobridge.mk b/extensions/Library_oleautobridge.mk
index 2c9e49c..069434c 100644
--- a/extensions/Library_oleautobridge.mk
+++ b/extensions/Library_oleautobridge.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_pcr.mk b/extensions/Library_pcr.mk
index a0ae1af..20de189 100644
--- a/extensions/Library_pcr.mk
+++ b/extensions/Library_pcr.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_pl.mk b/extensions/Library_pl.mk
index 040a47a..680877c 100644
--- a/extensions/Library_pl.mk
+++ b/extensions/Library_pl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_res.mk b/extensions/Library_res.mk
index 6e3ecd7..8360333 100644
--- a/extensions/Library_res.mk
+++ b/extensions/Library_res.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_scn.mk b/extensions/Library_scn.mk
index feaf429..dc9fbba 100644
--- a/extensions/Library_scn.mk
+++ b/extensions/Library_scn.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 912f04c..cc6d96a 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index dd2258f..6d9363a 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_updatecheckui.mk b/extensions/Library_updatecheckui.mk
index 8ec6c19..75d0f66 100644
--- a/extensions/Library_updatecheckui.mk
+++ b/extensions/Library_updatecheckui.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_updatefeed.mk b/extensions/Library_updatefeed.mk
index 708f931..0024240 100644
--- a/extensions/Library_updatefeed.mk
+++ b/extensions/Library_updatefeed.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/Library_updchk.mk b/extensions/Library_updchk.mk
index 93b124e..4ef8bde 100644
--- a/extensions/Library_updchk.mk
+++ b/extensions/Library_updchk.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/StaticLibrary_npsoenv.mk b/extensions/StaticLibrary_npsoenv.mk
index edf6388..7019ff0 100644
--- a/extensions/StaticLibrary_npsoenv.mk
+++ b/extensions/StaticLibrary_npsoenv.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/StaticLibrary_plugcon.mk b/extensions/StaticLibrary_plugcon.mk
index 417dfa2..4992309 100644
--- a/extensions/StaticLibrary_plugcon.mk
+++ b/extensions/StaticLibrary_plugcon.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index b2054d6..626723b 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk
index 5aa68f5..81e442c 100644
--- a/extensions/WinResTarget_npsoplugin.mk
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/fpicker/AllLangResTarget_fps_office.mk b/fpicker/AllLangResTarget_fps_office.mk
index 0d39751..6c21e33 100644
--- a/fpicker/AllLangResTarget_fps_office.mk
+++ b/fpicker/AllLangResTarget_fps_office.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 6595f6c..90eb8da 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/fpicker/Library_fps_aqua.mk b/fpicker/Library_fps_aqua.mk
index 2af0e1c..e4b7ef5 100644
--- a/fpicker/Library_fps_aqua.mk
+++ b/fpicker/Library_fps_aqua.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/fpicker/Library_fps_office.mk b/fpicker/Library_fps_office.mk
index 4ffcbc6..d3781de 100644
--- a/fpicker/Library_fps_office.mk
+++ b/fpicker/Library_fps_office.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 169e885..c3c4a6b 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk
index 92f92cc..57285da 100644
--- a/l10ntools/StaticLibrary_transex.mk
+++ b/l10ntools/StaticLibrary_transex.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index 8125223..97d376c2 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/Library_guesslang.mk b/lingucomponent/Library_guesslang.mk
index bd81963..ee8c4e4 100644
--- a/lingucomponent/Library_guesslang.mk
+++ b/lingucomponent/Library_guesslang.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/Library_hyphen.mk b/lingucomponent/Library_hyphen.mk
index 2b6ccdf..7e269f2 100644
--- a/lingucomponent/Library_hyphen.mk
+++ b/lingucomponent/Library_hyphen.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
index 9ab97a8..ea1430c 100644
--- a/lingucomponent/Library_lnth.mk
+++ b/lingucomponent/Library_lnth.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
index a9bdd4d..1afb788 100644
--- a/lingucomponent/Library_spell.mk
+++ b/lingucomponent/Library_spell.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk
index ed9a325..92d582c 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
index 4347759..1bee43e 100644
--- a/lingucomponent/StaticLibrary_ulingu.mk
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/o3tl/CppunitTest_o3tl_tests.mk b/o3tl/CppunitTest_o3tl_tests.mk
index f1e68b4..c1d8215 100644
--- a/o3tl/CppunitTest_o3tl_tests.mk
+++ b/o3tl/CppunitTest_o3tl_tests.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/odk/CppunitTest_checkapi.mk b/odk/CppunitTest_checkapi.mk
index 9121243..4b1c9f1 100644
--- a/odk/CppunitTest_checkapi.mk
+++ b/odk/CppunitTest_checkapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/odk/CustomTarget_allheaders.mk b/odk/CustomTarget_allheaders.mk
index 66df9c0..050648c 100644
--- a/odk/CustomTarget_allheaders.mk
+++ b/odk/CustomTarget_allheaders.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/officecfg/CppunitTest_officecfg_cppheader_test.mk b/officecfg/CppunitTest_officecfg_cppheader_test.mk
index 09a4932..d0ddd25 100644
--- a/officecfg/CppunitTest_officecfg_cppheader_test.mk
+++ b/officecfg/CppunitTest_officecfg_cppheader_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 -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/officecfg/CustomTarget_registry.mk b/officecfg/CustomTarget_registry.mk
index a482585..2bda037 100644
--- a/officecfg/CustomTarget_registry.mk
+++ b/officecfg/CustomTarget_registry.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/package/Library_package2.mk b/package/Library_package2.mk
index 4f3a215..b572ceb 100644
--- a/package/Library_package2.mk
+++ b/package/Library_package2.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/package/Library_xstor.mk b/package/Library_xstor.mk
index 799b5e0..7db07cf 100644
--- a/package/Library_xstor.mk
+++ b/package/Library_xstor.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/package/Module_package.mk b/package/Module_package.mk
index 10971e6..ba9c09b 100644
--- a/package/Module_package.mk
+++ b/package/Module_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 -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/package/Package_dtd.mk b/package/Package_dtd.mk
index 6897638..bfed3d6 100644
--- a/package/Package_dtd.mk
+++ b/package/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 -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/registry/StaticLibrary_registry_helper.mk b/registry/StaticLibrary_registry_helper.mk
index a38d257..a0c1142 100644
--- a/registry/StaticLibrary_registry_helper.mk
+++ b/registry/StaticLibrary_registry_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_Module_DLL.mk b/sal/CppunitTest_Module_DLL.mk
index cf43232..6371599 100644
--- a/sal/CppunitTest_Module_DLL.mk
+++ b/sal/CppunitTest_Module_DLL.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_bytesequence.mk b/sal/CppunitTest_sal_bytesequence.mk
index 7ef355d..ca22ebb 100644
--- a/sal/CppunitTest_sal_bytesequence.mk
+++ b/sal/CppunitTest_sal_bytesequence.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_condition.mk b/sal/CppunitTest_sal_osl_condition.mk
index d494b8d..4b9f4aa 100644
--- a/sal/CppunitTest_sal_osl_condition.mk
+++ b/sal/CppunitTest_sal_osl_condition.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_file.mk b/sal/CppunitTest_sal_osl_file.mk
index 4c031a4..4dadd88 100644
--- a/sal/CppunitTest_sal_osl_file.mk
+++ b/sal/CppunitTest_sal_osl_file.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
index d917dfb..4b99bf2 100644
--- a/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
+++ b/sal/CppunitTest_sal_osl_getsystempathfromfileurl.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_module.mk b/sal/CppunitTest_sal_osl_module.mk
index 4699869..6e90142 100644
--- a/sal/CppunitTest_sal_osl_module.mk
+++ b/sal/CppunitTest_sal_osl_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_old_test_file.mk b/sal/CppunitTest_sal_osl_old_test_file.mk
index c59e7df..6727da8 100644
--- a/sal/CppunitTest_sal_osl_old_test_file.mk
+++ b/sal/CppunitTest_sal_osl_old_test_file.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_process.mk b/sal/CppunitTest_sal_osl_process.mk
index d5e4606..a72c978 100644
--- a/sal/CppunitTest_sal_osl_process.mk
+++ b/sal/CppunitTest_sal_osl_process.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_security.mk b/sal/CppunitTest_sal_osl_security.mk
index ba7cfdc..6c75b7c 100644
--- a/sal/CppunitTest_sal_osl_security.mk
+++ b/sal/CppunitTest_sal_osl_security.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_osl_thread.mk b/sal/CppunitTest_sal_osl_thread.mk
index 06e8aad..b29eaef 100644
--- a/sal/CppunitTest_sal_osl_thread.mk
+++ b/sal/CppunitTest_sal_osl_thread.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_alloc.mk b/sal/CppunitTest_sal_rtl_alloc.mk
index 409804d..4a1d6e4 100644
--- a/sal/CppunitTest_sal_rtl_alloc.mk
+++ b/sal/CppunitTest_sal_rtl_alloc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_cipher.mk b/sal/CppunitTest_sal_rtl_cipher.mk
index 4639099..551c23e 100644
--- a/sal/CppunitTest_sal_rtl_cipher.mk
+++ b/sal/CppunitTest_sal_rtl_cipher.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_crc32.mk b/sal/CppunitTest_sal_rtl_crc32.mk
index 907af54..c4a0296 100644
--- a/sal/CppunitTest_sal_rtl_crc32.mk
+++ b/sal/CppunitTest_sal_rtl_crc32.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_digest.mk b/sal/CppunitTest_sal_rtl_digest.mk
index 6254fcd..25a3eb7 100644
--- a/sal/CppunitTest_sal_rtl_digest.mk
+++ b/sal/CppunitTest_sal_rtl_digest.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_doublelock.mk b/sal/CppunitTest_sal_rtl_doublelock.mk
index 454706f..87da478 100644
--- a/sal/CppunitTest_sal_rtl_doublelock.mk
+++ b/sal/CppunitTest_sal_rtl_doublelock.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_locale.mk b/sal/CppunitTest_sal_rtl_locale.mk
index cda9a7a..b937549 100644
--- a/sal/CppunitTest_sal_rtl_locale.mk
+++ b/sal/CppunitTest_sal_rtl_locale.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_ostringbuffer.mk b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
index 30d9466..3c09782 100644
--- a/sal/CppunitTest_sal_rtl_ostringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_ostringbuffer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_oustring.mk b/sal/CppunitTest_sal_rtl_oustring.mk
index 493c644..a974f60 100644
--- a/sal/CppunitTest_sal_rtl_oustring.mk
+++ b/sal/CppunitTest_sal_rtl_oustring.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/sal/CppunitTest_sal_rtl_oustringbuffer.mk b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
index a70ca20..19a7710 100644
--- a/sal/CppunitTest_sal_rtl_oustringbuffer.mk
+++ b/sal/CppunitTest_sal_rtl_oustringbuffer.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/sal/CppunitTest_sal_rtl_process.mk b/sal/CppunitTest_sal_rtl_process.mk
index 1778798..1744707 100644
--- a/sal/CppunitTest_sal_rtl_process.mk
+++ b/sal/CppunitTest_sal_rtl_process.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_rtl_strings.mk b/sal/CppunitTest_sal_rtl_strings.mk
index 89844d8..3fdb66d 100644
--- a/sal/CppunitTest_sal_rtl_strings.mk
+++ b/sal/CppunitTest_sal_rtl_strings.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_tcwf.mk b/sal/CppunitTest_sal_tcwf.mk
index cb28c6a..34c5f73 100644
--- a/sal/CppunitTest_sal_tcwf.mk
+++ b/sal/CppunitTest_sal_tcwf.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/CppunitTest_sal_types.mk b/sal/CppunitTest_sal_types.mk
index 66802eb..20a7c72 100644
--- a/sal/CppunitTest_sal_types.mk
+++ b/sal/CppunitTest_sal_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Executable_cppunittester.mk b/sal/Executable_cppunittester.mk
index 7d26ac6..f851c4d 100644
--- a/sal/Executable_cppunittester.mk
+++ b/sal/Executable_cppunittester.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Executable_osl_process_child.mk b/sal/Executable_osl_process_child.mk
index 3f69813..bbac3a5 100644
--- a/sal/Executable_osl_process_child.mk
+++ b/sal/Executable_osl_process_child.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Library_lo-bootstrap.mk b/sal/Library_lo-bootstrap.mk
index 04d5064..1438091 100644
--- a/sal/Library_lo-bootstrap.mk
+++ b/sal/Library_lo-bootstrap.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 23e7b02..d7c28a5 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_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 -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Library_sal_textenc.mk b/sal/Library_sal_textenc.mk
index a550ca5..e92ddb0 100644
--- a/sal/Library_sal_textenc.mk
+++ b/sal/Library_sal_textenc.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Library_uwinapi.mk b/sal/Library_uwinapi.mk
index 8d91ef6..089ab59 100644
--- a/sal/Library_uwinapi.mk
+++ b/sal/Library_uwinapi.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk
index ef5d58f..139ca5e 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 -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/sal/StaticLibrary_salcpprt.mk b/sal/StaticLibrary_salcpprt.mk
index fb6c936..dbcf484 100644
--- a/sal/StaticLibrary_salcpprt.mk
+++ b/sal/StaticLibrary_salcpprt.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/salhelper/Library_salhelper.mk b/salhelper/Library_salhelper.mk
index 8d62e66..aa673b2 100644
--- a/salhelper/Library_salhelper.mk
+++ b/salhelper/Library_salhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/salhelper/Module_salhelper.mk b/salhelper/Module_salhelper.mk
index f1eed8e..9278844 100644
--- a/salhelper/Module_salhelper.mk
+++ b/salhelper/Module_salhelper.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/scripting/Jar_HelloWorld.mk b/scripting/Jar_HelloWorld.mk
index 735a3a8..9966e90 100644
--- a/scripting/Jar_HelloWorld.mk
+++ b/scripting/Jar_HelloWorld.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Jar_Highlight.mk b/scripting/Jar_Highlight.mk
index 128fed0..0b643cd 100644
--- a/scripting/Jar_Highlight.mk
+++ b/scripting/Jar_Highlight.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Jar_MemoryUsage.mk b/scripting/Jar_MemoryUsage.mk
index 2362012..6d34dbe 100644
--- a/scripting/Jar_MemoryUsage.mk
+++ b/scripting/Jar_MemoryUsage.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Jar_ScriptFramework.mk b/scripting/Jar_ScriptFramework.mk
index bba0701..fe728a2 100644
--- a/scripting/Jar_ScriptFramework.mk
+++ b/scripting/Jar_ScriptFramework.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index 3d40376f..8bebc2e 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Jar_ScriptProviderForJava.mk b/scripting/Jar_ScriptProviderForJava.mk
index 3e6ad04..64014f4f 100644
--- a/scripting/Jar_ScriptProviderForJava.mk
+++ b/scripting/Jar_ScriptProviderForJava.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Jar_ScriptProviderForJavaScript.mk b/scripting/Jar_ScriptProviderForJavaScript.mk
index a358133..f89551c 100644
--- a/scripting/Jar_ScriptProviderForJavaScript.mk
+++ b/scripting/Jar_ScriptProviderForJavaScript.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Library_basprov.mk b/scripting/Library_basprov.mk
index 60fe87f..6e2fb2d 100644
--- a/scripting/Library_basprov.mk
+++ b/scripting/Library_basprov.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Library_dlgprov.mk b/scripting/Library_dlgprov.mk
index 832652e..061d0c9 100644
--- a/scripting/Library_dlgprov.mk
+++ b/scripting/Library_dlgprov.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk
index 48ca834..4134c2a 100644
--- a/scripting/Library_protocolhandler.mk
+++ b/scripting/Library_protocolhandler.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Library_scriptframe.mk b/scripting/Library_scriptframe.mk
index 5b37df7..4be448d 100644
--- a/scripting/Library_scriptframe.mk
+++ b/scripting/Library_scriptframe.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Library_stringresource.mk b/scripting/Library_stringresource.mk
index daa6386..1588fd4 100644
--- a/scripting/Library_stringresource.mk
+++ b/scripting/Library_stringresource.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Library_vbaevents.mk b/scripting/Library_vbaevents.mk
index d4a41f4..acf7af5 100644
--- a/scripting/Library_vbaevents.mk
+++ b/scripting/Library_vbaevents.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk
index 4829c53..de90fe7 100644
--- a/scripting/Module_scripting.mk
+++ b/scripting/Module_scripting.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Package_ScriptsBeanShell.mk b/scripting/Package_ScriptsBeanShell.mk
index 96e9701..212888e 100644
--- a/scripting/Package_ScriptsBeanShell.mk
+++ b/scripting/Package_ScriptsBeanShell.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Package_ScriptsJavaScript.mk b/scripting/Package_ScriptsJavaScript.mk
index 161efc5..df6ee2a 100644
--- a/scripting/Package_ScriptsJavaScript.mk
+++ b/scripting/Package_ScriptsJavaScript.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Package_ScriptsPython.mk b/scripting/Package_ScriptsPython.mk
index 41027b0..1d0de55 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Package_scriptbindinglib.mk b/scripting/Package_scriptbindinglib.mk
index 84ae6c2..54ecbb2 100644
--- a/scripting/Package_scriptbindinglib.mk
+++ b/scripting/Package_scriptbindinglib.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/scripting/Pyuno_mailmerge.mk b/scripting/Pyuno_mailmerge.mk
index 3478235..fd1e56d 100644
--- a/scripting/Pyuno_mailmerge.mk
+++ b/scripting/Pyuno_mailmerge.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk
index 053a5d6..18acb82 100644
--- a/solenv/gbuild/extensions/pre_MergedLibsList.mk
+++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/testtools/StaticLibrary_bridgetest.mk b/testtools/StaticLibrary_bridgetest.mk
index 62d8688..b1a076f 100644
--- a/testtools/StaticLibrary_bridgetest.mk
+++ b/testtools/StaticLibrary_bridgetest.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/vcl/Executable_kdefilepicker.mk b/vcl/Executable_kdefilepicker.mk
index 4bd6405..1fd01b2 100644
--- a/vcl/Executable_kdefilepicker.mk
+++ b/vcl/Executable_kdefilepicker.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/vcl/Executable_tdefilepicker.mk b/vcl/Executable_tdefilepicker.mk
index 3a2c539..6a39235 100644
--- a/vcl/Executable_tdefilepicker.mk
+++ b/vcl/Executable_tdefilepicker.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/winaccessibility/Library_uacccom.mk b/winaccessibility/Library_uacccom.mk
index b7760a7..fb72fce 100644
--- a/winaccessibility/Library_uacccom.mk
+++ b/winaccessibility/Library_uacccom.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/winaccessibility/Library_winaccessibility.mk b/winaccessibility/Library_winaccessibility.mk
index 89b87a6..73134ae 100644
--- a/winaccessibility/Library_winaccessibility.mk
+++ b/winaccessibility/Library_winaccessibility.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/winaccessibility/WinResTarget_uacccom.mk b/winaccessibility/WinResTarget_uacccom.mk
index 9da01e7..13de1d5 100644
--- a/winaccessibility/WinResTarget_uacccom.mk
+++ b/winaccessibility/WinResTarget_uacccom.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 #
 # This file is part of the LibreOffice project.
diff --git a/xmlsecurity/AllLangResTarget_xsec.mk b/xmlsecurity/AllLangResTarget_xsec.mk
index 9d77f33..d2fce60 100644
--- a/xmlsecurity/AllLangResTarget_xsec.mk
+++ b/xmlsecurity/AllLangResTarget_xsec.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/xmlsecurity/CppunitTest_qa_certext.mk b/xmlsecurity/CppunitTest_qa_certext.mk
index fc87494..d4b555c 100644
--- a/xmlsecurity/CppunitTest_qa_certext.mk
+++ b/xmlsecurity/CppunitTest_qa_certext.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/xmlsecurity/Library_xmlsecurity.mk b/xmlsecurity/Library_xmlsecurity.mk
index ca49408..946bf15 100644
--- a/xmlsecurity/Library_xmlsecurity.mk
+++ b/xmlsecurity/Library_xmlsecurity.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/xmlsecurity/Library_xsec_fw.mk b/xmlsecurity/Library_xsec_fw.mk
index 63481a6..ff4f66c 100644
--- a/xmlsecurity/Library_xsec_fw.mk
+++ b/xmlsecurity/Library_xsec_fw.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index 890ffc9..2f35027 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
diff --git a/xmlsecurity/Module_xmlsecurity.mk b/xmlsecurity/Module_xmlsecurity.mk
index e88859d..fffd966 100644
--- a/xmlsecurity/Module_xmlsecurity.mk
+++ b/xmlsecurity/Module_xmlsecurity.mk
@@ -1,4 +1,4 @@
-# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #
 # This file is part of the LibreOffice project.
 #
