From: Andreas Jaeger <aj@suse.de>
Date: Thu, 24 Aug 2000 12:39:25 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_1_93~76
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=469e977feb83e832c7200441453b6db92c8b3a80;p=glibc.git

Update.

2000-08-24  Andreas Jaeger  <aj@suse.de>

	* malloc/Makefile (extra-objs): Fix last patch, build memusagestat
	only if LIBGD is available.
---

diff --git a/ChangeLog b/ChangeLog
index b1ea151b84..060a3cd832 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-24  Andreas Jaeger  <aj@suse.de>
+
+	* malloc/Makefile (extra-objs): Fix last patch, build memusagestat
+	only if LIBGD is available.
+
 2000-08-24  Ulrich Drepper  <drepper@redhat.com>
 
 	* resolv/res_send.c (res_ourserver_p): Cleanup the type mess to avoid
diff --git a/malloc/Makefile b/malloc/Makefile
index 25422d22c5..2c57da933e 100644
--- a/malloc/Makefile
+++ b/malloc/Makefile
@@ -48,7 +48,7 @@ libmemusage-routines = memusage
 libmemusage-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 # These should be removed by `make clean'.
-extra-objs = mcheck-init.o libmcheck.a memusagestat.o
+extra-objs = mcheck-init.o libmcheck.a
 
 # Include the cleanup handler.
 aux := set-freeres
@@ -73,6 +73,7 @@ endif
 ifneq ($(LIBGD),no)
 install-bin += memusagestat memusage
 generated += memusagestat memusage
+extra-objs += memusagestat.o
 endif
 
 # Another goal which can be used to override the configure decision.