* Makefile.in (CLIBS): Move $(MMALLOC) past all other libs,

	so that anything that wants an allocation function not yet pulled
	in, will get it from mmalloc rather than a system library.
	* Makefile.in (INSTALLED_LIBS): Reorder to match order of CLIBS,
	to avoid surprising results when used.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 57b234efe246ffe51124cbf8b89d715903ca06ae..2e34fe66195310ae38fb541ef907eb193d672f74 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Sat Apr 27 20:38:32 1996  Fred Fish  <fnf@cygnus.com>
+
+       * Makefile.in (CLIBS): Move $(MMALLOC) past all other libs,
+       so that anything that wants an allocation function not yet pulled
+       in, will get it from mmalloc rather than a system library.
+       * Makefile.in (INSTALLED_LIBS): Reorder to match order of CLIBS,
+       to avoid surprising results when used.
+
 Sat Apr 27 00:12:05 1996  Dawn Perchik  (dawn@cygnus.com)
 
        * stabsread.c: Changes and bug fixes for cfront support.

diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 24d8d868eb35feaaa6f7576fc5ea18bfa903403e..2752008124cfd9812c70ed0368f5d14db92a1bbe 100644 (file)
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -194,20 +194,23 @@ REGEX1 = gnu-regex.o
 # Libraries and corresponding dependencies for compiling gdb.
 # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs.
 # TERMCAP comes after readline, since readline depends on it.
+# MMALLOC comes after anything else that might want an allocation function.
+# LIBIBERTY appears twice on purpose.
 # If you have the Cygnus libraries installed,
 # you can use 'CLIBS=$(INSTALLED_LIBS)' 'CDEPS='
-INSTALLED_LIBS=-lbfd -lreadline $(TERMCAP) -lopcodes -lmmalloc -liberty \
-       $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(ENABLE_CLIBS) @LIBS@
-CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(MMALLOC) $(LIBIBERTY) \
-       $(ENABLE_CLIBS) $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) \
-       $(LIBIBERTY) @LIBS@
+INSTALLED_LIBS=-lbfd -lreadline -lopcodes -liberty $(ENABLE_CLIBS) \
+       $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) @LIBS@ \
+       -lmmalloc -liberty
+CLIBS = $(SIM) $(BFD) $(READLINE) $(OPCODES) $(LIBIBERTY) $(ENABLE_CLIBS) \
+       $(TERMCAP) $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) @LIBS@ \
+       $(MMALLOC) $(LIBIBERTY)
 CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
        $(OPCODES) $(MMALLOC) $(LIBIBERTY)
 
 ADD_FILES = $(REGEX) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 ADD_DEPS = $(REGEX1) $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
 
-VERSION = 4.15.3
+VERSION = 4.16.1
 DIST=gdb
 
 LINT=/usr/5bin/lint