From f6725f771d1c82668cd426c2a7040a1658624140 Mon Sep 17 00:00:00 2001
From: Laurence Withers <lwithers@lochside.(none)>
Date: Fri, 25 Aug 2006 11:07:07 +0100
Subject: [PATCH] Upgrade to new build system, bump version.

---
 make.sh                      | 6 +++++-
 scripts/.gitignore           | 1 +
 src/libutf8/build.lib        | 2 +-
 src/libutf8/build.monolithic | 2 +-
 src/libutf8/pkgconf.in       | 4 ++--
 src/libutf8/soversion        | 2 +-
 src/tests/template           | 5 +++--
 version                      | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/make.sh b/make.sh
index b918210..9de9176 100755
--- a/make.sh
+++ b/make.sh
@@ -64,6 +64,7 @@ OUTPUT_DIRS="obj html"
 #  none                   no special processing happens before each file
 #  C                      #line directives are inserted before each file
 #                         and VERSION, VERMAJOR etc. are #defined
+#  Ch                     Like C, but for header files (no VERSION #defines)
 #
 make_monolithic() {
     if [ $# -ne 2 ]
@@ -82,6 +83,9 @@ make_monolithic() {
     then
         HASHLINE=1
         VERDEFINE=1
+    elif [ "$2" == "Ch" ]
+    then
+        HASHLINE=1
     elif [ "$2" == "none" ]
     then
             HASHLINE=0 # dummy command
@@ -261,7 +265,7 @@ else
     targets="$@"
 fi
 
-for func in "${targets}"
+for func in ${targets}
 do
     case ${func} in
     clean)
diff --git a/scripts/.gitignore b/scripts/.gitignore
index ce33425..a540f48 100644
--- a/scripts/.gitignore
+++ b/scripts/.gitignore
@@ -1,5 +1,6 @@
 build.c++.app
 build.c++.lib
+build.c++.qtapp
 build.c++.tests
 build.c.app
 build.c.lib
diff --git a/src/libutf8/build.lib b/src/libutf8/build.lib
index 7eaecf6..9d9fe7e 100644
--- a/src/libutf8/build.lib
+++ b/src/libutf8/build.lib
@@ -31,7 +31,7 @@ then
         echo " Compiling"
 
         SONAME="${libutf8_BASE}.so.${SOMAJOR}.${SOMINOR}"
-        do_cmd ${CC} ${CFLAGS} -shared -fpic -o "${libutf8}" \
+        do_cmd ${CC} ${CFLAGS} -Iobj -shared -fpic -o "${libutf8}" \
             -Wl,-soname,${SONAME} \
             ${SRC} ${SO_EXTRA} || return 1
 
diff --git a/src/libutf8/build.monolithic b/src/libutf8/build.monolithic
index 85fb157..4fbd93e 100644
--- a/src/libutf8/build.monolithic
+++ b/src/libutf8/build.monolithic
@@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libutf8/build.lib src/libutf8/build.monolithic"
 if [ -z "${libutf8_MONOLITHIC}" ]
 then
     MONOLITHIC_SOURCE="$(echo src/libutf8/{TopHeader,ForwardDeclare,ctype,{de,en}code{,_state},BottomHeader}.h)"
-    make_monolithic ${HDR} C || return 1
+    make_monolithic ${HDR} Ch || return 1
 
     MONOLITHIC_SOURCE="$(echo src/libutf8/{TopSource,ctype,{de,en}code{,_state}}.c)"
     make_monolithic ${SRC} C || return 1
diff --git a/src/libutf8/pkgconf.in b/src/libutf8/pkgconf.in
index 28a0741..0e620f0 100644
--- a/src/libutf8/pkgconf.in
+++ b/src/libutf8/pkgconf.in
@@ -9,8 +9,8 @@
 #
 
 # Name, description
-Name: libutf8
-Description: Library for encoding and decoding UTF-8
+Name: @TODO@
+Description: @TODO@
 Version: @VERSION@
 
 # Requirements
diff --git a/src/libutf8/soversion b/src/libutf8/soversion
index c539b11..056a052 100644
--- a/src/libutf8/soversion
+++ b/src/libutf8/soversion
@@ -14,4 +14,4 @@ SOMAJOR=0
 SOMINOR=0
 
 # SOMICRO is bumped every time there is a binary-compatible release.
-SOMICRO=0
+SOMICRO=1
diff --git a/src/tests/template b/src/tests/template
index 7e835b8..498dbbf 100644
--- a/src/tests/template
+++ b/src/tests/template
@@ -8,11 +8,14 @@
 #include "utf8.h"
 
 #include <stdio.h>
+#include <string.h>
 
 
 
 int main(int argc, char* argv[])
 {
+    int ret = 0;
+
     if(argc == 2 && !strcmp(argv[1], "--print-summary")) {
         printf("One line summary.\n");
         return 0;
@@ -22,8 +25,6 @@ int main(int argc, char* argv[])
         // empty argument list
     }
 
-    int ret = 0;
-
     // TODO
 
     return ret;
diff --git a/version b/version
index a6b7ab6..7ef0463 100644
--- a/version
+++ b/version
@@ -12,7 +12,7 @@
 # suffixed with a string.
 VERMAJOR=1
 VERMINOR=2
-VERMICRO=0
+VERMICRO=1
 VEREXTRA=""
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;