Index: Makefile.in =================================================================== RCS file: /cvs/src/src/winsup/cygwin/Makefile.in,v retrieving revision 1.75 diff -u -b -B -p -r1.75 Makefile.in --- Makefile.in 2001/12/26 05:02:07 1.75 +++ Makefile.in 2001/12/29 18:54:24 @@ -100,6 +100,9 @@ DLL_ENTRY:=@DLL_ENTRY@ LIBGMON_A:=libgmon.a GMON_START:=gcrt0.o +LIBPTHREAD_A:=libpthread.a + + # Some things want these from libc, but they have their own static # data which apps can get to, which is a pain in the dll, so we # include them directly into the library. @@ -152,7 +155,7 @@ install_host=@install_host@ all: all_target $(all_host) -all_target: $(LIB_NAME) automode.o binmode.o textmode.o $(LIBGMON_A) +all_target: $(LIB_NAME) automode.o binmode.o textmode.o $(LIBGMON_A) $(LIBPTHREAD_A) all_host: new-$(LIB_NAME) cygrun.exe @@ -160,9 +163,9 @@ force: install: install-libs install-headers install-man $(install_host) $(install_target) -install-libs: $(LIB_NAME) +install-libs: $(LIB_NAME) $(LIBPTHREAD_A) $(INSTALL_DATA) new-$(DLL_NAME) $(bindir)/$(DLL_NAME); \ - for i in $(LIB_NAME) $(GMON_START) $(LIBGMON_A) automode.o binmode.o textmode.o ; do \ + for i in $(LIB_NAME) $(LIBPTHREAD_A) $(GMON_START) $(LIBGMON_A) automode.o binmode.o textmode.o; do \ $(INSTALL_DATA) $$i $(tooldir)/lib/$$i ; \ done @@ -202,7 +205,8 @@ maintainer-clean realclean: clean # Rule to build cygwin.dll -new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) Makefile winver_stamp +new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) winver_stamp +#new-$(DLL_NAME): $(LDSCRIPT) $(DLL_OFILES) $(DEF_FILE) $(DLL_IMPORTS) $(LIBC) $(LIBM) Makefile winver_stamp $(CXX) $(CXXFLAGS) -nostdlib -Wl,-T$(firstword $^) -Wl,--out-implib,cygdll.a -shared -o $@ \ -e $(DLL_ENTRY) $(DEF_FILE) $(DLL_OFILES) version.o winver.o \ $(DLL_IMPORTS) $(MALLOC_OBJ) $(LIBM) $(LIBC) \ @@ -213,6 +217,11 @@ $(LIB_NAME): rmsym newsym new-$(DLL_NAME /bin/sh ${word 1,$^} ./cygdll.a "$(NM)" "$(AR)" "$(RANLIB)" $(OBSOLETE_FUNCTIONS) || exit 0 /bin/sh ${word 2,$^} ./cygdll.a "$(AS)" "$(AR)" "$(RANLIB)" $(NEW_FUNCTIONS) || exit 0 (echo create $(LIB_NAME); echo addmod $(LIBCOS); echo addlib cygdll.a; echo save) | $(AR) -M + +# Rule to build lib_pthread.a +$(LIBPTHREAD_A): speclib new-$(DLL_NAME) + /bin/sh ${word 1,$^} cygdll.a pthread.o $@ "$(NM)" "$(AR)" "$(RANLIB)" || exit 0 + @echo create $(LIBPTHREAD_A) # Rule to make stub library used by testsuite # dependency set to $(LIB_NAME) to accommodate make -j2.