Remove ar-target and shared targets, at build time now we traverse the tree only...

[uclinux-h8/uclibc-ng.git] / libpthread / Makefile

diff --git a/libpthread/Makefile b/libpthread/Makefile
index 9ae128e..60ad756 100644 (file)
--- a/libpthread/Makefile
+++ b/libpthread/Makefile
@@ -19,109 +19,33 @@
 TOPDIR=../
 include $(TOPDIR)Rules.mak
 
-CFLAGS+=$(SSP_ALL_CFLAGS)
-
-#Adjust the soname version to avoid namespace collisions with glibc's libpthread
-LIBPTHREAD=libpthread.a
-LIBPTHREAD_SHARED=libpthread.so
-LIBPTHREAD_SHARED_FULLNAME=libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
-
-LIBTHREAD_DB=libthread_db.a
-LIBTHREAD_DB_SHARED=libthread_db.so
-LIBTHREAD_DB_SHARED_FULLNAME=libthread_db-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+ALL_SUBDIRS = linuxthreads linuxthreads_db
 
-DIRS=
-ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
-       DIRS+=nptl
-else
-       DIRS+=linuxthreads
-endif
-       LDFLAGS_THREAD:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc -z defs
-ifeq ($(UCLIBC_BUILD_RELRO),y)
-       LDFLAGS_THREAD+=-z relro
-endif
-ifeq ($(UCLIBC_BUILD_NOW),y)
-       LDFLAGS_THREAD+=-z now
-endif
+DIRS=linuxthreads
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-ifeq ($(strip $(PTHREADS_NATIVE)),y)
-       DIRS+=nptl_db
-else
        DIRS+=linuxthreads_db
 endif
-       LDFLAGS_THREAD_DB:= $(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
-endif
-ifeq ($(DODEBUG),n)
-       LDFLAGS_THREAD_DB+=-s
-ifeq ($(UCLIBC_BUILD_RELRO),y)
-       LDFLAGS_THREAD_DB+=-z relro
-endif
-ifeq ($(UCLIBC_BUILD_NOW),y)
-       LDFLAGS_THREAD_DB+=-z now
-endif
-endif
-endif
 
-ifeq ($(strip $(UCLIBC_CTOR_DTOR)),y)
-       SHARED_START_FILES = $(TOPDIR)lib/crti.o $(LIBGCC_DIR)crtbeginS.o
-       SHARED_END_FILES = $(LIBGCC_DIR)crtendS.o $(TOPDIR)lib/crtn.o
-endif
-
-ALL_SUBDIRS = linuxthreads linuxthreads_db
-
-all: $(LIBPTHREAD) $(LIBTHREAD_DB)
+all: subdirs
 
-$(LIBPTHREAD): subdirs
-ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
-       $(INSTALL) -d $(TOPDIR)lib
-       $(RM) $(TOPDIR)lib/$(LIBPTHREAD)
-       $(INSTALL) -m 644 $(LIBPTHREAD) $(TOPDIR)lib
-endif
-
-$(LIBTHREAD_DB): subdirs
+headers:
+ifeq ($(strip $(UCLIBC_HAS_THREADS_NATIVE)),y)
+       $(LN) -sf $(TOPDIR)libpthread/nptl/sysdeps/pthread/pthread.h $(TOPDIR)include/
+       $(LN) -sf $(TOPDIR)libpthread/nptl/semaphore.h $(TOPDIR)include/
+       $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/semaphore.h $(TOPDIR)include/bits/
+       $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/unix/sysv/linux/$(TARGET_ARCH)/bits/pthreadtypes.h $(TOPDIR)include/bits/
+       $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/pthread/bits/libc-lock.h $(TOPDIR)include/bits/
+       $(LN) -sf ../$(TOPDIR)libpthread/nptl/sysdeps/pthread/bits/stdio-lock.h $(TOPDIR)include/bits/
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-       $(INSTALL) -d $(TOPDIR)lib
-       $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB)
-       $(INSTALL) -m 644 $(LIBTHREAD_DB) $(TOPDIR)lib
-endif
-
-
-$(OBJS): %.o : %.c
-       $(CC) $(CFLAGS) -c $< -o $@
-       $(STRIPTOOL) -x -R .note -R .comment $*.o
-
-$(OBJ): Makefile
-
-shared: all
-ifeq ($(strip $(UCLIBC_HAS_THREADS)),y)
-       $(LD) $(LDFLAGS_THREAD) -soname=$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) \
-               -o $(LIBPTHREAD_SHARED_FULLNAME) $(SHARED_START_FILES) --whole-archive $(LIBPTHREAD) \
-               --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-               -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) \
-               $(SHARED_END_FILES)
-       $(INSTALL) -d $(TOPDIR)lib
-       $(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \
-               $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION)
-       $(INSTALL) -m 644 $(LIBPTHREAD_SHARED_FULLNAME) $(TOPDIR)lib
-       $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-               $(TOPDIR)lib/$(LIBPTHREAD_SHARED)
-       $(LN) -sf $(LIBPTHREAD_SHARED_FULLNAME) \
-               $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION)
+       $(LN) -sf $(TOPDIR)libpthread/nptl_db/thread_db.h $(TOPDIR)include/
 endif
+else
+       $(LN) -sf $(TOPDIR)libpthread/linuxthreads/sysdeps/pthread/pthread.h $(TOPDIR)include/
+       $(LN) -sf $(TOPDIR)libpthread/linuxthreads/semaphore.h $(TOPDIR)include/
+       $(LN) -sf ../$(TOPDIR)libpthread/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h $(TOPDIR)include/bits/
 ifeq ($(strip $(PTHREADS_DEBUG_SUPPORT)),y)
-       $(LD) $(LDFLAGS_THREAD_DB) -soname=$(LIBTHREAD_DB_SHARED).1 \
-               -o $(LIBTHREAD_DB_SHARED_FULLNAME) --whole-archive $(LIBTHREAD_DB) \
-               --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \
-               -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC)
-       $(INSTALL) -d $(TOPDIR)lib
-       $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \
-               $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1
-       $(INSTALL) -m 644 $(LIBTHREAD_DB_SHARED_FULLNAME) $(TOPDIR)lib
-       $(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
-               $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED)
-       $(LN) -sf $(LIBTHREAD_DB_SHARED_FULLNAME) \
-               $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).1
+       $(LN) -sf $(TOPDIR)libpthread/linuxthreads_db/thread_db.h $(TOPDIR)include/
+endif
 endif
 
 tags:
@@ -137,7 +61,9 @@ $(patsubst %, _dirclean_%, $(ALL_SUBDIRS)) : dummy
        $(MAKE) -C $(patsubst _dirclean_%, %, $@) clean
 
 clean: subdirs_clean
-       $(RM) *.[oa] *~ core $(LIBPTHREAD) $(LIBPTHREAD_SHARED_FULLNAME) \
-               $(LIBTHREAD_DB) $(LIBTHREAD_DB_SHARED_FULLNAME)
+       $(RM)   $(TOPDIR)include/pthread.h $(TOPDIR)include/semaphore.h \
+               $(TOPDIR)include/thread_db.h \
+               $(TOPDIR)include/bits/pthreadtypes.h $(TOPDIR)include/bits/semaphore.h \
+               $(TOPDIR)include/bits/libc-lock.h $(TOPDIR)include/bits/stdio-lock
 
 .PHONY: dummy