From 23d7dbcf4b4fd6e23ee78d2109d50f9f0dcb7c10 Mon Sep 17 00:00:00 2001 From: Tinny Ng <tng@apache.org> Date: Fri, 6 Jul 2001 17:12:13 +0000 Subject: [PATCH] Automatic build of single-threaded library. By Martin Kalen. git-svn-id: https://svn.apache.org/repos/asf/xerces/c/trunk@172841 13f79535-47bb-0310-9956-ffa450edef68 --- src/configure | 89 ++------ src/configure.in | 9 +- src/dom/Makefile.in | 1 + src/framework/Makefile.in | 4 + src/idom/Makefile.in | 1 + src/internal/Makefile.in | 1 + src/parsers/Makefile.in | 1 + src/runConfigure | 197 +++++++++--------- src/sax/Makefile.in | 1 + src/sax2/Makefile.in | 3 +- src/util/Compilers/GCCDefs.hpp | 7 +- src/util/Compilers/Makefile.in | 13 +- src/util/Makefile.in | 4 + src/util/MsgLoaders/ICU/Makefile.in | 4 + src/util/MsgLoaders/InMemory/Makefile.in | 5 +- src/util/MsgLoaders/MsgCatalog/Makefile.in | 4 + src/util/MsgLoaders/MsgFile/Makefile.in | 1 + .../NetAccessors/MacOSURLAccess/Makefile.in | 6 +- src/util/NetAccessors/Socket/Makefile.in | 4 + src/util/NetAccessors/libWWW/Makefile.in | 4 + src/util/Platforms/AIX/Makefile.in | 5 +- src/util/Platforms/HPUX/Makefile.in | 5 +- src/util/Platforms/IRIX/Makefile.in | 5 +- src/util/Platforms/Linux/Makefile.in | 5 +- src/util/Platforms/MacOS/Makefile.in | 4 +- src/util/Platforms/Makefile.in | 9 +- src/util/Platforms/OS390/Makefile.in | 5 +- src/util/Platforms/OS400/Makefile.in | 5 +- src/util/Platforms/PTX/Makefile.in | 5 +- src/util/Platforms/Solaris/Makefile.in | 5 +- src/util/Platforms/Tru64/Makefile.in | 2 +- src/util/Platforms/UnixWare/Makefile.in | 5 +- src/util/Transcoders/ICU/Makefile.in | 4 + src/util/Transcoders/Iconv/Makefile.in | 4 + src/util/Transcoders/Iconv390/Makefile.in | 4 + src/util/Transcoders/Iconv400/Makefile.in | 5 +- .../MacOSUnicodeConverter/Makefile.in | 4 + src/util/regx/Makefile.in | 4 + src/validators/DTD/Makefile.in | 8 +- src/validators/Makefile.in | 5 +- src/validators/common/Makefile.in | 10 +- src/validators/datatype/Makefile.in | 4 + src/validators/schema/Makefile.in | 4 + 43 files changed, 269 insertions(+), 206 deletions(-) diff --git a/src/configure b/src/configure index 655aff477..45d23fc7d 100755 --- a/src/configure +++ b/src/configure @@ -1001,57 +1001,9 @@ else fi -echo $ac_n "checking for floor in -lm""... $ac_c" 1>&6 -echo "configure:1006: checking for floor in -lm" >&5 -ac_lib_var=`echo m'_'floor | sed 'y%./+-%__p_%'` -if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - ac_save_LIBS="$LIBS" -LIBS="-lm $LIBS" -cat > conftest.$ac_ext <<EOF -#line 1014 "configure" -#include "confdefs.h" -/* Override any gcc2 internal prototype to avoid an error. */ -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char floor(); - -int main() { -floor() -; return 0; } -EOF -if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=yes" -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - eval "ac_cv_lib_$ac_lib_var=no" -fi -rm -f conftest* -LIBS="$ac_save_LIBS" - -fi -if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ - -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` - cat >> confdefs.h <<EOF -#define $ac_tr_lib 1 -EOF - - LIBS="-lm $LIBS" - -else - echo "$ac_t""no" 1>&6 -fi - - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1055: checking how to run the C preprocessor" >&5 +echo "configure:1007: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1066,13 +1018,13 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1070 "configure" +#line 1022 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1028: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1083,13 +1035,13 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1087 "configure" +#line 1039 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1100,13 +1052,13 @@ else rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext <<EOF -#line 1104 "configure" +#line 1056 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1110: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1062: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -1131,12 +1083,12 @@ fi echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:1135: checking for ANSI C header files" >&5 +echo "configure:1087: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1140 "configure" +#line 1092 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -1144,7 +1096,7 @@ else #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1148: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -1161,7 +1113,7 @@ rm -f conftest* if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1165 "configure" +#line 1117 "configure" #include "confdefs.h" #include <string.h> EOF @@ -1179,7 +1131,7 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 1183 "configure" +#line 1135 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -1200,7 +1152,7 @@ if test "$cross_compiling" = yes; then : else cat > conftest.$ac_ext <<EOF -#line 1204 "configure" +#line 1156 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -1211,7 +1163,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); exit (0); } EOF -if { (eval echo configure:1215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:1167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -1235,12 +1187,12 @@ EOF fi echo $ac_n "checking for XMLByte""... $ac_c" 1>&6 -echo "configure:1239: checking for XMLByte" >&5 +echo "configure:1191: checking for XMLByte" >&5 if eval "test \"`echo '$''{'ac_cv_type_XMLByte'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <<EOF -#line 1244 "configure" +#line 1196 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -1275,7 +1227,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:1279: checking host system type" >&5 +echo "configure:1231: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -1365,6 +1317,9 @@ transcoder=${TRANSCODER} netaccessor=${NETACCESSOR} +threads=${THREADS} + + trap '' 1 2 15 cat > confcache <<\EOF # This file is a shell script that caches the results of configure @@ -1576,6 +1531,7 @@ s%@uselibwww@%$uselibwww%g s%@messageloader@%$messageloader%g s%@transcoder@%$transcoder%g s%@netaccessor@%$netaccessor%g +s%@threads@%$threads%g CEOF EOF @@ -1732,5 +1688,4 @@ test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 echo echo Having build problems? Read instructions at http://xml.apache.org/xerces-c/build.html echo Still cannot resolve it? Find out if someone else had the same problem before. -echo Go to http://xml-archive.webweaving.org/xml-archive-xerces/ - +echo Go to http://marc.theaimsgroup.com/?l=xerces-c-dev diff --git a/src/configure.in b/src/configure.in index c6015d101..238ac66d6 100644 --- a/src/configure.in +++ b/src/configure.in @@ -8,9 +8,6 @@ AC_PROG_CXX AC_PROG_INSTALL AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, true) -dnl Checks for libraries -AC_CHECK_LIB(m, floor) - dnl dnl Do not know how to use this macro, so comment it out. dnl @@ -97,6 +94,9 @@ AC_SUBST(transcoder) netaccessor=${NETACCESSOR} AC_SUBST(netaccessor) +threads=${THREADS} +AC_SUBST(threads) + dnl output the Makefiles AC_OUTPUT([Makefile \ util/Makefile \ @@ -143,5 +143,4 @@ sax2/Makefile \ echo echo Having build problems? Read instructions at http://xml.apache.org/xerces-c/build.html echo Still cannot resolve it? Find out if someone else had the same problem before. -echo Go to http://xml-archive.webweaving.org/xml-archive-xerces/ - +echo Go to http://marc.theaimsgroup.com/?l=xerces-c-dev diff --git a/src/dom/Makefile.in b/src/dom/Makefile.in index cf9235c99..d0f0d17de 100644 --- a/src/dom/Makefile.in +++ b/src/dom/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = dom diff --git a/src/framework/Makefile.in b/src/framework/Makefile.in index e592c3c22..d0bbdd53e 100644 --- a/src/framework/Makefile.in +++ b/src/framework/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.11 2001/07/06 17:11:56 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.10 2001/06/27 17:08:12 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -110,6 +113,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../Makefile.incl diff --git a/src/idom/Makefile.in b/src/idom/Makefile.in index 55b54b6d1..fb414b94b 100644 --- a/src/idom/Makefile.in +++ b/src/idom/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = idom diff --git a/src/internal/Makefile.in b/src/internal/Makefile.in index 7c30f1297..49c778cd4 100644 --- a/src/internal/Makefile.in +++ b/src/internal/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../Makefile.incl diff --git a/src/parsers/Makefile.in b/src/parsers/Makefile.in index 02e6b8f56..a6b05c62d 100644 --- a/src/parsers/Makefile.in +++ b/src/parsers/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../Makefile.incl diff --git a/src/runConfigure b/src/runConfigure index 5262a0667..4abe58cf0 100755 --- a/src/runConfigure +++ b/src/runConfigure @@ -86,7 +86,7 @@ usage() echo " -m <message loader> can be 'inmem', 'icu', 'MsgFile' or 'iconv'" echo " -n <net accessor> can be 'fileonly', 'libwww', 'socket' or 'native'" echo " -t <transcoder> can be 'icu', 'Iconv400', 'Iconv390' or 'native'" - echo " -r <thread option> can be 'pthread' or 'dce' (only used on aix, HP-11 and solaris)" + echo " -r <thread option> can be 'pthread' or 'dce' (only used on aix, HP-11 and solaris) or 'none'" echo " -l <extra linker options>" echo " -z <extra compiler options>" echo " -P <install-prefix>" @@ -131,8 +131,9 @@ fi # Set up the default values for each parameter debug=off # by default debug is off transcoder=native # by default use native transcoder -msgloader=inmem # by default use native transcoder +msgloader=inmem # by default use inmem message loader netaccessor=socket # by default use socket (can do HTTP URL's) +thread=pthread # by default use POSIX threads configureoptions="" for i in $* @@ -196,16 +197,6 @@ echo "Thread option: $thread" echo "Extra configure options: $configureoptions" -if test -z "$ccompiler" -a -n "$cppcompiler"; then - echo "either both c/c++ compiler must be given or nothing at all" - exit ${ERROR_EXIT_CODE}; -fi -if test -n "$ccompiler" -a -z "$cppcompiler"; then - echo "either both c/c++ compiler must be given or nothing at all" - exit ${ERROR_EXIT_CODE}; -fi - - # # Now check if the options are correct or not, bail out if incorrect # @@ -219,7 +210,6 @@ case $platform in exit ${ERROR_EXIT_CODE};; esac - # # Enable debugging or not... # @@ -228,108 +218,108 @@ if test $debug = "off"; then echo "Debug is OFF" if test ${SYSOVR}o = "o"; then if test $platform = "os400"; then - echo "NATIVE OS400 BUILD" + echo "NATIVE OS400 BUILD" debugflag=""; + elif test $platform = "irix"; then + debugflag="-O2"; else - if test $platform = "irix"; then - debugflag="-O2"; - else debugflag="-O"; - fi + fi + else + echo "OVERRIDE FOR OS400 ON AIX" + debugflag=""; fi - else - echo "OVERRIDE FOR OS400 ON AIX" - debugflag=""; - fi else echo "Debug is ON" debugflag="-g"; fi - # -# Check for the threading option only for hp-11 +# Check for the threading option # - -threadingLibs="-lpthread" -if test $platform = "hp-11"; then - if test $thread; then - case $thread in - pthread) - ;; - - dce) - threadingLibs="-lcma"; - threadingDefines="-D_PTHREADS_DRAFT4 -DXML_USE_DCE" ;; - - *) - echo "I do not recognize the thread option '$thread'. Please type '${0} -h' for help." - exit ${ERROR_EXIT_CODE};; - esac - fi -elif test $platform = "aix"; then - aix_version=`sh ./config.guess`; - echo Found host system to be $aix_version - if test -n "$ccompiler"; then - if test -n "$thread"; then - echo "user given compiler no threadig available" - fi; - case $aix_version in - *4.3*) - threadingLibs="-lpthreads_compat -lpthreads";; - *) - threadingLibs="-lpthreads";; - esac - elif test -z "$thread"; then - ccompiler=xlc - cppcompiler=xlC - threadingLibs= - threadingDefines= - else - case $thread in - pthread) - ccompiler=xlc_r - cppcompiler=xlC_r - threadingLibs= - threadingDefines= - ;; - dce) - ccompiler=xlc_r4 - cppcompiler=xlC_r4 - threadingLibs= - threadingDefines="-DXML_USE_DCE" - ;; - *) - echo "I do not recognize the thread option '$thread'. Please type '${0} -h' for help." - exit ${ERROR_EXIT_CODE};; - esac - fi -elif test $platform = "ptx"; then - threadingLibs=" " - if test -z $XMLINSTALL; then - XMLINSTALL=$ICUROOT ## use either the -C or the -P option now. +if test $thread = "none"; then + THREADS=none + threadingLibs="" + threadingDefines="-DAPP_NO_THREADS -DXML_USE_NO_THREADS" +else + THREADS=pthread + threadingDefines="-DXML_USE_PTHREADS" + threadingLibs="-lpthread" + if test $platform = "hp-11"; then + if test $thread; then + case $thread in + pthread) + ;; + dce) + THREADS=dce ; + threadingLibs="-lcma" ; + threadingDefines="-D_PTHREADS_DRAFT4 -D_THREAD_SAFE -DXML_USE_DCE" ;; + *) + echo "I do not recognize the thread option '$thread'. Please type '${0} -h' for help." ; + exit ${ERROR_EXIT_CODE};; + esac + fi + elif test $platform = "aix"; then + aix_version=`./config.guess`; + echo Found host system to be $aix_version + case $aix_version in + *4.3*) + ## Linkflags control the use of libpthreads on AIX + threadingLibs="-lpthreads_compat";; + *) + threadingLibs="-lpthreads";; + esac + if test $thread; then + case $thread in + pthread) + ;; + dce) + THREADS=dce ; + threadingDefines="-DXML_USE_DCE" + case $aix_version in + *4.3*) + ## Linkflags control the use of libpthreads on AIX + threadingLibs="-ldcelibc_r -ldcepthreads -lpthreads_compat";; + *) + threadingLibs="-lC_r -lC -ldcelibc_r -ldcepthreads";; + esac + ;; + *) + echo "I do not recognize the thread option '$thread'. Please type '${0} -h' for help." ; + exit ${ERROR_EXIT_CODE};; + esac + fi + elif test $platform = "ptx"; then + threadingLibs=" " + if test -z $XMLINSTALL; then + XMLINSTALL=$ICUROOT ## use either the -C or the -P option now. + fi + elif test $platform = "hp-10"; then + THREADS=dce + threadingLibs="-lcma" + threadingDefines="-DXML_USE_DCE" + elif test $platform = "unixware"; then + threadingLibs="" ## Linkflags control the use of threads on UnixWare + elif test $platform = "solaris"; then + if test $thread; then + case $thread in + pthread) + ;; + dce) + THREADS=dce ; + threadingLibs="-ldce"; + threadingDefines="-DXML_USE_DCE";; + *) + echo "I do not recognize the thread option '$thread'. Please type '${0} -h' for help." + exit ${ERROR_EXIT_CODE};; + esac + fi fi -elif test $platform = "hp-10"; then - threadingLibs="-lcma" - threadingDefines="-DXML_USE_DCE" -elif test $platform = "unixware"; then - threadingLibs="-lthread" -elif test $platform = "solaris"; then - if test $thread; then - case $thread in - pthread) - ;; - dce) - threadingLibs="-ldce"; - threadingDefines="-DXML_USE_DCE";; - *) - echo "I do not recognize the thread option '$thread'. Please type '${0} -h' for help." - exit ${ERROR_EXIT_CODE};; - esac - fi fi +export THREADS + # # Now check for what kind of transcoding service is desired. @@ -420,6 +410,12 @@ case $netaccessor in NETACCESSOR=Socket netaccessorDefines="-DXML_USE_NETACCESSOR_SOCKET" case $platform in + unixware) + netaccessorLibs="-lnsl -lsocket";; + hp-11) + netaccessorLibs="-lnsl";; + aix) + netaccessorLibs="-lbsd";; solaris) netaccessorLibs="-lnsl -lsocket" if test $thread = "dce"; then @@ -516,6 +512,7 @@ echo echo export TRANSCODER=\"$TRANSCODER\" echo export MESSAGELOADER=\"$MESSAGELOADER\" echo export NETACCESSOR=\"$NETACCESSOR\" +echo export THREADS=\"$THREADS\" echo export CC=\"$CC\" echo export CXX=\"$CXX\" echo export CXXFLAGS=\"$CXXFLAGS\" diff --git a/src/sax/Makefile.in b/src/sax/Makefile.in index 3e52f3f0b..041878a2f 100644 --- a/src/sax/Makefile.in +++ b/src/sax/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../Makefile.incl diff --git a/src/sax2/Makefile.in b/src/sax2/Makefile.in index 073d9d73a..02040027d 100644 --- a/src/sax2/Makefile.in +++ b/src/sax2/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../Makefile.incl @@ -79,7 +80,7 @@ SAX2_CPP_PUBHEADERS = \ Attributes.hpp \ ContentHandler.hpp \ DefaultHandler.hpp \ - LexicalHandler.hpp \ + LexicalHandler.hpp \ SAX2XMLReader.hpp \ XMLReaderFactory.hpp diff --git a/src/util/Compilers/GCCDefs.hpp b/src/util/Compilers/GCCDefs.hpp index 1544a9032..97265ba7a 100644 --- a/src/util/Compilers/GCCDefs.hpp +++ b/src/util/Compilers/GCCDefs.hpp @@ -56,6 +56,9 @@ /* * $Log$ + * Revision 1.14 2001/07/06 17:11:58 tng + * Automatic build of single-threaded library. By Martin Kalen. + * * Revision 1.13 2001/03/02 20:52:58 knoaman * Schema: Regular expression - misc. updates for error messages, * and additions of new functions to XMLString class. @@ -111,9 +114,9 @@ // --------------------------------------------------------------------------- -// Indicate that we do not support native bools +// Indicate that we support native bools // --------------------------------------------------------------------------- -//#define NO_NATIVE_BOOL +// #define NO_NATIVE_BOOL // --------------------------------------------------------------------------- // GCC does not support "L" for long strings. So we do nothing. diff --git a/src/util/Compilers/Makefile.in b/src/util/Compilers/Makefile.in index 8b91b4f8a..3610be1f6 100644 --- a/src/util/Compilers/Makefile.in +++ b/src/util/Compilers/Makefile.in @@ -70,6 +70,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Compilers @@ -91,7 +92,7 @@ CPP_PUBHEADERS = \ SunCCDefs.hpp \ SunKaiDefs.hpp \ OS400SetDefs.hpp \ - MIPSproDefs.hpp \ + MIPSproDefs.hpp \ TandemCCDefs.hpp \ VCPPDefs.hpp @@ -116,7 +117,7 @@ ifeq (${CXX},g++) CPP_OBJECTS = GCCDefs.$(TO) endif ifeq (${CXX},aCC) - CPP_OBJECTS = HPCCDefs.$(TO) + CPP_OBJECTS = HPCCDefs.$(TO) endif ifeq (${CXX},c++) ifeq (${PLATFORM},OS390) @@ -133,11 +134,9 @@ ifeq (${CXX},c++) endif endif ifeq (${CXX}, cxx) - ifeq (${PLATFORM},TRU64) - CPP_OBJECTS = DECCXXDefs.$(TO) - endif + ifeq (${PLATFORM},TRU64) + CPP_OBJECTS = DECCXXDefs.$(TO) + endif endif - include ../Makefile.util.submodule - diff --git a/src/util/Makefile.in b/src/util/Makefile.in index dbe622bb8..f106e433a 100644 --- a/src/util/Makefile.in +++ b/src/util/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.40 2001/07/06 17:11:58 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.39 2001/06/27 17:08:30 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -220,6 +223,7 @@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ NETACCESSOR = @netaccessor@ +THREADS = @threads@ MODULE = util diff --git a/src/util/MsgLoaders/ICU/Makefile.in b/src/util/MsgLoaders/ICU/Makefile.in index cf7d7b2cf..3e6e2565e 100644 --- a/src/util/MsgLoaders/ICU/Makefile.in +++ b/src/util/MsgLoaders/ICU/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.7 2001/07/06 17:11:59 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.6 2001/06/27 17:08:38 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -98,6 +101,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = MsgLoaders/ICU diff --git a/src/util/MsgLoaders/InMemory/Makefile.in b/src/util/MsgLoaders/InMemory/Makefile.in index c71acd20e..e7256ba33 100644 --- a/src/util/MsgLoaders/InMemory/Makefile.in +++ b/src/util/MsgLoaders/InMemory/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.7 2001/07/06 17:11:59 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.6 2001/06/27 17:08:41 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -98,6 +101,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = MsgLoaders/InMemory @@ -111,4 +115,3 @@ CPP_PUBHEADERS = \ CPP_OBJECTS = InMemMsgLoader.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/MsgLoaders/MsgCatalog/Makefile.in b/src/util/MsgLoaders/MsgCatalog/Makefile.in index ed44659a6..f64ad1297 100644 --- a/src/util/MsgLoaders/MsgCatalog/Makefile.in +++ b/src/util/MsgLoaders/MsgCatalog/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.7 2001/07/06 17:12:00 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.6 2001/06/27 17:08:45 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -98,6 +101,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = MsgLoaders/MsgCatalog diff --git a/src/util/MsgLoaders/MsgFile/Makefile.in b/src/util/MsgLoaders/MsgFile/Makefile.in index 7ec0b48a7..84bfeec4e 100644 --- a/src/util/MsgLoaders/MsgFile/Makefile.in +++ b/src/util/MsgLoaders/MsgFile/Makefile.in @@ -58,6 +58,7 @@ PLATFORM = @platform@ COMPILER = @compiler@ PREFIX = @prefix@ +THREADS = @threads@ PREFIX_INCLUDE = @prefix_include@ include ../../../Makefile.incl diff --git a/src/util/NetAccessors/MacOSURLAccess/Makefile.in b/src/util/NetAccessors/MacOSURLAccess/Makefile.in index e44334328..ef5d2d8fe 100644 --- a/src/util/NetAccessors/MacOSURLAccess/Makefile.in +++ b/src/util/NetAccessors/MacOSURLAccess/Makefile.in @@ -54,7 +54,10 @@ # <http://www.apache.org/>. # # -# $Log +# $Log$ +# Revision 1.3 2001/07/06 17:12:00 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # # PLATFORM = @platform@ @@ -71,6 +74,7 @@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ NETACCESSOR = @netaccessor@ +THREADS = @threads@ MODULE = util SUBMODULE = NetAccessors/MacOSURLAccess diff --git a/src/util/NetAccessors/Socket/Makefile.in b/src/util/NetAccessors/Socket/Makefile.in index 3d7748a6f..2af406acf 100644 --- a/src/util/NetAccessors/Socket/Makefile.in +++ b/src/util/NetAccessors/Socket/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.3 2001/07/06 17:12:01 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:08:52 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -83,6 +86,7 @@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ NETACCESSOR = @netaccessor@ +THREADS = @threads@ MODULE = util SUBMODULE = NetAccessors/Socket diff --git a/src/util/NetAccessors/libWWW/Makefile.in b/src/util/NetAccessors/libWWW/Makefile.in index 42725388b..a7b5d0b82 100644 --- a/src/util/NetAccessors/libWWW/Makefile.in +++ b/src/util/NetAccessors/libWWW/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.3 2001/07/06 17:12:01 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:08:55 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -90,6 +93,7 @@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ NETACCESSOR = @netaccessor@ +THREADS = @threads@ MODULE = util SUBMODULE = NetAccessors/libWWW diff --git a/src/util/Platforms/AIX/Makefile.in b/src/util/Platforms/AIX/Makefile.in index 866105360..bc611c430 100644 --- a/src/util/Platforms/AIX/Makefile.in +++ b/src/util/Platforms/AIX/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:02 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:08:59 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = AIXDefs.hpp CPP_OBJECTS = AIXPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/HPUX/Makefile.in b/src/util/Platforms/HPUX/Makefile.in index 8584c2b29..3d6ec7b96 100644 --- a/src/util/Platforms/HPUX/Makefile.in +++ b/src/util/Platforms/HPUX/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:03 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:03 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = HPUXDefs.hpp CPP_OBJECTS = HPPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/IRIX/Makefile.in b/src/util/Platforms/IRIX/Makefile.in index 8a7f93712..9f41db0eb 100644 --- a/src/util/Platforms/IRIX/Makefile.in +++ b/src/util/Platforms/IRIX/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:04 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:06 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = IRIXDefs.hpp CPP_OBJECTS = IRIXPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/Linux/Makefile.in b/src/util/Platforms/Linux/Makefile.in index 146464f26..c64fc9190 100644 --- a/src/util/Platforms/Linux/Makefile.in +++ b/src/util/Platforms/Linux/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:05 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:08 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -86,4 +90,3 @@ CPP_PUBHEADERS = LinuxDefs.hpp CPP_OBJECTS = LinuxPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/MacOS/Makefile.in b/src/util/Platforms/MacOS/Makefile.in index 73ebef1ad..7e744d6b7 100644 --- a/src/util/Platforms/MacOS/Makefile.in +++ b/src/util/Platforms/MacOS/Makefile.in @@ -69,6 +69,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Platforms/MacOS @@ -79,9 +80,8 @@ include ../../../Makefile.incl CPP_PUBHEADERS = \ MacOSDefs.hpp \ MacOSPlatformUtils.hpp - + CPP_OBJECTS = \ MacOSPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/Makefile.in b/src/util/Platforms/Makefile.in index df615d030..a16cafd68 100644 --- a/src/util/Platforms/Makefile.in +++ b/src/util/Platforms/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.15 2001/07/06 17:12:02 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.14 2001/06/05 19:35:53 jberry # Add support for Mac OS X command line configuration and build. # @@ -116,6 +119,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ CD=cd @@ -149,10 +153,10 @@ ifeq (${PLATFORM}, PTX) SUBMODULE = PTX endif ifeq (${PLATFORM}, TRU64) - SUBMODULE = Tru64 + SUBMODULE = Tru64 endif ifeq (${PLATFORM}, MACOSX) - SUBMODULE = MacOS + SUBMODULE = MacOS endif includes:: @@ -169,4 +173,3 @@ distclean:: install:: ${CD} $(SUBMODULE) ; $(MAKE) $@ ; ${CD} .. - diff --git a/src/util/Platforms/OS390/Makefile.in b/src/util/Platforms/OS390/Makefile.in index e6340f6c0..71246de4b 100644 --- a/src/util/Platforms/OS390/Makefile.in +++ b/src/util/Platforms/OS390/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:06 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:14 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = OS390Defs.hpp CPP_OBJECTS = OS390PlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/OS400/Makefile.in b/src/util/Platforms/OS400/Makefile.in index c39a8afa2..a99e56728 100644 --- a/src/util/Platforms/OS400/Makefile.in +++ b/src/util/Platforms/OS400/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:07 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:17 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = OS400Defs.hpp OS400PlatformUtils.hpp CPP_OBJECTS = OS400PlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/PTX/Makefile.in b/src/util/Platforms/PTX/Makefile.in index 796d0223b..237297e41 100644 --- a/src/util/Platforms/PTX/Makefile.in +++ b/src/util/Platforms/PTX/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:07 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:19 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = PTXDefs.hpp CPP_OBJECTS = PTXPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/Solaris/Makefile.in b/src/util/Platforms/Solaris/Makefile.in index 98e7ae795..4d250081f 100644 --- a/src/util/Platforms/Solaris/Makefile.in +++ b/src/util/Platforms/Solaris/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:07 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:22 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = SolarisDefs.hpp CPP_OBJECTS = SolarisPlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/Tru64/Makefile.in b/src/util/Platforms/Tru64/Makefile.in index 8c7e02102..3c766d50d 100644 --- a/src/util/Platforms/Tru64/Makefile.in +++ b/src/util/Platforms/Tru64/Makefile.in @@ -69,6 +69,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -79,4 +80,3 @@ CPP_PUBHEADERS = Tru64Defs.hpp CPP_OBJECTS = Tru64PlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Platforms/UnixWare/Makefile.in b/src/util/Platforms/UnixWare/Makefile.in index f6dbca967..69b17e5d7 100644 --- a/src/util/Platforms/UnixWare/Makefile.in +++ b/src/util/Platforms/UnixWare/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.3 2001/07/06 17:12:08 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:28 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -75,6 +78,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util @@ -85,4 +89,3 @@ CPP_PUBHEADERS = UnixWareDefs.hpp CPP_OBJECTS = UnixWarePlatformUtils.$(TO) include ../../Makefile.util.submodule - diff --git a/src/util/Transcoders/ICU/Makefile.in b/src/util/Transcoders/ICU/Makefile.in index 128ae5fe7..4a2858cf5 100644 --- a/src/util/Transcoders/ICU/Makefile.in +++ b/src/util/Transcoders/ICU/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.7 2001/07/06 17:12:08 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.6 2001/06/27 17:09:30 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -98,6 +101,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Transcoders/ICU diff --git a/src/util/Transcoders/Iconv/Makefile.in b/src/util/Transcoders/Iconv/Makefile.in index a56881aa0..ae52204e9 100644 --- a/src/util/Transcoders/Iconv/Makefile.in +++ b/src/util/Transcoders/Iconv/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.7 2001/07/06 17:12:08 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.6 2001/06/27 17:09:33 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -98,6 +101,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Transcoders/Iconv diff --git a/src/util/Transcoders/Iconv390/Makefile.in b/src/util/Transcoders/Iconv390/Makefile.in index 99117ae2c..f4f6069f7 100644 --- a/src/util/Transcoders/Iconv390/Makefile.in +++ b/src/util/Transcoders/Iconv390/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.3 2001/07/06 17:12:08 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:35 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -76,6 +79,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Transcoders/Iconv390 diff --git a/src/util/Transcoders/Iconv400/Makefile.in b/src/util/Transcoders/Iconv400/Makefile.in index 87b27af5e..3d5f53aea 100644 --- a/src/util/Transcoders/Iconv400/Makefile.in +++ b/src/util/Transcoders/Iconv400/Makefile.in @@ -57,6 +57,9 @@ # # $Log$ +# Revision 1.3 2001/07/06 17:12:09 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:38 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -77,6 +80,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Transcoders/Iconv400 @@ -90,5 +94,4 @@ CPP_OBJECTS = Iconv400TransService.$(TO) \ iconv_cnv.$(TO) - include ../../Makefile.util.submodule diff --git a/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in b/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in index bc02ffb70..049f44cd8 100644 --- a/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in +++ b/src/util/Transcoders/MacOSUnicodeConverter/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.3 2001/07/06 17:12:09 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.2 2001/06/27 17:09:41 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -101,6 +104,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ MODULE = util SUBMODULE = Transcoders/MacOSUnicodeConverter diff --git a/src/util/regx/Makefile.in b/src/util/regx/Makefile.in index 9cf7e1c3e..d6e631e25 100644 --- a/src/util/regx/Makefile.in +++ b/src/util/regx/Makefile.in @@ -56,6 +56,9 @@ # # # $Log$ +# Revision 1.5 2001/07/06 17:12:09 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.4 2001/06/27 17:09:43 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -98,6 +101,7 @@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ NETACCESSOR = @netaccessor@ +THREADS = @threads@ MODULE = util SUBMODULE = regx diff --git a/src/validators/DTD/Makefile.in b/src/validators/DTD/Makefile.in index 32c3bdcc7..0f9f9ba8d 100644 --- a/src/validators/DTD/Makefile.in +++ b/src/validators/DTD/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.11 2001/07/06 17:12:10 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.10 2001/06/27 17:09:47 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -111,6 +114,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../../Makefile.incl @@ -122,8 +126,8 @@ VALIDATORS_DTD_CPP_PUBHEADERS = \ DTDAttDefList.hpp \ DTDElementDecl.hpp \ DTDEntityDecl.hpp \ - DTDGrammar.hpp \ - DTDScanner.hpp \ + DTDGrammar.hpp \ + DTDScanner.hpp \ DTDValidator.hpp \ DocTypeHandler.hpp diff --git a/src/validators/Makefile.in b/src/validators/Makefile.in index fb5ecbc0a..9da1cf033 100644 --- a/src/validators/Makefile.in +++ b/src/validators/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.4 2001/07/06 17:12:09 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.3 2001/06/27 17:09:45 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -81,6 +84,7 @@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ NETACCESSOR = @netaccessor@ +THREADS = @threads@ MODULE = validators @@ -155,4 +159,3 @@ install:: cd datatype ; $(MAKE) $@ ; cd .. cd DTD ; $(MAKE) $@ ; cd .. cd schema ; $(MAKE) $@ ; cd .. - diff --git a/src/validators/common/Makefile.in b/src/validators/common/Makefile.in index 1100b78af..f26c97010 100644 --- a/src/validators/common/Makefile.in +++ b/src/validators/common/Makefile.in @@ -54,6 +54,9 @@ # <http://www.apache.org/>. # # $Log$ +# Revision 1.6 2001/07/06 17:12:10 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.5 2001/06/27 17:09:50 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -85,6 +88,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../../Makefile.incl @@ -101,8 +105,8 @@ VALIDATORS_COMMON_CPP_PUBHEADERS = \ ContentLeafNameTypeVector.hpp \ ContentSpecNode.hpp \ DFAContentModel.hpp \ - Grammar.hpp \ - GrammarResolver.hpp \ + Grammar.hpp \ + GrammarResolver.hpp \ MixedContentModel.hpp \ SimpleContentModel.hpp @@ -117,7 +121,7 @@ VALIDATORS_COMMON_CPP_OBJECTS = \ ContentLeafNameTypeVector.$(TO) \ ContentSpecNode.$(TO) \ DFAContentModel.$(TO) \ - GrammarResolver.$(TO) \ + GrammarResolver.$(TO) \ MixedContentModel.$(TO) \ SimpleContentModel.$(TO) diff --git a/src/validators/datatype/Makefile.in b/src/validators/datatype/Makefile.in index cd706be92..cf25dd579 100644 --- a/src/validators/datatype/Makefile.in +++ b/src/validators/datatype/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.11 2001/07/06 17:12:11 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.10 2001/07/05 20:15:26 peiyongz # NOTATIONDatatypeValidator # @@ -102,6 +105,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../../Makefile.incl diff --git a/src/validators/schema/Makefile.in b/src/validators/schema/Makefile.in index c3f696dad..0ea3372e9 100644 --- a/src/validators/schema/Makefile.in +++ b/src/validators/schema/Makefile.in @@ -55,6 +55,9 @@ # # # $Log$ +# Revision 1.13 2001/07/06 17:12:13 tng +# Automatic build of single-threaded library. By Martin Kalen. +# # Revision 1.12 2001/06/27 17:09:56 tng # [Bug 1147] Headers install in wrong directory. By Murray Cumming. # @@ -107,6 +110,7 @@ OSVER = @osver@ USELIBWWW = @uselibwww@ MESSAGELOADER = @messageloader@ TRANSCODER = @transcoder@ +THREADS = @threads@ include ../../Makefile.incl -- GitLab