Link with SIM_EXTRA_LIBS, not just EXTRA_LIBS, which is never set.

This commit is contained in:
Rob Savoye 1996-12-16 22:16:24 +00:00
parent 063443cf01
commit af68520381

View File

@ -20,14 +20,17 @@
# SIM_AC_OUTPUT combines this with ../common/Make-common.in to produce the
# real Makefile.
TERMCAP_LIB = @TERMCAP@
## Begin config
SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o
SIM_EXTRA_LIBS = ../../readline/libreadline.a -ltermcap -lm
SIM_EXTRA_LIBS = ../../readline/libreadline.a $(TERMCAP_LIB) -lm
SIM_EXTRA_LIBDEPS = ../../readline/libreadline.a
SIM_EXTRA_ALL = sis
SIM_EXTRA_INSTALL = install-sis
SIM_EXTRA_CLEAN = clean-sis
# UARTS run at about 115200 baud (simulator time). Add -DFAST_UART to
# CFLAGS if faster (infinite) UART speed is desired. Might affect the
# behaviour of UART interrupt routines ...
@ -39,7 +42,7 @@ SIS_OFILES = exec.o erc32.o func.o help.o float.o
sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS)
$(CC) $(ALL_CFLAGS) -o sis \
sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS)
sis.o $(SIS_OFILES) $(COMMON_OBJS) $(SIM_EXTRA_LIBS)
# FIXME: This computes the build host's endianness, doesn't it?
# There is AC_C_BIGENDIAN but it doesn't handle float endianness.
@ -56,6 +59,13 @@ install-sis:
clean-sis:
rm -f sis end end.h
configure:
@echo "Rebuilding configure..."
if [ x"${srcdir}" = x"@srcdir@" ] ; then \
srcdir=. ; export srcdir ; \
else true ; fi ; \
(cd $${srcdir}; autoconf --localdir=../common)
# Circumvent Sun Make bug with VPATH.
erc32.o: erc32.c sis.h end.h
exec.o: exec.c sis.h end.h
@ -63,5 +73,4 @@ float.o: float.c sis.h end.h
func.o: func.c
help.o: help.c
interf.o: interf.c sis.h end.h
run.o: run.c
sis.o: sis.c sis.h end.h