Merge branch 'master' of chrysocolla.lwithers.me.uk:git/lw-build-system

2007-08-14 20:52:35 +00:00 · 2007-08-14 20:52:35 +00:00 · 9e3137d0a8
parent 2bff9acb45 9eb4fecb6c
commit 9e3137d0a8
66 changed files with 88 additions and 82 deletions
--- a/create.sh
+++ b/create.sh
@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 #  (c)2006, Laurence Withers. Released under the GNU GPL. See file
 #  COPYING for details.
@ -13,14 +13,23 @@


 # Sanity checks
-if [ $# -ne 2 ]
-then
+case "$#" in
+1)
+    DEST_DIR="$(pwd)"
+    P="$1"
+    ;;
+2)
+    DEST_DIR="$1"
+    P="$2"
+    ;;
+**)
    echo "Creates a new project using lw-build-system."
-    echo "Usage: $0 path/to/projects @P@"
+    echo "Usage: $0 [path/to/projects] @P@"
    echo "    path/to/projects        directory in which project subdir will be created"
    echo "    @P@                     package name"
    exit 1
-fi
+    ;;
+esac

 cd "$(dirname $0)"
 TEMPLATE="$(pwd)/skel"
@ -29,17 +38,14 @@ DEVSCRIPTS="$(pwd)/scripts"


 # Get arguments, include standard functions
-source ${TEMPLATE}/scripts/functions.sh || exit 1
-DEST_DIR="$1"; shift
-P="$1"; shift
-
+source "${TEMPLATE}/scripts/functions.sh" || exit 1
 DEST_DIR="${DEST_DIR}/${P}"



 # Ensure that we have our .lwbuildrc set up correctly.
-LWBUILDRC=~/.lwbuildrc
-if [ ! -e ${LWBUILDRC} ]
+LWBUILDRC="${HOME}/.lwbuildrc"
+if [ ! -e "${LWBUILDRC}" ]
 then
    echo "You don't have a ${LWBUILDRC}, so I'll create a blank one for you."
    do_cmd cp skel-.lwbuildrc ${LWBUILDRC}
--- a/scripts/build.app.c++-qt/000_TopSource.cpp
+++ b/scripts/build.app.c++-qt/000_TopSource.cpp
--- a/scripts/build.app.c++-qt/build.app
+++ b/scripts/build.app.c++-qt/build.app
@ -38,4 +38,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c++-qt/build.install-app
+++ b/scripts/build.app.c++-qt/build.install-app
@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c++-qt/build.monolithic
+++ b/scripts/build.app.c++-qt/build.monolithic
@ -8,7 +8,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
    PREMOC="${SRC}.premoc.cpp"
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)"
    make_monolithic ${PREMOC} C || return 1

    if [ "${PREMOC}" -nt "${SRC}" ]
@ -24,4 +24,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c++-qt/instantiate
+++ b/scripts/build.app.c++-qt/instantiate
@ -12,4 +12,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.app.c++/000_TopSource.cpp
+++ b/scripts/build.app.c++/000_TopSource.cpp
--- a/scripts/build.app.c++/build.app
+++ b/scripts/build.app.c++/build.app
@ -38,4 +38,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c++/build.install-app
+++ b/scripts/build.app.c++/build.install-app
@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c++/build.monolithic
+++ b/scripts/build.app.c++/build.monolithic
@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)"
    make_monolithic ${SRC} C || return 1

    @CNAME@_MONOLITHIC=1
@ -15,4 +15,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c++/instantiate
+++ b/scripts/build.app.c++/instantiate
@ -11,4 +11,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.app.c/000_TopSource.c
+++ b/scripts/build.app.c/000_TopSource.c
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.app.c/build.app
+++ b/scripts/build.app.c/build.app
@ -38,4 +38,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c/build.install-app
+++ b/scripts/build.app.c/build.install-app
@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c/build.monolithic
+++ b/scripts/build.app.c/build.monolithic
@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
    make_monolithic ${SRC} C || return 1

    @CNAME@_MONOLITHIC=1
@ -15,4 +15,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.c/instantiate
+++ b/scripts/build.app.c/instantiate
@ -11,4 +11,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.app.sh/build.install-app
+++ b/scripts/build.app.sh/build.install-app
@ -10,4 +10,4 @@ done
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.app.sh/instantiate
+++ b/scripts/build.app.sh/instantiate
@ -9,4 +9,4 @@ add_config_option "BINDIR" "${COPT_BINDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.docs.doxygen/Doxyfile.in
+++ b/scripts/build.docs.doxygen/Doxyfile.in
@ -46,7 +46,7 @@ CASE_SENSE_NAMES       = YES
 HIDE_SCOPE_NAMES       = NO
 SHOW_INCLUDE_FILES     = NO
 INLINE_INFO            = YES
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO
 SORT_BRIEF_DOCS        = NO
 SORT_BY_SCOPE_NAME     = NO
 GENERATE_TODOLIST      = YES
--- a/scripts/build.docs.doxygen/build.docs
+++ b/scripts/build.docs.doxygen/build.docs
@ -40,4 +40,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.docs.doxygen/build.install-docs
+++ b/scripts/build.docs.doxygen/build.install-docs
@ -18,4 +18,4 @@ done

 print_success "Documentation installed"
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.docs.doxygen/instantiate
+++ b/scripts/build.docs.doxygen/instantiate
@ -9,4 +9,4 @@ add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.docs.none/build.install-docs
+++ b/scripts/build.docs.none/build.install-docs
@ -11,4 +11,4 @@ done

 print_success "Documentation installed"
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.docs.none/instantiate
+++ b/scripts/build.docs.none/instantiate
@ -9,4 +9,4 @@ add_config_option "DOCSDIR" "${COPT_DOCSDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.files.none/build.install-files
+++ b/scripts/build.files.none/build.install-files
@ -13,4 +13,4 @@ done

 print_success "Files installed"
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.files.none/instantiate
+++ b/scripts/build.files.none/instantiate
@ -8,4 +8,4 @@ do_parameter_subst
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.firmware.gpasm/000_TopSource.asm
+++ b/scripts/build.firmware.gpasm/000_TopSource.asm
--- a/scripts/build.firmware.gpasm/build.firmware
+++ b/scripts/build.firmware.gpasm/build.firmware
@ -39,4 +39,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.firmware.gpasm/build.install-firmware
+++ b/scripts/build.firmware.gpasm/build.install-firmware
@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.firmware.gpasm/build.monolithic
+++ b/scripts/build.firmware.gpasm/build.monolithic
@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopSource,BottomSource}.asm)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.asm)"
    make_monolithic ${SRC} none || return 1

    @CNAME@_MONOLITHIC=1
@ -15,4 +15,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.firmware.gpasm/instantiate
+++ b/scripts/build.firmware.gpasm/instantiate
@ -11,4 +11,4 @@ add_config_option "GPASM_FLAGS" ""
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.firmware.sdcc/000_TopSource.c
+++ b/scripts/build.firmware.sdcc/000_TopSource.c
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.firmware.sdcc/build.firmware
+++ b/scripts/build.firmware.sdcc/build.firmware
@ -38,4 +38,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.firmware.sdcc/build.install-firmware
+++ b/scripts/build.firmware.sdcc/build.install-firmware
@ -9,4 +9,4 @@ install_file "${@CNAME@}" "${HEXDIR}" 0755 || return 1
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.firmware.sdcc/build.monolithic
+++ b/scripts/build.firmware.sdcc/build.monolithic
@ -7,7 +7,7 @@ MONOLITHIC_TESTS="src/@NAME@/build.firmware src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
    make_monolithic ${SRC} C || return 1

    @CNAME@_MONOLITHIC=1
@ -15,4 +15,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.firmware.sdcc/instantiate
+++ b/scripts/build.firmware.sdcc/instantiate
@ -11,4 +11,4 @@ add_config_option "SDCCFLAGS" ""
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.lib.c++/000_TopHeader.h
+++ b/scripts/build.lib.c++/000_TopHeader.h
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopHeader.h
+/* @P@/src/@NAME@/000_TopHeader.h
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.lib.c++/000_TopSource.cpp
+++ b/scripts/build.lib.c++/000_TopSource.cpp
--- a/scripts/build.lib.c++/999_BottomHeader.h
+++ b/scripts/build.lib.c++/999_BottomHeader.h
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/BottomHeader.h
+/* @P@/src/@NAME@/999_BottomHeader.h
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.lib.c++/build.install-lib
+++ b/scripts/build.lib.c++/build.install-lib
@ -36,4 +36,4 @@ do_cmd chmod 0644 "${CONFFILE}"
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.lib.c++/build.lib
+++ b/scripts/build.lib.c++/build.lib
@ -52,4 +52,4 @@ then

 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.lib.c++/build.monolithic
+++ b/scripts/build.lib.c++/build.monolithic
@ -8,14 +8,14 @@ MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.h)"
    make_monolithic ${HDR} Ch || return 1

-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.cpp)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.cpp)"
    make_monolithic ${SRC} C || return 1

    @CNAME@_MONOLITHIC=1
    MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.lib.c++/config-script
+++ b/scripts/build.lib.c++/config-script
@ -94,5 +94,5 @@ true



-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
 # kate: @KATE_MODELINE@
--- a/scripts/build.lib.c++/instantiate
+++ b/scripts/build.lib.c++/instantiate
@ -28,4 +28,4 @@ add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.lib.c/000_TopHeader.h
+++ b/scripts/build.lib.c/000_TopHeader.h
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopHeader.h
+/* @P@/src/@NAME@/000_TopHeader.h
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.lib.c/000_TopSource.c
+++ b/scripts/build.lib.c/000_TopSource.c
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.lib.c/999_BottomHeader.h
+++ b/scripts/build.lib.c/999_BottomHeader.h
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/BottomHeader.h
+/* @P@/src/@NAME@/999_BottomHeader.h
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.lib.c/build.install-lib
+++ b/scripts/build.lib.c/build.install-lib
@ -37,4 +37,4 @@ do_cmd chmod 0755 "${CONFFILE}"
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.lib.c/build.lib
+++ b/scripts/build.lib.c/build.lib
@ -52,4 +52,4 @@ then

 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.lib.c/build.monolithic
+++ b/scripts/build.lib.c/build.monolithic
@ -8,14 +8,14 @@ MONOLITHIC_TESTS="src/@NAME@/build.lib src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/{TopHeader,BottomHeader}.h)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.h)"
    make_monolithic ${HDR} Ch || return 1

-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
    make_monolithic ${SRC} C || return 1

    @CNAME@_MONOLITHIC=1
    MONOLITHIC_DOC="${MONOLITHIC_DOC} ${HDR}"
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.lib.c/config-script
+++ b/scripts/build.lib.c/config-script
@ -94,5 +94,5 @@ true



-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
 # kate: @KATE_MODELINE@
--- a/scripts/build.lib.c/instantiate
+++ b/scripts/build.lib.c/instantiate
@ -28,4 +28,4 @@ add_config_option "FINALINCLUDEDIR" "${COPT_FINALINCLUDEDIR_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.module.c/000_TopSource.c
+++ b/scripts/build.module.c/000_TopSource.c
@ -1,4 +1,4 @@
-/* @P@/src/@NAME@/TopSource.c
+/* @P@/src/@NAME@/000_TopSource.c
 *
 *  (c)2007, @AUTHOR@, <@EMAIL@>.
 *  Released under the GNU GPLv2. See file COPYING or
--- a/scripts/build.module.c/build.install-module
+++ b/scripts/build.module.c/build.install-module
@ -9,4 +9,4 @@ install_file ${@CNAME@} ${MODULEDIR} 0755 || return 1
 print_success "Done"

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.module.c/build.module
+++ b/scripts/build.module.c/build.module
@ -36,4 +36,4 @@ then
    @CNAME@_BUILT=1
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.module.c/build.monolithic
+++ b/scripts/build.module.c/build.monolithic
@ -8,10 +8,10 @@ MONOLITHIC_TESTS="src/@NAME@/build.module src/@NAME@/build.monolithic"

 if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
-    MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
+    MONOLITHIC_SOURCE="$(echo src/@NAME@/*.c)"
    make_monolithic ${SRC} C || return 1

    @CNAME@_MONOLITHIC=1
 fi
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.module.c/instantiate
+++ b/scripts/build.module.c/instantiate
@ -12,4 +12,4 @@ add_config_option "MODULEDIR" "${COPT_LIBDIR_DEFAULT}/@TODO@/"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.tests.c++/build.default
+++ b/scripts/build.tests.c++/build.default
@ -1,3 +1,3 @@
 source src/@NAME@/build.tests
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.tests.c++/build.tests
+++ b/scripts/build.tests.c++/build.tests
@ -40,4 +40,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.tests.c++/instantiate
+++ b/scripts/build.tests.c++/instantiate
@ -27,4 +27,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/build.tests.c/build.default
+++ b/scripts/build.tests.c/build.default
@ -1,3 +1,3 @@
 source src/@NAME@/build.tests
 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.tests.c/build.tests
+++ b/scripts/build.tests.c/build.tests
@ -40,4 +40,4 @@ then
 fi

 # kate: @KATE_MODELINE@
-# vim: @VIM_MODELINE@
+# vim: syntax=sh:@VIM_MODELINE@
--- a/scripts/build.tests.c/instantiate
+++ b/scripts/build.tests.c/instantiate
@ -27,4 +27,4 @@ add_config_option "CFLAGS" "${COPT_CFLAGS_DEFAULT}"
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/config-printflags.sh
+++ b/scripts/config-printflags.sh
@ -2,7 +2,7 @@

 for pkg in $@
 do
-	varname="$(echo "${pkg}" | tr a-z A-Z)"
+	varname="$(echo "${pkg}" | tr 'a-z-+' 'A-Z__')"
 	echo '[ -z "${'${varname}'_CFLAGS}" ] && '${varname}'_CFLAGS="$('${pkg}'-config --cflags)"'
 	echo '[ -z "${'${varname}'_LIBS}" ] && '${varname}'_LIBS="$('${pkg}'-config --libs)"'
 done
--- a/scripts/module-create.sh
+++ b/scripts/module-create.sh
@ -127,4 +127,4 @@ grep -r "@TODO@" .
 true

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: expandtab:ts=4:sw=4
+# vim: syntax=sh:expandtab:ts=4:sw=4
--- a/scripts/release.sh
+++ b/scripts/release.sh
@ -89,4 +89,4 @@ fi
 rm -rf "${PKGNAME}" "${PKGNAME}-doc"

 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;
-# vim: ts=4:sw=4:expandtab
+# vim: syntax=sh:ts=4:sw=4:expandtab