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 /malloc/Makefile | |
| 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 'malloc/Makefile')
| -rw-r--r-- | malloc/Makefile | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/malloc/Makefile b/malloc/Makefile index 17421062f3..5d6d716a78 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1991-1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007, 2009, 2011 +# Copyright (C) 1991-2003, 2005, 2006, 2007, 2009, 2011, 2012 # Free Software Foundation, Inc. # This file is part of the GNU C Library. @@ -29,14 +29,7 @@ tests := mallocbug tst-malloc tst-valloc tst-calloc tst-obstack \ tst-mallocstate tst-mcheck tst-mallocfork tst-trim1 test-srcs = tst-mtrace -distribute = thread-m.h mtrace.pl mcheck-init.c stackinfo.h memusage.h \ - memusage.sh memusagestat.c tst-mtrace.sh arena.c hooks.c - -# Things which get pasted together into gmalloc.c. -gmalloc-routines := malloc morecore -# Things to include in the standalone distribution. -dist-routines = $(gmalloc-routines) mcheck mtrace -routines = $(dist-routines) obstack +routines = malloc morecore mcheck mtrace obstack install-lib := libmcheck.a non-lib.a := libmcheck.a |