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_db | |
| 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_db')
| -rw-r--r-- | libpthread/linuxthreads_db/Makefile.in | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index c80e32c53..7833e1bad 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -22,8 +22,12 @@ libthread_db_SRC := $(wildcard $(libthread_db_DIR)/*.c) libthread_db_OBJ := $(patsubst $(libthread_db_DIR)/%.c,$(libthread_db_OUT)/%.o,$(libthread_db_SRC)) -libthread_db-a-y := $(libthread_db_OBJ) libthread_db-so-y := $(libthread_db_OBJ:.o=.os) +ifeq ($(DOPIC),y) +libthread_db-a-y := $(libthread_db-so-y) +else +libthread_db-a-y := $(libthread_db_OBJ) +endif libthread_db-multi-y := $(libthread_db_SRC) @@ -33,7 +37,11 @@ objclean-y += libthread_db_clean headers-$(PTHREADS_DEBUG_SUPPORT) += linuxthreads_db_headers headers_clean-y += linuxthreads_db_headers_clean -$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a libc-y +ifeq ($(DOPIC),y) +$(top_builddir)lib/libthread_db.so: $(top_builddir)lib/libthread_db.a $(libc) +else +$(top_builddir)lib/libthread_db.so: $(libthread_db_OUT)/libthread_db_so.a $(libc) +endif $(call link.so,$(libthread_db_FULL_NAME),1) $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y) @@ -41,16 +49,10 @@ $(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y) $(do_strip) $(do_ar) -ifeq ($(DOPIC),y) -$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y:.o=.os) -else -$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) $(libthread_db_OUT)/libthread_db_so.a -endif +$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y) $(Q)$(INSTALL) -d $(dir $@) $(Q)$(RM) $@ -ifneq ($(DOPIC),y) $(do_strip) -endif $(do_ar) linuxthreads_db_headers: |