svn commit: trunk/uClibc/libpthread/linuxthreads.old

[vapier at uclibc.org]

Author: vapier
Date: 2005-12-28 23:15:39 -0800 (Wed, 28 Dec 2005)
New Revision: 13008

Log:
touchup code a bit to prep for new weak system

Modified:
   trunk/uClibc/libpthread/linuxthreads.old/Makefile.in


Changeset:
Modified: trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old/Makefile.in	2005-12-29 07:07:29 UTC (rev 13007)
+++ trunk/uClibc/libpthread/linuxthreads.old/Makefile.in	2005-12-29 07:15:39 UTC (rev 13008)
@@ -33,14 +33,17 @@
 
 -include $(libpthread_DIR)/sysdeps/$(TARGET_ARCH)/Makefile.arch
 
-libpthread_SRC := $(wildcard $(libpthread_DIR)/*.c)
-ifneq ($(UCLIBC_HAS_XLOCALE),y)
-libpthread_SRC := $(filter-out $(libpthread_DIR)/locale.c,$(libpthread_SRC))
+libpthread_SRC := \
+	attr.c cancel.c condvar.c errno.c events.c join.c lockfile.c manager.c \
+	mutex.c oldsemaphore.c pt-machine.c ptfork.c pthread.c ptlongjmp.c \
+	rwlock.c semaphore.c signals.c specific.c spinlock.c wrapsyscall.c
+ifeq ($(UCLIBC_HAS_XLOCALE),y)
+libpthread_SRC += locale.c
 endif
 
 ifneq ($(DOMULTI),n)
 libpthread_NO_MULTI := manager.c pt-machine.c
-libpthread_SRC := $(filter-out $(patsubst %.c,$(libpthread_DIR)/%.c,$(libpthread_NO_MULTI)),$(libpthread_SRC))
+libpthread_SRC := $(filter-out $(libpthread_NO_MULTI),$(libpthread_SRC))
 endif
 
 # remove generic sources, if arch specific version is present
@@ -48,6 +51,8 @@
 libpthread_SRC := $(filter-out $(patsubst %.c,$(libpthread_DIR)/%.c,$(notdir $(libpthread_ARCH_SRC))),$(libpthread_SRC))
 endif
 
+libpthread_SRC := $(patsubst %,$(libpthread_DIR)/%,$(libpthread_SRC))
+
 libpthread_OBJ := $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpthread_SRC))
 
 ifeq ($(DOPIC),y)
@@ -66,11 +71,7 @@
 headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
 headers_clean-y += linuxthreads_headers_clean
 
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread.a $(libc)
-else
 $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc)
-endif
 	$(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
 
 $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)