Upgrade to new build system.

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/libCStreamedXML/BottomHeader.h

@@ -1,4 +1,4 @@
-/* libCStreamedXML/src/clib/BottomHeader.h
+/* libCStreamedXML/src/libCStreamedXML/BottomHeader.h
  *
  *  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
  *  Released under the GNU GPLv2. See file COPYING or

src/libCStreamedXML/build.lib

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

src/libCStreamedXML/build.monolithic

@@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libCStreamedXML/build.lib src/libCStreamedXML/build.monoli
 if [ -z "${libCStreamedXML_MONOLITHIC}" ]
 then
     MONOLITHIC_SOURCE="$(echo src/libCStreamedXML/{TopHeader,types,functions,BottomHeader}.h)"
-    make_monolithic ${HDR} C || return 1
+    make_monolithic ${HDR} Ch || return 1
 
     MONOLITHIC_SOURCE="$(echo src/libCStreamedXML/{TopSource,buffer,defaults,parser}.c)"
     make_monolithic ${SRC} C || return 1

src/libCStreamedXML/pkgconf.in

@@ -1,4 +1,4 @@
-# libCStreamedXML/src/lib/clib/pkgconf.in
+# libStreamedXML/src/lib/libCStreamedXML/pkgconf.in
 #
 #  Metadata file for pkg-config
 #  ( http://www.freedesktop.org/software/pkgconfig/ )

src/libCStreamedXML/soversion

@@ -1,4 +1,4 @@
-# libCStreamedXML/src/libCStreamedXML/soversion
+# libStreamedXML/src/libCStreamedXML/soversion
 #
 #  (c)2006, Laurence Withers, <l@lwithers.me.uk>.
 #  Released under the GNU GPLv2. See file COPYING or
@@ -14,4 +14,4 @@ SOMAJOR=0
 SOMINOR=0
 
 # SOMICRO is bumped every time there is a binary-compatible release.
-SOMICRO=0
+SOMICRO=1

src/libStreamedXML/build.lib

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

src/libStreamedXML/build.monolithic

@@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libStreamedXML/build.lib src/libStreamedXML/build.monolith
 if [ -z "${libStreamedXML_MONOLITHIC}" ]
 then
     MONOLITHIC_SOURCE="$(echo src/libStreamedXML/{TopHeader,ForwardDeclare,Exceptions,Callback,Parser,Decoder,BottomHeader}.h)"
-    make_monolithic ${HDR} C || return 1
+    make_monolithic ${HDR} Ch || return 1
 
     MONOLITHIC_SOURCE="$(echo src/libStreamedXML/{TopSource,Exceptions,Parser,Decoder}.cpp)"
     make_monolithic ${SRC} C || return 1

src/libStreamedXML/soversion

@@ -14,4 +14,4 @@ SOMAJOR=0
 SOMINOR=1
 
 # 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=1
+VERMICRO=2
 VEREXTRA=""
 
 # kate: replace-trailing-space-save true; space-indent true; tab-width 4;