summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-12-29 07:15:39 +0000
committerMike Frysinger <vapier@gentoo.org>2005-12-29 07:15:39 +0000
commit68993a598d73d24f6e827e7c2fce6c517122351e (patch)
treeae3cbea96aa3f58f3c338716e78bbbad38c98e99
parentf04a88d3f0eaa9b9f12d8e173b42c260379b04f2 (diff)
touchup code a bit to prep for new weak system
-rw-r--r--libpthread/linuxthreads.old/Makefile.in17
1 files changed, 9 insertions, 8 deletions
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 79e47515c..585f8b50d 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -33,14 +33,17 @@ libpthread_OUT := $(top_builddir)libpthread/linuxthreads.old
-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 @@ ifneq ($(strip $(libpthread_ARCH_SRC)),)
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 @@ objclean-y += libpthread_clean
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)