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

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/libopt++/build.lib

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

src/libopt++/build.monolithic

@@ -9,7 +9,7 @@ MONOLITHIC_TESTS="src/libopt++/build.lib src/libopt++/build.monolithic"
 if [ -z "${liboptpp_MONOLITHIC}" ]
 then
     MONOLITHIC_SOURCE="$(echo src/libopt++/{TopHeader,BadArg,Parser,BottomHeader}.h)"
-    make_monolithic ${HDR} C || return 1
+    make_monolithic ${HDR} Ch || return 1
 
     MONOLITHIC_SOURCE="$(echo src/libopt++/{TopSource,Parser}.cpp)"
     make_monolithic ${SRC} C || return 1

src/libopt++/soversion

@@ -14,4 +14,4 @@ SOMAJOR=0
 SOMINOR=0
 
 # SOMICRO is bumped every time there is a binary-compatible release.
-SOMICRO=0
+SOMICRO=1

src/tests/build.tests

@@ -6,7 +6,7 @@ build_target libopt++ || return 1
 
 if [ -z ${tests_BUILT} ]
 then
-    LIBS="${liboptpp}"
+    LIBS="${liboptpp} "
     EXTRAS=""
 
     echo "Building test programs..."

src/tests/template

@@ -6,6 +6,7 @@
 */
 
 #include "opt"
+
 #include <iostream>
 
 

version

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