From a0acfae451223221f370e0d75a68e2744b7434f7 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.(none)>
Date: Wed, 9 Aug 2006 11:16:18 +0100
Subject: [PATCH] More @NAME@ -> @CNAME@ fixups.

---
 scripts/build.c++.tests/build.tests   |  2 +-
 scripts/build.c.app/build.app         | 14 +++++++-------
 scripts/build.c.app/build.install-app |  2 +-
 scripts/build.c.app/build.monolithic  |  6 +++---
 scripts/build.c.tests/build.tests     |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/scripts/build.c++.tests/build.tests b/scripts/build.c++.tests/build.tests
index c616bea..3724ef8 100644
--- a/scripts/build.c++.tests/build.tests
+++ b/scripts/build.c++.tests/build.tests
@@ -1,5 +1,5 @@
 # These are external variables, and shouldn't clash with anything else
-#  @NAME@_BUILT
+#  @CNAME@_BUILT
 #
 
 build_target @TEST_LIBS@ || return 1
diff --git a/scripts/build.c.app/build.app b/scripts/build.c.app/build.app
index ef200e2..b89c94f 100644
--- a/scripts/build.c.app/build.app
+++ b/scripts/build.c.app/build.app
@@ -1,21 +1,21 @@
 # These are external variables, and shouldn't clash with anything else
-#  @NAME@
-#  @NAME@_BUILT
+#  @CNAME@
+#  @CNAME@_BUILT
 #
 
-if [ -z ${@NAME@_BUILT} ]
+if [ -z ${@CNAME@_BUILT} ]
 then
-    @NAME@="obj/@NAME@"
+    @CNAME@="obj/@NAME@"
     EXTRAS="" # @TODO@ cflags, libs
 
-    echo "Building application ${@NAME@}..."
+    echo "Building application ${@CNAME@}..."
 
     do_cmd source src/@NAME@/build.monolithic || return 1
 
     MODIFIED=0
     for test in ${MONOLITHIC_TESTS} ${SRC}
     do
-        if [ ${test} -nt ${@NAME@} ]
+        if [ ${test} -nt ${@CNAME@} ]
         then
             MODIFIED=1
             break
@@ -33,7 +33,7 @@ then
         print_success "Application up to date"
     fi
 
-    @NAME@_BUILT=1
+    @CNAME@_BUILT=1
 
 fi
 
diff --git a/scripts/build.c.app/build.install-app b/scripts/build.c.app/build.install-app
index 8703591..739cc0c 100644
--- a/scripts/build.c.app/build.install-app
+++ b/scripts/build.c.app/build.install-app
@@ -5,7 +5,7 @@ build_dir_tree "${BINDIR}" || return 1
 
 # install binary
 echo "Installing binaries into '${BINDIR}'"
-install_file "${@NAME@}" "${BINDIR}" 0755 || return 1
+install_file "${@CNAME@}" "${BINDIR}" 0755 || return 1
 print_success "Done"
 
 # kate: @KATE_MODELINE@
diff --git a/scripts/build.c.app/build.monolithic b/scripts/build.c.app/build.monolithic
index e9258b4..d56c004 100644
--- a/scripts/build.c.app/build.monolithic
+++ b/scripts/build.c.app/build.monolithic
@@ -1,16 +1,16 @@
 # These are external variables, and shouldn't clash with anything else
-#  @NAME@_MONOLITHIC
+#  @CNAME@_MONOLITHIC
 #
 
 SRC="obj/@NAME@.c"
 MONOLITHIC_TESTS="src/@NAME@/build.app src/@NAME@/build.monolithic"
 
-if [ -z "${@NAME@_MONOLITHIC}" ]
+if [ -z "${@CNAME@_MONOLITHIC}" ]
 then
     MONOLITHIC_SOURCE="$(echo src/@NAME@/TopSource.c)"
     make_monolithic ${SRC} C || return 1
 
-    @NAME@_MONOLITHIC=1
+    @CNAME@_MONOLITHIC=1
     MONOLITHIC_DOC="${MONOLITHIC_DOC} ${SRC}"
 fi
 
diff --git a/scripts/build.c.tests/build.tests b/scripts/build.c.tests/build.tests
index 89c80ea..97399a8 100644
--- a/scripts/build.c.tests/build.tests
+++ b/scripts/build.c.tests/build.tests
@@ -1,5 +1,5 @@
 # These are external variables, and shouldn't clash with anything else
-#  @NAME@_BUILT
+#  @CNAME@_BUILT
 #
 
 build_target @TEST_LIBS@ || return 1