diff options
| author | Peter S. Mazinger <ps.m@gmx.net> | 2006-01-31 14:41:37 +0000 |
|---|---|---|
| committer | Peter S. Mazinger <ps.m@gmx.net> | 2006-01-31 14:41:37 +0000 |
| commit | 8c2b377d28710215838741cd9778c8e7229ebf26 (patch) | |
| tree | d24bddc26b796f7665f10720a0c5242f0f968541 /libpthread/linuxthreads/Makefile.in | |
| parent | da6cf3047ecad6e3f2483932134640a77a2c3556 (diff) | |
s/IS_IN_linuxthreads/IS_IN_libpthread/, some prototypes, correct Makefile.in, disable __res_state, unavailable in resolv.h
Diffstat (limited to 'libpthread/linuxthreads/Makefile.in')
| -rw-r--r-- | libpthread/linuxthreads/Makefile.in | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 94926a3af..7aa891517 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -1,13 +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 := -DNOT_IN_libc $(SSP_ALL_CFLAGS) -CFLAGS-linuxthreads += -DIS_IN_linuxthreads=1 -D_GNU_SOURCE +CFLAGS-linuxthreads := -DNOT_IN_libc -DIS_IN_libpthread $(SSP_ALL_CFLAGS) CFLAGS-libpthread/linuxthreads/sysdeps/$(TARGET_ARCH)/ := $(CFLAGS-linuxthreads) CFLAGS-libpthread/linuxthreads/sysdeps/unix/sysv/linux/ := $(CFLAGS-linuxthreads) @@ -69,8 +68,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_OUT)/%.o,$(libpthread_static_SRC)) +libpthread-shared-y += $(patsubst %,$(libpthread_OUT)/%.oS,$(libpthread_shared_SRC)) ifeq ($(DOPIC),y) libpthread-a-y += $(libpthread_OBJ:.o=.os) $(libpthread-static-y:.o=.os) @@ -79,17 +78,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) $@ @@ -100,6 +101,15 @@ else endif $(do_ar) +$(libpthread_OUT)/libpthread.oS: $(libpthread_SRC) $(patsubst %,$(libpthread_DIR)/%.c,$(libpthread_shared_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) $@ @@ -121,4 +131,4 @@ linuxthreads_headers_clean: $(top_builddir)include/bits/pthreadtypes.h libpthread_clean: - $(RM) $(libpthread_OUT)/{,*/,*/*/,*/*/*/,*/*/*/*/}*.{o,os,a} + $(RM) $(libpthread_OUT)/{,*/,*/*/,*/*/*/,*/*/*/*/}*.{o,os,oS,a} |