diff options
| -rw-r--r-- | libpthread/linuxthreads.old/Makefile.in | 28 |
1 files changed, 18 insertions, 10 deletions
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index c067bca41..7db2d8b88 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -1,7 +1,7 @@ # Makefile for uClibc # # Copyright (C) 2003 Paul Mundt <lethal@linux-sh.org> -# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org> +# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org> # # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball. # @@ -40,12 +40,9 @@ libpthread_SRC := \ 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 $(libpthread_NO_MULTI),$(libpthread_SRC)) -endif libpthread_SPEC_SRC := pthread.c +libpthread_SPEC_SRC := $(patsubst %.c,$(libpthread_DIR)/%.c,$(libpthread_SPEC_SRC)) # remove generic sources, if arch specific version is present ifneq ($(strip $(libpthread_ARCH_SRC)),) @@ -66,8 +63,8 @@ libpthread_libc_OBJ := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_ libc-static-y += $(libpthread_OUT)/libc_pthread_init.o libc-shared-y += $(libpthread_libc_OBJ:.o=.oS) -libpthread-static-y += $(patsubst %.c,$(libpthread_OUT)/%.o,$(libpthread_SPEC_SRC)) -libpthread-shared-y += $(patsubst %.c,$(libpthread_OUT)/%.oS,$(libpthread_SPEC_SRC)) +libpthread-static-y += $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpthread_SPEC_SRC)) +libpthread-shared-y += $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.oS,$(libpthread_SPEC_SRC)) ifeq ($(DOPIC),y) libpthread-a-y += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os) @@ -76,17 +73,19 @@ libpthread-a-y += $(libpthread_OBJ) $(libpthread-static-y) endif libpthread-so-y += $(libpthread_OBJ:.o=.os) $(libpthread-shared-y) -libpthread-multi-y += $(libpthread_SRC) -libpthread-nomulti-y += $(patsubst %.c,$(libpthread_OUT)/%.o,$(libpthread_NO_MULTI)) - lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so objclean-y += libpthread_clean headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers headers_clean-y += linuxthreads_headers_clean +ifeq ($(DOMULTI),n) $(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) +else +$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS $(libc) + $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) +endif $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y) $(Q)$(RM) $@ @@ -97,6 +96,15 @@ else endif $(do_ar) +$(libpthread_OUT)/libpthread.oS: $(libpthread_SRC) $(libpthread_SPEC_SRC) + $(Q)$(RM) $@ + $(compile-m) +ifeq ($(PTHREADS_DEBUG_SUPPORT),y) + $(do_t_strip:-x=-X --strip-debug) +else + $(do_t_strip) +endif + $(top_builddir)lib/libpthread.a: $(libpthread-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ |