- Improve prerequisites and avoid spurious reconfigurations.

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

diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 1a2336c..2608599 100644 (file)
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -6,17 +6,13 @@
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CFLAGS-linuxthreads.old := -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS)
+CFLAGS-dir_linuxthreads.old := -DNOT_IN_libc -DIS_IN_libpthread
+CFLAGS-linuxthreads.old := $(CFLAGS-dir_linuxthreads.old) $(SSP_ALL_CFLAGS)
 
 CFLAGS-libpthread/linuxthreads.old/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads.old)
 
-# This stuff will not compile without at least -O1
-# psm: can't handle this here, could maybe search for -O0 in CFLAGS
-# and append -O1 if found
-#CFLAGS:=$(CFLAGS:-O0=-O1)
-
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -z defs
+LDFLAGS-libpthread.so := $(LDFLAGS_NOSTRIP) -Wl,-z,defs
 else
 LDFLAGS-libpthread.so := $(LDFLAGS)
 endif
@@ -26,7 +22,7 @@ LIBS-libpthread.so := $(LIBS) $(ldso)
 START_FILE-libpthread.so := $(SHARED_START_FILES)
 END_FILE-libpthread.so := $(SHARED_END_FILES)
 
-libpthread_FULL_NAME := libpthread-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so
+libpthread_FULL_NAME := libpthread-$(VERSION).so
 
 libpthread_DIR := $(top_srcdir)libpthread/linuxthreads.old
 libpthread_OUT := $(top_builddir)libpthread/linuxthreads.old
@@ -56,8 +52,8 @@ libpthread_OBJ := $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpt
 #
 # Stuff that goes into libc.so, not libpthread.so
 #
-CFLAGS-forward.c := -DIS_IN_libc
-CFLAGS-libc_pthread_init.c := -DIS_IN_libc
+CFLAGS-OMIT-forward.c := $(CFLAGS-dir_linuxthreads.old)
+CFLAGS-OMIT-libc_pthread_init.c := $(CFLAGS-dir_linuxthreads.old)
 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
@@ -80,49 +76,50 @@ 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)
+$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc.depend)
        $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
 #else
-#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc)
+#$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread.oS | $(libc.depend)
 #      $(call linkm.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION))
 #endif
 
-$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
-       $(Q)$(RM) $@
 ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-       $(do_strip:-x=-X --strip-debug)
-else
-       $(do_strip)
+$(libpthread_OUT)/libpthread_so.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
 endif
+$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
+       $(Q)$(RM) $@
        $(do_ar)
+       $(do_t_strip)
 
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+endif
 $(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
 
+ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
+$(top_builddir)lib/libpthread.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
+endif
 $(top_builddir)lib/libpthread.a: $(libpthread-a-y)
        $(Q)$(INSTALL) -d $(dir $@)
        $(Q)$(RM) $@
-ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
-       $(do_strip:-x=-X --strip-debug)
-else
-       $(do_strip)
-endif
        $(do_ar)
+       $(do_t_strip)
 
-linuxthreads_headers:
-       $(LN) -sf ../$(PTDIR)/sysdeps/pthread/pthread.h $(top_builddir)include/
-       $(LN) -sf ../$(PTDIR)/semaphore.h $(top_builddir)include/
-       $(INSTALL) -d $(top_builddir)include/bits
-       $(LN) -sf ../../$(PTDIR)/sysdeps/pthread/bits/pthreadtypes.h $(top_builddir)include/bits/
+include/pthread.h:
+       $(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
+include/semaphore.h:
+       $(do_ln) ../$(PTDIR)/$(@F) $(top_builddir)$@
+include/bits/pthreadtypes.h: | include/bits
+       $(do_ln) ../../$(PTDIR)/sysdeps/pthread/bits/$(@F) $(top_builddir)$@
+linuxthreads_headers: include/pthread.h include/semaphore.h \
+                       include/bits/pthreadtypes.h
 
 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: