From 44f0c5db96dc390805c9c594fb40dfeb6ac014f7 Mon Sep 17 00:00:00 2001 From: John Gilmore Date: Fri, 13 Sep 1991 01:10:22 +0000 Subject: * Makefile.in (CLIBS): Put XM_CLIBS and TM_CLIBS at end. Pass MUNCH_DEFINE to munch whenever we run it. * munch: Cope with RT/PC putting fns in data segment. Restore ability to override `nm' by specifying MUNCH_NM. --- gdb/Makefile.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/Makefile.in') diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 0043f7d..00cd726 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -125,8 +125,8 @@ TERMCAP = -ltermcap # Libraries and corresponding dependencies for compiling gdb. # {X,T}M_CLIBS, defined in *config files, have host- and target-dependent libs. -# TERMCAP comes last, since readline depends on it. -CLIBS = $(XM_CLIBS) ${TM_CLIBS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB} ${TERMCAP} +# TERMCAP comes after readline, since readline depends on it. +CLIBS = ${BFD_LIB} ${LIBIBERTY} ${RL_LIB} ${TERMCAP} ${XM_CLIBS} ${TM_CLIBS} CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB} ADD_FILES = ${REGEX} ${ALLOCA} ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES} @@ -316,7 +316,7 @@ gdb1: gdb # remote support. rapp: $(RAPP_OBS) rm -f rapp_init.c - ${srcdir}/munch ${RAPP_OBS} > rapp_init.c + ${srcdir}/munch ${MUNCH_DEFINE} ${RAPP_OBS} > rapp_init.c ${CC-LD} $(LDFLAGS) -o $@ rapp_init.c $(RAPP_OBS) # Support for building Makefile out of configured pieces, automatically -- cgit v1.1