diff options
author | rpj <rpj> | 1999-08-12 01:32:02 +0000 |
---|---|---|
committer | rpj <rpj> | 1999-08-12 01:32:02 +0000 |
commit | 9af51e470791639995bb34bd3198014dc11e2fef (patch) | |
tree | 8b06f29abbaf8d1cc027bab0731a9fe79db69413 /tests | |
parent | 77d0a6ff70ef2bb480c927e563340fc501ec0930 (diff) |
Merged patches to main trunk.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/ChangeLog | 4 | ||||
-rw-r--r-- | tests/Makefile | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tests/ChangeLog b/tests/ChangeLog index 22b7028..4140f0c 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +Mon May 31 10:25:01 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au> + + * Makefile (GLANG): Add GCC language option. + Sat May 29 23:29:04 1999 Ross Johnson <rpj@ixobrychus.canberra.edu.au> * runall.bat (condvar5): Add new test. diff --git a/tests/Makefile b/tests/Makefile index f96d830..7a348ab 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -11,8 +11,9 @@ ECHO = @echo # # Mingw32 # +GLANG = c CC = gcc -CFLAGS = -g -O2 -UNDEBUG -Wall -o $@ $^ +CFLAGS = -g -O2 -UNDEBUG -Wall -x $(GLANG) -o $@ $^ BUILD_DIR = .. INCLUDES = -I. LIBS = ./libpthread32.a |