DOMULTI may be used for libc, the excluded files need work, linuxthreads[_db] as...

[uclinux-h8/uClibc.git] / libpthread / linuxthreads.old / Makefile.in

diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 7c0bdae..1a2336c 100644 (file)
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -1,12 +1,12 @@
 # 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.
 #
 
-CFLAGS-linuxthreads.old := -DNOT_IN_libc $(SSP_ALL_CFLAGS)
+CFLAGS-linuxthreads.old := -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS)
 
 CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old)
 
@@ -21,7 +21,7 @@ else
 LDFLAGS-libpthread.so := $(LDFLAGS)
 endif
 
-LIBS-libpthread.so := $(LIBS)
+LIBS-libpthread.so := $(LIBS) $(ldso)
 
 START_FILE-libpthread.so := $(SHARED_START_FILES)
 END_FILE-libpthread.so := $(SHARED_END_FILES)
@@ -33,28 +33,45 @@ 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 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))
-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)),)
 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))
 
-libpthread-a-y += $(libpthread_OBJ)
-libpthread-so-y += $(libpthread_OBJ:.o=.os)
+#
+# Stuff that goes into libc.so, not libpthread.so
+#
+CFLAGS-forward.c := -DIS_IN_libc
+CFLAGS-libc_pthread_init.c := -DIS_IN_libc
+libpthread_libc_CSRC := forward.c libc_pthread_init.c
+libpthread_libc_OBJ  := $(patsubst %.c, $(libpthread_OUT)/%.o,$(libpthread_libc_CSRC))
+libc-static-y += $(libpthread_OUT)/libc_pthread_init.o
+libc-shared-y += $(libpthread_libc_OBJ:.o=.oS)
+
+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))
 
-libpthread-multi-y += $(libpthread_SRC)
-libpthread-nomulti-y += $(patsubst %.c,$(libpthread_OUT)/%.o,$(libpthread_NO_MULTI))
+ifeq ($(DOPIC),y)
+libpthread-a-y  += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os)
+else
+libpthread-a-y  += $(libpthread_OBJ) $(libpthread-static-y)
+endif
+libpthread-so-y += $(libpthread_OBJ:.o=.os) $(libpthread-shared-y)
 
 lib-a-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.a
 lib-so-$(UCLIBC_HAS_THREADS) += $(top_builddir)lib/libpthread.so
@@ -62,8 +79,13 @@ objclean-y += libpthread_clean
 headers-$(UCLIBC_HAS_THREADS) += linuxthreads_headers
 headers_clean-y += linuxthreads_headers_clean
 
-$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc-so-dep)
+#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) $@
@@ -74,14 +96,21 @@ else
 endif
        $(do_ar)
 
-ifeq ($(DOPIC),y)
-$(top_builddir)lib/libpthread.a: $(libpthread-a-y:.o=.os)
+$(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
-$(top_builddir)lib/libpthread.a: $(libpthread-a-y) $(libpthread_OUT)/libpthread_so.a
+       $(do_t_strip)
 endif
+
+$(top_builddir)lib/libpthread.a: $(libpthread-a-y)
        $(Q)$(INSTALL) -d $(dir $@)
        $(Q)$(RM) $@
-ifneq ($(DOPIC),y)
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+       $(do_strip:-x=-X --strip-debug)
+else
        $(do_strip)
 endif
        $(do_ar)
@@ -92,10 +121,9 @@ linuxthreads_headers:
        $(INSTALL) -d $(top_builddir)include/bits
        $(LN) -sf ../../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(top_builddir)include/bits/
 
-
 linuxthreads_headers_clean:
-       $(RM)   $(top_builddir)include/pthread.h $(top_builddir)include/semaphore.h \
+       $(RM) $(top_builddir)include/pthread.h $(top_builddir)include/semaphore.h \
                $(top_builddir)include/bits/pthreadtypes.h
 
 libpthread_clean:
-       $(RM) $(libpthread_OUT)/*.{o,os,a}
+       $(RM) $(libpthread_OUT)/*.{o,os,oS,a}