From 91f42a2d730786fba0675fd39379ac2216b95d08 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Mon, 22 Nov 2004 08:28:15 +0000
Subject: Copyright update

---
 tests/GNUmakefile | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

(limited to 'tests/GNUmakefile')

diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index 0e07abf..5221800 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -5,7 +5,7 @@
 #
 #      Pthreads-win32 - POSIX Threads Library for Win32
 #      Copyright(C) 1998 John E. Bossom
-#      Copyright(C) 1999,2003 Pthreads-win32 contributors
+#      Copyright(C) 1999,2004 Pthreads-win32 contributors
 # 
 #      Contact Email: rpj@callisto.canberra.edu.au
 # 
@@ -31,6 +31,7 @@
 #      59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 #
 
+DLL_VER	= 1
 
 CP	= cp -f
 MV	= mv -f
@@ -55,8 +56,12 @@ CFLAGS	= -g -UNDEBUG -Wall $(XXCFLAGS)
 BUILD_DIR	= ..
 INCLUDES	= -I.
 
+
+TEST	= GC
+
 # Default lib version
-GCX	= GC
+GCX	= $(TEST)$(DLL_VER)
+
 # Files we need to run the tests
 # - paths are relative to pthreads build dir.
 HDR	= pthread.h semaphore.h sched.h
@@ -119,19 +124,19 @@ all:
 	@ $(MAKE) clean GCE
 
 GC:
-	$(MAKE) GCX=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" all-pass
+	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" all-pass
 
 GCE:
-	$(MAKE) GCX=GCE CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" all-pass
+	$(MAKE) TEST=GCE CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" all-pass
 
 GCX:
-	$(MAKE) GCX=GC CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_C" all-pass
+	$(MAKE) TEST=GC CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_C" all-pass
 
 GC-bench:
-	$(MAKE) GCX=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" XXLIBS="benchlib.o" all-bench
+	$(MAKE) TEST=GC CC=gcc XXCFLAGS="-D__CLEANUP_C" XXLIBS="benchlib.o" all-bench
 
 GCE-bench:
-	$(MAKE) GCX=GCE  CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" XXLIBS="benchlib." all-bench
+	$(MAKE) TEST=GCE  CC=g++ XXCFLAGS="-mthreads -D__CLEANUP_CXX" XXLIBS="benchlib." all-bench
 
 all-pass: $(PASSES)
 	@ $(ECHO) ALL TESTS PASSED! Congratulations!
@@ -269,8 +274,8 @@ cancel9.pass: cancel8.pass
 
 sizes.pass: sizes.exe
 	@ $(ECHO) Running $*
-	$< > SIZES.$(GCX)
-	@ $(CAT) SIZES.$(GCX)
+	$< > SIZES.$(TEST)
+	@ $(CAT) SIZES.$(TEST)
 	@ $(ECHO) Passed
 	@ $(TOUCH) $@
 
@@ -301,14 +306,14 @@ $(COPYFILES):
 	@ $(ECHO) Copying $@
 	@ $(CP) $(BUILD_DIR)/$@ .
 
-pthread.dll:
-	@ $(CP) $(DLL) $@
-
 benchlib.o: benchlib.c
 	@ $(ECHO) Compiling $@
 	@ $(ECHO) $(CC) -c $(CFLAGS) $< $(INCLUDES)
 	@ $(CC) -c $(CFLAGS) $< $(INCLUDES)
 
+pthread.dll: $(DLL)
+	@ $(CP) $(DLL) $@
+
 clean:
 	- $(RM) *.dll
 	- $(RM) *.lib
-- 
cgit v1.2.3