Copyright notice updates; module splitting; POSIX version

conditional compilation; refinements; bug fixes. See the ChangeLog.

1 files changed, 140 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index c31efca..7940235 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,3 @@
-

 # 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).

@@ -6,47 +5,150 @@
 # 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

+DEVROOT=c:\pthreads

 

-DLLDEST=$(DEVROOT)

-LIBDEST=$(DEVROOT)

+DLLDEST=$(DEVROOT)\DLL

+LIBDEST=$(DEVROOT)\DLL

 

 DLLS	= pthreadVCE.dll pthreadVSE.dll pthreadVC.dll

 

 OPTIM	= /O2

 

 # C++ Exceptions

-VCEFLAGS	= /GX /TP /DPtW32NoCatchWarn /D__CLEANUP_CXX

+VCEFLAGS	= /GX /TP /D__CLEANUP_CXX

 #Structured Exceptions

 VSEFLAGS	= /D__CLEANUP_SEH

 #C cleanup code

 VCFLAGS	= /D__CLEANUP_C

 

-#CFLAGS	= $(OPTIM) /W3 /MT /nologo /Yd /Zi /I. /D_WIN32_WINNT=0x400 /DPTW32_BUILD /DTEST_ICE

-CFLAGS	= $(OPTIM) /W3 /MT /nologo /Yd /Zi /I. /D_WIN32_WINNT=0x400 /DPTW32_BUILD

-

-OBJ=  attr.obj \

-	barrier.obj \

-	cancel.obj \

-	cleanup.obj \

-	condvar.obj \

-	create.obj \

-	dll.obj \

-	errno.obj \

-	exit.obj \

-	fork.obj \

-	global.obj \

-	misc.obj \

-	mutex.obj \

-	nonportable.obj \

-	private.obj \

-	rwlock.obj \

-	sched.obj \

-	semaphore.obj \

-	signal.obj \

-	spin.obj \

-	sync.obj \

-	tsd.obj

+#CFLAGS	= $(OPTIM) /W3 /MT /nologo /Yd /Zi /I. /D_WIN32_WINNT=0x400 /DHAVE_CONFIG_H /DTEST_ICE

+CFLAGS	= $(OPTIM) /W3 /MT /nologo /Yd /Zi /I. /D_WIN32_WINNT=0x400 /DHAVE_CONFIG_H

+

+# Agregate modules for inlinability

+DLL_OBJS	= \

+		attr.obj \

+		barrier.obj \

+		cancel.obj \

+		cleanup.obj \

+		condvar.obj \

+		create.obj \

+		dll.obj \

+		errno.obj \

+		exit.obj \

+		fork.obj \

+		global.obj \

+		misc.obj \

+		mutex.obj \

+		nonportable.obj \

+		private.obj \

+		rwlock.obj \

+		sched.obj \

+		semaphore.obj \

+		signal.obj \

+		spin.obj \

+		sync.obj \

+		tsd.obj

+

+# Separate modules for minimising the size of statically linked images

+SMALL_STATIC_OBJS	= \

+		attr_is_attr.obj \

+		attr_init.obj \

+		attr_destroy.obj \

+		attr_getdetachstate.obj \

+		attr_setdetachstate.obj \

+		attr_getstackaddr.obj \

+		attr_setstackaddr.obj \

+		attr_getstacksize.obj \

+		attr_setstacksize.obj \

+		attr_getscope.obj \

+		attr_setscope.obj \

+		barrier_init.obj \

+		barrier_destroy.obj \

+		barrier_wait.obj \

+		barrier_attr_init.obj \

+		barrier_attr_destroy.obj \

+		barrier_attr_setpshared.obj \

+		barrier_attr_getpshared.obj \

+		cancel_setcancelstate.obj \

+		cancel_setcanceltype.obj \

+		cancel_testcancel.obj \

+		cancel_cancel.obj \

+		cleanup.obj \

+		condvar.obj \

+		create.obj \

+		dll.obj \

+		errno.obj \

+		exit.obj \

+		fork.obj \

+		global.obj \

+		misc.obj \

+		mutex.obj \

+		nonportable.obj \

+		private.obj \

+		rwlock.obj \

+		sched.obj \

+		semaphore_init.obj \

+		semaphore_destroy.obj \

+		semaphore_trywait.obj \

+		semaphore_timedwait.obj \

+		semaphore_wait.obj \

+		semaphore_post.obj \

+		semaphore_postmultiple.obj \

+		semaphore_getvalue.obj \

+		semaphore_increase.obj \

+		semaphore_decrease.obj \

+		semaphore_open.obj \

+		semaphore_close.obj \

+		semaphore_unlink.obj \

+		signal.obj \

+		spin.obj \

+		sync.obj \

+		tsd.obj

+

+INCL	= config.h implement.h semaphore.h pthread.h need_errno.h

+

+ATTR_SRCS	= \

+		attr_is_attr.c \

+		attr_init.c \

+		attr_destroy.c \

+		attr_getdetachstate.c \

+		attr_setdetachstate.c \

+		attr_getstackaddr.c \

+		attr_setstackaddr.c \

+		attr_getstacksize.c \

+		attr_setstacksize.c \

+		attr_getscope.c \

+		attr_setscope.c

+

+BARRIER_SRCS = \

+		barrier_init.c \

+		barrier_destroy.c \

+		barrier_wait.c \

+		barrier_attr_init.c \

+		barrier_attr_destroy.c \

+		barrier_attr_setpshared.c \

+		barrier_attr_getpshared.c

+

+CANCEL_SRCS	= \

+		cancel_setcancelstate.c \

+		cancel_setcanceltype.c \

+		cancel_testcancel.c \

+		cancel_cancel.c 

+

+SEMAPHORE_SRCS = \

+		semaphore_init.c \

+		semaphore_destroy.c \

+		semaphore_trywait.c \

+		semaphore_timedwait.c \

+		semaphore_wait.c \

+		semaphore_post.c \

+		semaphore_postmultiple.c \

+		semaphore_getvalue.c \

+		semaphore_increase.c \

+		semaphore_decrease.c \

+		semaphore_open.c \

+		semaphore_close.c \

+		semaphore_unlink.c

 

 all:

 	@ echo Run one of the following command lines:

@@ -84,10 +186,16 @@ install: $(DLLS)
 	copy pthread*.dll $(DLLDEST)

 	copy pthread*.lib $(LIBDEST)

 

-$(DLLS): $(OBJ) pthread.def

-	cl /LD /Zi /nologo $(OBJ) \

+$(DLLS): $(DLL_OBJS) pthread.def

+	cl /LD /Zi /nologo $(DLL_OBJS) \

 		/link /nodefaultlib:libcmt /implib:$*.lib \

 		msvcrt.lib wsock32.lib /def:pthread.def /out:$@

 

 .c.obj:

 	cl $(EHFLAGS) $(CFLAGS) -c $<

+

+attr.obj:		attr.c $(ATTR_SRCS) $(INCL)

+barrier.obj:	barrier.c $(BARRIER_SRCS) $(INCL)

+cancel.obj:		cancel.c $(CANCEL_SRCS) $(INCL)

+semaphore.obj:	semaphore.c $(SEMAPHORE_SRCS) $(INCL)

+