From b47991f6985f37396bdea6611f464ea7701b012a Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Thu, 18 Feb 1999 01:12:37 +0000
Subject: Sat Feb 18 16:2s1703:30 1999  Ross Johnson 
 <rpj@ixobrychus.canberra.edu.au>         * Makefile.in: Use libpthread32.a as
 the name of the DLL export         library instead of pthread.lib.         *
 condvar.c (pthread_cond_init): cv could have been used unitialised;        
 initialise.         * create.c (pthread_create): parms could have been used
 unitialised;         initialise. Add "Makefile" for people who don't want to
 (or can't) run ./configure.

---
 Makefile.in | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

(limited to 'Makefile.in')

diff --git a/Makefile.in b/Makefile.in
index 91a1580..4ee92b0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,14 +2,18 @@ RM	= erase
 
 CC	= g++
 
-# Mingw32
-CFLAGS	= -g -I. -DHAVE_CONFIG_H -Wall
-
-# Cygwin G++
-#CFLAGS	= -fhandle-exceptions -I. -DHAVE_CONFIG_H -Wall
+AR	= ar
 
 LD	= gcc -mdll -e _DllMain@12
 
+OPT	= -g -O2
+
+## Mingw32
+CFLAGS	= $(OPT) -I. -DHAVE_CONFIG_H -Wall
+
+## Cygwin G++
+#CFLAGS	= $(OPT) -fhandle-exceptions -I. -DHAVE_CONFIG_H -Wall
+
 OBJS	= attr.o cancel.o cleanup.o condvar.o create.o dll.o \
 	  exit.o fork.o global.o misc.o mutex.o private.o sched.o \
 	  semaphore.o signal.o sync.o tsd.o
@@ -21,20 +25,19 @@ DLL     = pthread.dll
 LIB	= libpthread32.a
 
 
-all:	$(DLL)
+all:	$(LIB)
 
-$(LIB):	$(OBJS)
-	$(AR) r $@ $^
+$(LIB): $(DLL)
+	dlltool --def $(DLL:.dll=.def) --output-lib $@ --dllname $(DLL)
 
 .SUFFIXES: .dll
 
-$(DLL): $(OBJS) 
+$(DLL): $(OBJS)
 	$(LD) -o $@ $^ -Wl,--base-file,$*.base
 	dlltool --base-file=$*.base --def $*.def --output-exp $*.exp --dllname $@
 	$(LD) -o $@ $^ -Wl,--base-file,$*.base,$*.exp
 	dlltool --base-file=$*.base --def $*.def --output-exp $*.exp --dllname $@
 	$(LD) -o $@ $^ -Wl,$*.exp
-	dlltool --def $*.def --output-lib $*.lib --dllname $@
 
 clean:
 	-$(RM) *~
@@ -44,4 +47,3 @@ clean:
 	-$(RM) $(DLL) 
 	-$(RM) $(DLL:.dll=.base)
 	-$(RM) $(DLL:.dll=.exp)
-	-$(RM) $(DLL:.dll=.lib)
-- 
cgit v1.2.3