Upgrade build system, bump version.

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)

scripts/.gitignore

@@ -1,5 +1,6 @@
 build.c++.app
 build.c++.lib
+build.c++.qtapp
 build.c++.tests
 build.c.app
 build.c.lib

src/libutf8++/build.install-lib

@@ -22,7 +22,7 @@ install_header ${libutf8pp_HEADER} ${INCLUDEDIR} 0644 || return 1
 
 # install pkgconfig file
 echo "Installing package config file into ${PKGCONFDIR}"
-PKGCONFFILE=${PKGCONFDIR}/libutf8pp.pc
+PKGCONFFILE=${PKGCONFDIR}/libutf8++.pc
 do_cmd rm -f ${PKGCONFFILE}
 do_cmd_redir ${PKGCONFFILE} sed \
     -e "s,@VERSION@,${VERSION}," \

src/libutf8++/build.lib

@@ -31,7 +31,7 @@ then
         echo " Compiling"
 
         SONAME="${libutf8pp_BASE}.so.${SOMAJOR}.${SOMINOR}"
-        do_cmd ${CXX} ${CFLAGS} -shared -fpic -o "${libutf8pp}" \
+        do_cmd ${CXX} ${CFLAGS} -Iobj -shared -fpic -o "${libutf8pp}" \
             -Wl,-soname,${SONAME} \
             ${SRC} ${SO_EXTRA} || return 1
 

src/libutf8++/build.monolithic

@@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libutf8++/build.lib src/libutf8++/build.monolithic"
 if [ -z "${libutf8pp_MONOLITHIC}" ]
 then
     MONOLITHIC_SOURCE="$(echo src/libutf8++/{TopHeader,ForwardDeclare,exception,string,{en,de}coder,BottomHeader}.h)"
-    make_monolithic ${HDR} C || return 1
+    make_monolithic ${HDR} Ch || return 1
 
     MONOLITHIC_SOURCE="$(echo src/libutf8++/{TopSource,exception,string,{en,de}coder}.cpp)"
     make_monolithic ${SRC} C || return 1

src/libutf8++/pkgconf.in

@@ -14,7 +14,7 @@ Description: C++ wrapper around libutf8 (library for handling UTF-8)
 Version: @VERSION@
 
 # Requirements
-Requires:
+Requires: libutf8
 
 # Compilation information
 Libs: -L@LIBDIR@ -lutf8++

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

version

@@ -12,7 +12,7 @@
 # suffixed with a string.
 VERMAJOR=1
 VERMINOR=2
-VERMICRO=0
+VERMICRO=2
 VEREXTRA=""
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;