From eb45ddca732b7e919ec54e5c524fd1e128fc84a4 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Fri, 11 Aug 2000 05:49:39 +0000
Subject: 2000-08-10  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * cleanup.c (pthread_pop_cleanup): Remove _pthread
        prefix from __except and catch keywords; implement.h
        now simply undefines _pthread__except and
        _pthread_catch if defined; VC++ was not textually
        substituting _pthread_catch etc back to catch as
        it was redefined; the reason for using the prefixed
        version was to make it clear that it was not using
        the pthread.h redefined catch keyword.

        * private.c (_pthread_threadStart): Ditto.
        (_pthread_callUserDestroyRoutines): Ditto.

        * implement.h (_pthread__except): Remove #define.
        (_pthread_catch): Remove #define.

        * GNUmakefile (pthread.a): New target to build
        libpthread32.a from pthread.dll using dlltool.

        * buildlib.bat: Duplicate cl commands with args to
        build C++ EH version of pthread.dll; use of .bat
        files is redundant now that nmake compatible
        Makefile is included; used as a kludge only now.

        * Makefile: Localise some macros and fix up the clean:
        target to extend it and work properly.

        * CONTRIBUTORS: Add contributors.

        * ANNOUNCE: Updated.

        * README: Updated.

tests/ChangeLog:

2000-08-10  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * eyal1.c (main): Change implicit cast to explicit
        cast when passing "print_server" function pointer;
        G++ no longer allows implicit func parameter casts.

        * cleanup1.c: Remove unused "waitLock".
        (main): Fix implicit parameter cast.

        * cancel2.c (main): Fix implicit parameter cast.

        * cancel4.c (main): Fix implicit parameter cast.

        * cancel3.c (main): Fix implicit parameter cast.

        * GNUmakefile: Renamed from Makefile; Add missing
        cancel1 and cancel2 test targets.

        * Makefile: Converted for use with MS nmake.
---
 Makefile | 121 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 62 insertions(+), 59 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 1264af9..3ecd026 100644
--- a/Makefile
+++ b/Makefile
@@ -1,64 +1,67 @@
-
-# This makefile is compatible with MS nmake and can be used as a
-# replacement for buildlib.bat. I've changed the target from an ordinary dll
-# (/LD) to a debugging dll (/LDd).
-# 
-# The variables $DLLDEST and $LIBDEST hold the destination directories for the
-# dll and the lib, respectively. Probably all that needs to change is $DEVROOT.
-
-DEVROOT=e:
-
-DLLDEST=$(DEVROOT)\dll
-LIBDEST=$(DEVROOT)\lib
-
-#CLIB	= /MD
+
+# This makefile is compatible with MS nmake and can be used as a
+# replacement for buildlib.bat. I've changed the target from an ordinary dll
+# (/LD) to a debugging dll (/LDd).
+# 
+# The variables $DLLDEST and $LIBDEST hold the destination directories for the
+# dll and the lib, respectively. Probably all that needs to change is $DEVROOT.
+
+DEVROOT=c:\pthreads\dll
+
+DLLDEST=$(DEVROOT)
+LIBDEST=$(DEVROOT)
+
+#CLIB	= /MD
 CLIB	= /MT
-CFLAGS	= #/EHsc /TP
-
-OBJ=attr.obj \
-	cancel.obj \
-	cleanup.obj \
-	condvar.obj \
-	create.obj \
-	dll.obj \
-	errno.obj \
-	exit.obj \
-	fork.obj \
-	global.obj \
-	misc.obj \
-	mutex.obj \
-	private.obj \
-	rwlock.obj \
-	sched.obj \
-	semaphore.obj \
-	signal.obj \
-	sync.obj \
-	tsd.obj
-
-all: pthread.dll
-
-clean:
-	del pthread.dll \
-		pthread.lib \
-		*.obj
-
-
-install: all
-	copy pthread.dll $(DLLDEST)
-	copy pthread.lib $(LIBDEST)
-
-pthread.dll: $(OBJ) pthread.def
+CCFLAGS	= #/EHsc /TP /D_cplusplus
+
+OBJ=attr.obj \
+	cancel.obj \
+	cleanup.obj \
+	condvar.obj \
+	create.obj \
+	dll.obj \
+	errno.obj \
+	exit.obj \
+	fork.obj \
+	global.obj \
+	misc.obj \
+	mutex.obj \
+	private.obj \
+	rwlock.obj \
+	sched.obj \
+	semaphore.obj \
+	signal.obj \
+	sync.obj \
+	tsd.obj
+
+all: pthread.dll
+
+clean:
+	del pthread.dll
+	del pthread.lib
+	del *.obj
+	del *.ilk
+	del *.pdb
+	del *.o
+
+
+install: all
+	copy pthread.dll $(DLLDEST)
+	copy pthread.lib $(LIBDEST)
+
+pthread.dll: $(OBJ) pthread.def
 	cl /LD /Zi $(CFLAGS) $(OBJ) /Fepthread.dll /link \
 	    /nodefaultlib:libcmt \
 		/implib:pthread.lib \
 		msvcrt.lib \
-		/def:pthread.def
-
-.c.obj::
-	cl /W3 $(CLIB) $(CFLAGS) /nologo /Yd /Zi /I. \
-		/D_WIN32_WINNT=0x400 \
-		/DSTDCALL=_stdcall \
-		-c $<
-
-$(OBJ):
-
+		/def:pthread.def
+
+.c.obj::
+	cl /W3 $(CLIB) $(CFLAGS) /nologo /Yd /Zi /I. \
+		/D_WIN32_WINNT=0x400 \
+		/DSTDCALL=_stdcall \
+		-c $<
+
+$(OBJ):
+
-- 
cgit v1.2.3