diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-01 03:08:57 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-01 03:08:57 +0000 |
| commit | 4d17e7e7c5dec2d055cf96b9c4a5fa457fdef772 (patch) | |
| tree | 4e10e6338d55fe67bfcbc5a971a1dab14481f94f /libpthread/linuxthreads.old | |
| parent | 0600b878cde4e363436e51833393463e715e2f04 (diff) | |
| download | uClibc-alpine-4d17e7e7c5dec2d055cf96b9c4a5fa457fdef772.tar.bz2 uClibc-alpine-4d17e7e7c5dec2d055cf96b9c4a5fa457fdef772.tar.xz | |
Mini-merge from trunk. Not as fun as a Mini Cooper, but oh well.
Diffstat (limited to 'libpthread/linuxthreads.old')
| -rw-r--r-- | libpthread/linuxthreads.old/Makefile.in | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index 98ef6307b..79e47515c 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -50,7 +50,11 @@ endif libpthread_OBJ := $(patsubst $(libpthread_DIR)/%.c,$(libpthread_OUT)/%.o,$(libpthread_SRC)) -libpthread-a-y += $(libpthread_OBJ) +ifeq ($(DOPIC),y) +libpthread-a-y += $(libpthread_OBJ:.o=.os) +else +libpthread-a-y += $(libpthread_OBJ) +endif libpthread-so-y += $(libpthread_OBJ:.o=.os) libpthread-multi-y += $(libpthread_SRC) @@ -62,7 +66,11 @@ 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-y +ifeq ($(DOPIC),y) +$(top_builddir)lib/libpthread.so: $(top_builddir)lib/libpthread.a $(libc) +else +$(top_builddir)lib/libpthread.so: $(libpthread_OUT)/libpthread_so.a $(libc) +endif $(call link.so,$(libpthread_FULL_NAME),$(MAJOR_VERSION)) $(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y) @@ -74,14 +82,14 @@ else endif $(do_ar) -ifeq ($(DOPIC),y) -$(top_builddir)lib/libpthread.a: $(libpthread-a-y:.o=.os) -else $(top_builddir)lib/libpthread.a: $(libpthread-a-y) -endif $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ +ifeq ($(PTHREADS_DEBUG_SUPPORT),y) + $(do_strip:-x=-X --strip-debug) +else $(do_strip) +endif $(do_ar) linuxthreads_headers: @@ -90,9 +98,8 @@ 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: |