aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--malloc/Makefile3
2 files changed, 7 insertions, 1 deletions
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.