hlu@yoda.eecs.wsu.edu (Hongjiu Lu) (06/14/91)
-------------------- CUT HERE ------------------------------------- diff -rc libg++.old/Makefile libg++-1.39/Makefile *** libg++.old/Makefile Tue Feb 19 05:13:58 1991 --- libg++-1.39/Makefile Wed Jun 12 15:56:43 1991 *************** *** 28,34 **** # ------ source locations # Manually set PWD to *this* directory if you are not using gnu make ! PWD := $(shell pwd) #PWD=/home/dl/libg++ # source include directory --- 28,34 ---- # ------ source locations # Manually set PWD to *this* directory if you are not using gnu make ! PWD = /local/src/libg++ #PWD=/home/dl/libg++ # source include directory *************** *** 46,52 **** # set `prefix' to something else if you want to install things # in nonstandard places ! prefix =/usr/gnu # libg++.a destination LIBDIR = $(prefix)/lib --- 46,52 ---- # set `prefix' to something else if you want to install things # in nonstandard places ! prefix =/usr/local # libg++.a destination LIBDIR = $(prefix)/lib *************** *** 66,75 **** # g++ flags OSFLAG= ! #OSFLAG = -DUSG # other compilation control flags -- use any combination # use this only if you have a strange stdio implementation #XTRAFLAGS = -DDEFAULT_filebuf --- 66,78 ---- # g++ flags OSFLAG= ! OSFLAG = -DUSG -DDO_NOT_HAVE_FLOCK # other compilation control flags -- use any combination + # use this only if you use COFF + XTRAFLAGS = -DCOFF + # use this only if you have a strange stdio implementation #XTRAFLAGS = -DDEFAULT_filebuf *************** *** 93,108 **** #XTRAFLAGS = -DNO_GNULIB3 -DNO_LIBGXX_MALLOC # ld or ld++ flags ! OSLDFLAG = #OSLDFLAG= -lPW # how to install INSTALL=install -c ! #INSTALL=cp # ranlib if necessary RANLIB=ranlib ! #RANLIB=echo # which make? MAKE=make --- 96,111 ---- #XTRAFLAGS = -DNO_GNULIB3 -DNO_LIBGXX_MALLOC # ld or ld++ flags ! OSLDFLAG = -lc_s #OSLDFLAG= -lPW # how to install INSTALL=install -c ! INSTALL=cp # ranlib if necessary RANLIB=ranlib ! RANLIB=echo # which make? MAKE=make *************** *** 124,134 **** CC = gcc # GNU loader ! LDXX = $(LIBDIR)/gcc-ld #LDXX = $(LIBDIR)/gcc-ld++ # crt0+.o location (for dynamic loading tests) ! GXXCRT1=$(LIBDIR)/crt1+.o # ------ Other compilation flags # ------ modify as you like -- the ones here are sheer overkill --- 127,137 ---- CC = gcc # GNU loader ! #LDXX = $(LIBDIR)/gcc-ld #LDXX = $(LIBDIR)/gcc-ld++ # crt0+.o location (for dynamic loading tests) ! #GXXCRT1=$(LIBDIR)/crt1+.o # ------ Other compilation flags # ------ modify as you like -- the ones here are sheer overkill *************** *** 154,160 **** #use this only if you use GNU as (gas) or other assemblers that #can read from pipes. PIPE_AS= -pipe ! #PIPE_AS= # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(XTRAFLAGS) $(PIPE_AS) --- 157,163 ---- #use this only if you use GNU as (gas) or other assemblers that #can read from pipes. PIPE_AS= -pipe ! PIPE_AS= # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(XTRAFLAGS) $(PIPE_AS) diff -rc libg++.old/etc/ADT-examples/genPatkey.cc libg++-1.39/etc/ADT-examples/genPatkey.cc *** libg++.old/etc/ADT-examples/genPatkey.cc Wed May 10 21:39:31 1989 --- libg++-1.39/etc/ADT-examples/genPatkey.cc Mon Jun 10 21:47:08 1991 *************** *** 1,6 **** --- 1,11 ---- // Generates random character strings #include <stream.h> + #ifdef USG + #define random rand + #define srandom srand + #endif + main (int argc, char *argv[]) { if (argc != 3) diff -rc libg++.old/etc/ADT-examples/search.cc libg++-1.39/etc/ADT-examples/search.cc *** libg++.old/etc/ADT-examples/search.cc Sun Sep 24 05:49:43 1989 --- libg++-1.39/etc/ADT-examples/search.cc Mon Jun 10 21:01:38 1991 *************** *** 3,8 **** --- 3,13 ---- #include <stream.h> + #ifdef USG + #define random rand + #define srandom srand + #endif + /**********************************************************************/ /**********************************************************************/ diff -rc libg++.old/etc/benchmarks/Makefile libg++-1.39/etc/benchmarks/Makefile *** libg++.old/etc/benchmarks/Makefile Mon Aug 13 10:48:56 1990 --- libg++-1.39/etc/benchmarks/Makefile Wed Jun 12 16:42:04 1991 *************** *** 3,12 **** # ------ source locations # source directory for libg++.a ! SRCDIR = ../../../src # source include directory ! SRCIDIR= ../../../g++-include # ------ installation destinations # ------ You will require write-permission on the destination directories --- 3,12 ---- # ------ source locations # source directory for libg++.a ! SRCDIR = ../../src # source include directory ! SRCIDIR= ../../g++-include # ------ installation destinations # ------ You will require write-permission on the destination directories *************** *** 13,19 **** # ------ in order to `make install' ! prefix =/usr/gnu # libg++.a destination LIBDIR = $(prefix)/lib --- 13,19 ---- # ------ in order to `make install' ! prefix =/usr/local # libg++.a destination LIBDIR = $(prefix)/lib *************** *** 30,48 **** # g++ flags OSFLAG= ! #OSFLAG = -DUSG # ld or ld++ flags ! OSLDFLAG = #OSLDFLAG= -lPW # how to install INSTALL=install -c ! #INSTALL=cp # ranlib if necessary RANLIB=ranlib ! #RANLIB=echo # which make? MAKE=make --- 30,48 ---- # g++ flags OSFLAG= ! OSFLAG = -DUSG -DDO_NOT_HAVE_FLOCK # ld or ld++ flags ! OSLDFLAG = -lc_s #OSLDFLAG= -lPW # how to install INSTALL=install -c ! INSTALL=cp # ranlib if necessary RANLIB=ranlib ! RANLIB=echo # which make? MAKE=make *************** *** 61,70 **** CC = gcc # GNU loader ! LDXX = $(LIBDIR)/gcc-ld++ # crt0+.o location (for dynamic loading tests) ! GXXCRT1=$(LIBDIR)/crt1+.o # ------ Other compilation flags # ------ modify as you like -- the ones here are sheer overkill --- 61,70 ---- CC = gcc # GNU loader ! #LDXX = $(LIBDIR)/gcc-ld++ # crt0+.o location (for dynamic loading tests) ! #GXXCRT1=$(LIBDIR)/crt1+.o # ------ Other compilation flags # ------ modify as you like -- the ones here are sheer overkill *************** *** 76,88 **** DEBUG_FLAGS= -g #use this only if you like to look at lots of useless messages ! VERBOSITY_FLAGS= -Wall -v GXX_INCLUDE_DIRS= -I$(SRCIDIR) GCC_INCLUDE_DIRS= -I$(prefix)/lib/gcc-include -I/usr/include -I$(SRCIDIR) ! PIPE_AS= -pipe # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) --- 76,89 ---- DEBUG_FLAGS= -g #use this only if you like to look at lots of useless messages ! #VERBOSITY_FLAGS= -Wall -v ! VERBOSITY_FLAGS= -Wall GXX_INCLUDE_DIRS= -I$(SRCIDIR) GCC_INCLUDE_DIRS= -I$(prefix)/lib/gcc-include -I/usr/include -I$(SRCIDIR) ! #PIPE_AS= -pipe # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) diff -rc libg++.old/etc/benchmarks/dhrystone.cc libg++-1.39/etc/benchmarks/dhrystone.cc *** libg++.old/etc/benchmarks/dhrystone.cc Tue Jan 16 04:16:16 1990 --- libg++-1.39/etc/benchmarks/dhrystone.cc Tue Jun 11 14:49:27 1991 *************** *** 23,28 **** --- 23,40 ---- */ + // If this does not work on your system, report the problem + + #if defined(USG) + extern "C" { + #include <sys/types.h> + #include <sys/param.h> + #include <sys/times.h> + } + #else + #include <osfcn.h> + #endif + #include "Int.h" #include "Char.h" *************** *** 299,323 **** #undef NOENUM /* Define if compiler has no enum's */ #undef NOSTRUCTASSIGN /* Define if compiler can't assign structures */ - /* define only one of the next two defines */ - #ifndef USG - #define TIMES /* Use times(2) time function */ - #else - #define TIME /* Use time(2) time function */ - #endif - - #ifdef TIMES - #include <sys/types.h> - #include <sys/times.h> - #endif - - /* define the granularity of your times(2) function (when used) */ - #ifndef HZ - #define HZ 60 /* times(2) returns 1/60 second (most) */ - /*#define HZ 100 /* times(2) returns 1/100 second (WECo) */ - #endif - - #ifdef NOSTRUCTASSIGN #define structassign(d, s) memcpy(&(d), &(s), sizeof(d)) #else --- 311,316 ---- *************** *** 432,450 **** Enumeration EnumLoc; String30 String1Loc; String30 String2Loc; - - #ifdef TIME - long time(); - long starttime; - long benchtime; - long nulltime; - register unsigned int i; - - starttime = time( (long *) 0); - for (i = 0; i < LOOPS; ++i); - nulltime = time( (long *) 0) - starttime; /* Computes o'head of loop */ - #endif - #ifdef TIMES time_t starttime; time_t benchtime; time_t nulltime; --- 425,430 ---- *************** *** 455,461 **** for (i = 0; i < LOOPS; ++i); times(&Tms); nulltime = Tms.tms_utime - starttime; /* Computes overhead of looping */ - #endif PtrGlbNext = new Record; PtrGlb = new Record; --- 435,440 ---- *************** *** 469,480 **** /***************** -- Start Timer -- *****************/ - #ifdef TIME - starttime = time( (long *) 0); - #endif - #ifdef TIMES times(&Tms); starttime = Tms.tms_utime; - #endif for (i = 0; i < LOOPS; ++i) { --- 448,454 ---- *************** *** 506,519 **** -- Stop Timer -- *****************/ - #ifdef TIME - benchtime = time( (long *) 0) - starttime - nulltime; - printf("Dhrystone time for %ld passes = %ld\n", - (long) LOOPS, benchtime); - printf("This machine benchmarks at %ld dhrystones/second\n", - ((long) LOOPS) / benchtime); - #endif - #ifdef TIMES times(&Tms); benchtime = Tms.tms_utime - starttime - nulltime; printf("Dhrystone time for %ld passes = %ld\n", --- 480,485 ---- *************** *** 520,527 **** (long) LOOPS, benchtime/HZ); printf("This machine benchmarks at %ld dhrystones/second\n", ((long) LOOPS) * HZ / benchtime); - #endif - } void Proc1(RecordPtr PtrParIn) --- 486,491 ---- diff -rc libg++.old/etc/trie-gen/Makefile libg++-1.39/etc/trie-gen/Makefile *** libg++.old/etc/trie-gen/Makefile Tue Feb 19 04:38:20 1991 --- libg++-1.39/etc/trie-gen/Makefile Tue Jun 11 00:50:49 1991 *************** *** 27,33 **** # ------ installation destinations ! prefix =/usr/gnu # libg++.a destination LIBDIR = $(prefix)/lib --- 27,33 ---- # ------ installation destinations ! prefix =/usr/local # libg++.a destination LIBDIR = $(prefix)/lib *************** *** 44,50 **** # g++ flags OSFLAG= ! #OSFLAG = -DUSG # ld or ld++ flags OSLDFLAG = --- 44,50 ---- # g++ flags OSFLAG= ! OSFLAG = -DUSG # ld or ld++ flags OSLDFLAG = *************** *** 52,62 **** # how to install INSTALL=install -c ! #INSTALL=cp # ranlib if necessary RANLIB=ranlib ! #RANLIB=echo # which make? MAKE=make --- 52,62 ---- # how to install INSTALL=install -c ! INSTALL=cp # ranlib if necessary RANLIB=ranlib ! RANLIB=echo # which make? MAKE=make *************** *** 91,102 **** #use this only if you like to look at lots of useless messages VERBOSITY_FLAGS= -Wall -v GXX_INCLUDE_DIRS= -I$(SRCIDIR) GCC_INCLUDE_DIRS= -I$(prefix)/lib/gcc-include -I/usr/include -I$(SRCIDIR) ! PIPE_AS= -pipe # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) --- 91,103 ---- #use this only if you like to look at lots of useless messages VERBOSITY_FLAGS= -Wall -v + VERBOSITY_FLAGS= -Wall GXX_INCLUDE_DIRS= -I$(SRCIDIR) GCC_INCLUDE_DIRS= -I$(prefix)/lib/gcc-include -I/usr/include -I$(SRCIDIR) ! #PIPE_AS= -pipe # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) *************** *** 105,111 **** CFLAGS= $(OSFLAG) $(GCC_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GCC_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) # g++ load time flags ! GXXLDFLAGS = -L$(SRCDIR) -lg++ $(OSLDFLAG) # g++ files should have extension .cc .SUFFIXES: .cc --- 106,112 ---- CFLAGS= $(OSFLAG) $(GCC_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GCC_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) # g++ load time flags ! GXXLDFLAGS = -L$(SRCDIR) -lg++ -lc_s $(OSLDFLAG) # g++ files should have extension .cc .SUFFIXES: .cc *************** *** 122,130 **** run_tests: trie-gen @echo "Generating a compacted minimal-prefix trie for files in /bin" ! /bin/ls -1 /bin | ./trie-gen -c > out.c ! $(GXX) $(DFLAGS) out.c test.c ! /bin/ls -1 /bin | ./a.out -v distrib: (cd ..; rm -f trie-gen.tar.Z; tar cvf trie-gen.tar trie-gen; compress trie-gen.tar) --- 123,132 ---- run_tests: trie-gen @echo "Generating a compacted minimal-prefix trie for files in /bin" ! /bin/ls -l /bin | ./trie-gen -c > out.c ! # $(GXX) $(DFLAGS) out.c test.c ! $(GXX) $(GXXFLAGS) out.c test.c $(GXXLDFLAGS) ! /bin/ls -l /bin | ./a.out -v distrib: (cd ..; rm -f trie-gen.tar.Z; tar cvf trie-gen.tar trie-gen; compress trie-gen.tar) diff -rc libg++.old/g++-include/std.h libg++-1.39/g++-include/std.h *** libg++.old/g++-include/std.h Sun Oct 28 02:33:15 1990 --- libg++-1.39/g++-include/std.h Wed Jun 12 13:08:51 1991 *************** *** 89,95 **** int fcntl(int, int, ...); char* fcvt(double, int, int*, int*); int ffs(int); ! #ifndef hpux int flock(int, int); #endif int fork(void); --- 89,95 ---- int fcntl(int, int, ...); char* fcvt(double, int, int*, int*); int ffs(int); ! #if !defined(hpux) && !defined(DO_NOT_HAVE_FLOCK) int flock(int, int); #endif int fork(void); diff -rc libg++.old/g++-include/stdio.h libg++-1.39/g++-include/stdio.h *** libg++.old/g++-include/stdio.h Wed Aug 22 04:09:07 1990 --- libg++-1.39/g++-include/stdio.h Thu Jun 6 14:11:14 1991 *************** *** 175,181 **** #if defined(USG) && !defined(_NFILE) #ifdef hpux #define _NFILE 60 ! #elif #define _NFILE 20 #endif #endif --- 175,181 ---- #if defined(USG) && !defined(_NFILE) #ifdef hpux #define _NFILE 60 ! #else #define _NFILE 20 #endif #endif diff -rc libg++.old/gperf/Makefile libg++-1.39/gperf/Makefile *** libg++.old/gperf/Makefile Mon Jan 21 09:35:57 1991 --- libg++-1.39/gperf/Makefile Tue Jun 11 16:20:27 1991 *************** *** 17,23 **** # along with GNU GPERF; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ! prefix=/usr/gnu BINDIR=$(prefix)/bin LIBDIR=$(prefix)/lib MANDIR=$(prefix)/man --- 17,23 ---- # along with GNU GPERF; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ! prefix=/usr/local BINDIR=$(prefix)/bin LIBDIR=$(prefix)/lib MANDIR=$(prefix)/man *************** *** 32,38 **** cd src; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) INSTALL="$(INSTALL)" install $(INSTALL) gperf.1 $(MANDIR)/man1/gperf.1 ! run_tests: gperf -cd tests; $(MAKE) GPERF=../src/gperf distrib: --- 32,39 ---- cd src; $(MAKE) BINDIR=$(BINDIR) MANDIR=$(MANDIR) INSTALL="$(INSTALL)" install $(INSTALL) gperf.1 $(MANDIR)/man1/gperf.1 ! #run_tests: ./src/gperf ! run_tests: -cd tests; $(MAKE) GPERF=../src/gperf distrib: diff -rc libg++.old/gperf/src/Makefile libg++-1.39/gperf/src/Makefile *** libg++.old/gperf/src/Makefile Mon Aug 13 10:55:47 1990 --- libg++-1.39/gperf/src/Makefile Tue Jun 11 15:07:30 1991 *************** *** 17,26 **** # along with GNU GPERF; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ! GXX = g++ ! DFLAGS= -Wall -g -DLO_CAL -DUNLIMIT_STACK # -DTRACE OFLAGS= -O -fstrength-reduce -fdelayed-branch -fsave-memoized \ -finline-functions -felide-constructors GXXFLAGS= $(DFLAGS) $(OFLAGS) prefix=/usr/local BINDIR=$(prefix)/bin --- 17,27 ---- # along with GNU GPERF; see the file COPYING. If not, write to # the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. ! GXX = g++ ! DFLAGS= -DUSG -Wall -g -DLO_CAL # -DUNLIMIT_STACK -DTRACE OFLAGS= -O -fstrength-reduce -fdelayed-branch -fsave-memoized \ -finline-functions -felide-constructors + #GXXFLAGS= $(DFLAGS) $(OFLAGS) -I../../g++-include GXXFLAGS= $(DFLAGS) $(OFLAGS) prefix=/usr/local BINDIR=$(prefix)/bin *************** *** 27,32 **** --- 28,34 ---- LIBDIR=$(prefix)/lib MANDIR=$(prefix)/man INSTALL=install + LIBS = -lg++ -lc_s OBJS = new.o options.o iterator.o main.o gen-perf.o key-list.o list-node.o \ hash-table.o bool-array.o read-line.o std-err.o version.o .SUFFIXES: .cc *************** *** 36,42 **** all: gperf gperf: $(OBJS) ! $(GXX) $(GXXFLAGS) -o gperf $(OBJS) -L../../src $(LIBS) install: all $(INSTALL) gperf $(BINDIR)/gperf --- 38,45 ---- all: gperf gperf: $(OBJS) ! $(GXX) $(GXXFLAGS) -v -o gperf $(OBJS) $(LIBS) ! # $(GXX) $(GXXFLAGS) -o gperf $(OBJS) -L../../src $(LIBS) install: all $(INSTALL) gperf $(BINDIR)/gperf Binary files libg++.old/gperf/src/gperf and libg++-1.39/gperf/src/gperf differ diff -rc libg++.old/src/bcopy.c libg++-1.39/src/bcopy.c *** libg++.old/src/bcopy.c Wed Aug 22 04:01:59 1990 --- libg++-1.39/src/bcopy.c Thu Jun 6 18:04:40 1991 *************** *** 1,5 **** --- 1,6 ---- #ifdef USG + #ifdef USE_GXX_BCOPY /* SysV version of bcopy from Eric Newton */ void bcopy (void *source, void *dest, int count) *************** *** 37,41 **** --- 38,64 ---- return; } } + + #else + + void bcopy (void *b1, void *b2, int length) + { + if (b1 == b2) return; + + if (b1 < b2) { + b2 += length; + b1 += length; + while (length--) { + *--((char *)b2) = *--((char *)b1); + } + } + else { + while (length--) { + *((char *)b2)++ = *((char *)b1)++; + } + } + return; + } + #endif #endif diff -rc libg++.old/src/gnulib3.c libg++-1.39/src/gnulib3.c *** libg++.old/src/gnulib3.c Sat Nov 25 07:16:43 1989 --- libg++-1.39/src/gnulib3.c Fri Jun 7 13:33:49 1991 *************** *** 1,4 **** - #ifndef NO_GNULIB3 /* skip entire file if NO_GNULIB3 */ typedef struct set_vector --- 1,3 ---- *************** *** 21,34 **** extern void _exit(int); - #if defined(i386) && !defined(sequent) - #define COFF - #endif - - #ifdef COFF_ENCAPSULATE - #undef COFF - #endif - /* ON_EXIT macro commented out - dl Sun on_exit doesn't get linked in right!!! --- 20,25 ---- diff -rc libg++.old/src/xyzzy.cc libg++-1.39/src/xyzzy.cc *** libg++.old/src/xyzzy.cc Sun May 27 06:52:22 1990 --- libg++-1.39/src/xyzzy.cc Fri Jun 7 13:33:13 1991 *************** *** 1,4 **** ! #ifndef NO_GNULIB3 // from tiemann /* Needed, in case there are no other objects which --- 1,5 ---- ! #if !defined(NO_GNULIB3) && !defined (COFF) ! // from tiemann /* Needed, in case there are no other objects which *************** *** 8,12 **** __xyzzy__ () {} ~__xyzzy__ () {} } __1xyzzy__; - #endif --- 9,12 ---- diff -rc libg++.old/tests/Makefile libg++-1.39/tests/Makefile *** libg++.old/tests/Makefile Tue Feb 19 02:36:43 1991 --- libg++-1.39/tests/Makefile Wed Jun 12 15:53:24 1991 *************** *** 35,41 **** # ------ in order to `make install' ! prefix =/usr/gnu # libg++.a destination LIBDIR = $(prefix)/lib --- 35,41 ---- # ------ in order to `make install' ! prefix =/usr/local # libg++.a destination LIBDIR = $(prefix)/lib *************** *** 52,70 **** # g++ flags OSFLAG= ! #OSFLAG = -DUSG # ld or ld++ flags ! OSLDFLAG = #OSLDFLAG= -lPW # how to install INSTALL=install -c ! #INSTALL=cp # ranlib if necessary RANLIB=ranlib ! #RANLIB=echo # which make? MAKE=make --- 52,70 ---- # g++ flags OSFLAG= ! OSFLAG = -DUSG -DDO_NOT_HAVE_FLOCK # ld or ld++ flags ! OSLDFLAG = -lc_s #OSLDFLAG= -lPW # how to install INSTALL=install -c ! INSTALL=cp # ranlib if necessary RANLIB=ranlib ! RANLIB=echo # which make? MAKE=make *************** *** 72,77 **** --- 72,83 ---- #which ar? AR=ar + # which diff + # AT&T SVR3 + DIFF=diff -b + # BSD + #DIFF=diff -p + # not used, but convenient for those who preprocess things while compiling SHELL=/bin/sh *************** *** 108,114 **** GCC_INCLUDE_DIRS= -I$(prefix)/lib/gcc-include -I/usr/include -I$(SRCIDIR) ! PIPE_AS= -pipe # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) --- 114,120 ---- GCC_INCLUDE_DIRS= -I$(prefix)/lib/gcc-include -I/usr/include -I$(SRCIDIR) ! #PIPE_AS= -pipe # Flags for all C++ compiles GXXFLAGS = $(OSFLAG) $(GXX_INCLUDE_DIRS) $(DEBUG_FLAGS) $(GXX_OPTIMIZATION_FLAGS) $(VERBOSITY_FLAGS) $(PIPE_AS) *************** *** 188,204 **** runtests: tests for i in $(TOUTS); do \ case $$i in \ test0) echo "Must run test0 from tty";; \ tCurses) echo "Must run tCurses from tty" ;; \ tGetOpt) echo $$i; ./$$i -abc -de10 -2000 -h3i ;; \ *) echo $$i; ./$$i < $$i.inp;; \ ! esac \ done checktests: tests -$(MAKE) -s runtests > my.out 2>&1 ! -diff -b expected.out my.out > checktests.diffs cat checktests.diffs --- 194,215 ---- runtests: tests for i in $(TOUTS); do \ + xxx=`file ./$$i | grep executable | cut -f1 -d:`; \ + if [ x$$xxx = x ] ; then \ + echo $$i not executable!; \ + else \ case $$i in \ test0) echo "Must run test0 from tty";; \ tCurses) echo "Must run tCurses from tty" ;; \ tGetOpt) echo $$i; ./$$i -abc -de10 -2000 -h3i ;; \ *) echo $$i; ./$$i < $$i.inp;; \ ! esac; \ ! fi \ done checktests: tests -$(MAKE) -s runtests > my.out 2>&1 ! -$(DIFF) expected.out my.out > checktests.diffs cat checktests.diffs