buildsys: fix IS_IN_lib*

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

diff --git a/libpthread/nptl_db/Makefile.in b/libpthread/nptl_db/Makefile.in
index 3eaded5..76102e6 100644 (file)
--- a/libpthread/nptl_db/Makefile.in
+++ b/libpthread/nptl_db/Makefile.in
@@ -5,15 +5,16 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-subdirs += libpthread/nptl/nptl_db
+subdirs += libpthread/nptl_db
 
 # Get the thread include dependencies and shared object name
-CFLAGS-nptl_db := -DLIBPTHREAD_SO="\"libpthread.so.$(MAJOR_VERSION)\""
-CFLAGS-nptl_db += -I$(top_srcdir)libpthread/nptl -D_GNU_SOURCE
-CFLAGS-nptl_db += -DIS_IN_libthread_db=1 -std=gnu99 -I$(top_srcdir)ldso/include
-
-LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) -s --warn-unresolved-symbols
+CFLAGS-libpthread/nptl_db := -DNOT_IN_libc \
+       -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\"" \
+       -std=gnu99 -D_GNU_SOURCE \
+       -I$(top_srcdir)libpthread/nptl \
+       -I$(top_srcdir)ldso/include
 
+LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols)
 LIBS-libthread_db.so := $(LIBS)
 
 libthread_db_FULL_NAME := libthread_db-$(VERSION).so
@@ -23,6 +24,9 @@ libthread_db_OUT := $(top_builddir)libpthread/nptl_db
 
 libthread_db_SRC := $(wildcard $(libthread_db_DIR)/td_*.c)     \
                    $(libthread_db_DIR)/fetch-value.c
+ifeq ($(UCLIBC_SUSV4_LEGACY),)
+libthread_db_SRC := $(filter-out td_ta_setconcurrency.c,$(libthread_db_SRC))
+endif
 
 libthread_db_OBJ := $(patsubst $(libthread_db_DIR)/%.c,$(libthread_db_OUT)/%.o,$(libthread_db_SRC))
 
@@ -37,14 +41,14 @@ libthread_db-multi-y := $(libthread_db_SRC)
 
 lib-a-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.a
 lib-so-$(PTHREADS_DEBUG_SUPPORT) += $(top_builddir)lib/libthread_db.so
-objclean-y += libthread_db_clean
+objclean-y += CLEAN_libpthread/nptl_db
 headers-$(PTHREADS_DEBUG_SUPPORT) += $(nptl_db_headers)
-headers_clean-y += nptl_db_headers_clean
+headers_clean-y += HEADERCLEAN_libpthread/nptl_db
 
 ifeq ($(DOPIC),y)
-$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc)
+$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc.depend)
 else
-$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc)
+$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc.depend)
 endif
        $(call link.so,$(libthread_db_FULL_NAME),1)
 
@@ -53,8 +57,7 @@ $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
        $(do_strip)
        $(do_ar)
 
-$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
-       $(Q)$(INSTALL) -d $(dir $@)
+$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) | $(top_builddir)lib
        $(Q)$(RM) $@
        $(do_strip)
        $(do_ar)
@@ -64,8 +67,8 @@ $(top_builddir)include/thread_db.h:
 
 nptl_db_headers:= $(top_builddir)include/thread_db.h
 
-nptl_db_headers_clean:
+HEADERCLEAN_libpthread/nptl_db:
        $(do_rm) $(nptl_db_headers)
 
-libthread_db_clean:
+CLEAN_libpthread/nptl_db:
        $(do_rm) $(addprefix $(libthread_db_OUT)/*., o oS a)