diff options
author | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
---|---|---|
committer | Andreas Jaeger <aj@suse.de> | 2012-03-14 16:36:17 +0100 |
commit | 356a10ee3ee36bec0af7e8a1c61e353e0af45904 (patch) | |
tree | 421de93f9f53c04d796ccd31102baf135dc55ed8 /nptl_db | |
parent | a20026128cef2e95ffd15fb293dd6b1e9bf3ae1e (diff) | |
parent | e456826d7a539fb322bb9719297bd386eded8e32 (diff) | |
download | glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.gz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.tar.xz glibc-356a10ee3ee36bec0af7e8a1c61e353e0af45904.zip |
Merge branch 'master' into bug13658-branch
Diffstat (limited to 'nptl_db')
-rw-r--r-- | nptl_db/ChangeLog | 4 | ||||
-rw-r--r-- | nptl_db/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog index 81ebfcdfc3..fe1778ee95 100644 --- a/nptl_db/ChangeLog +++ b/nptl_db/ChangeLog @@ -1,3 +1,7 @@ +2012-03-07 Ulrich Drepper <drepper@gmail.com> + + * Makefile (distribute): Remove variable. + 2011-09-15 Andreas Schwab <schwab@redhat.com> * thread_dbP.h: Include <list.h> diff --git a/nptl_db/Makefile b/nptl_db/Makefile index eb3c7e89f0..d15fb9e818 100644 --- a/nptl_db/Makefile +++ b/nptl_db/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 2002,2003,2009 Free Software Foundation, Inc. +# Copyright (C) 2002,2003,2009,2012 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -49,8 +49,6 @@ libthread_db-inhibit-o = $(filter-out .os,$(object-suffixes)) # The ps_* callback functions are not defined. libthread_db.so-no-z-defs = yes -distribute = thread_dbP.h shlib-versions proc_service.h \ - db_info.c structs.def db-symbols.h db-symbols.awk include ../Rules # Depend on libc.so so a DT_NEEDED is generated in the shared objects. |