(Try to) Update to new bfd autoconf scheme.

* run.c: Don't include sysdep.h.
* Makefile.in (INSTALL{,_PROGRAM,_DATA}): Use autoconf computed value.
(CC, CFLAGS, AR, RANLIB): Likewise.
(HDEFINES, TDEFINES): Define.
(CC_FOR_BUILD): Delete.
(host_makefile_frag): Delete.
(Makefile): Don't depend on frags.
* configure.in (sysdep.h): Don't create symlink.
(host_makefile_frag, frags): Deleted.
(CC, CFLAGS, AR, RANLIB, INSTALL): Compute values.
* configure: Regenerated.
This commit is contained in:
J.T. Conklin 1995-09-07 22:07:47 +00:00
parent 3dce804d95
commit c632873c27
5 changed files with 1069 additions and 47 deletions

View File

@ -1,3 +1,24 @@
Thu Sep 7 15:02:31 1995 J.T. Conklin <jtc@rtl.cygnus.com>
(Try to) Update to new bfd autoconf scheme.
* run.c: Don't include sysdep.h.
* Makefile.in (INSTALL{,_PROGRAM,_DATA}): Use autoconf computed value.
(CC, CFLAGS, AR, RANLIB): Likewise.
(HDEFINES, TDEFINES): Define.
(CC_FOR_BUILD): Delete.
(host_makefile_frag): Delete.
(Makefile): Don't depend on frags.
* configure.in (sysdep.h): Don't create symlink.
(host_makefile_frag, frags): Deleted.
(CC, CFLAGS, AR, RANLIB, INSTALL): Compute values.
* configure: Regenerated.
start-sanitize-sh3e
Thu Aug 31 12:39:07 1995 Jim Wilson <wilson@chestnut.cygnus.com>
* interp.c: Include <math.h>.
end-sanitize-sh3e
Wed Aug 30 22:05:17 1995 Jeff Law (law@snake.cs.utah.edu)
* Makefile.in (run): Link in math library too.

View File

@ -14,7 +14,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
VPATH = @srcdir@
srcdir = @srcdir@
@ -27,6 +27,7 @@ host_alias = @host_alias@
target_alias = @target_alias@
program_transform_name = @program_transform_name@
bindir = $(exec_prefix)/bin
libdir = $(exec_prefix)/lib
tooldir = $(libdir)/$(target_alias)
@ -47,24 +48,24 @@ docdir = $(datadir)/doc
SHELL = /bin/sh
# FIXME: use autoconf's AC_PROG_INSTALL
INSTALL = $(srcroot)/install.sh -c
INSTALL_PROGRAM = $(INSTALL)
INSTALL_DATA = $(INSTALL)
INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
AR = ar
AR = @AR@
AR_FLAGS = rc
CFLAGS = -g
CC = @CC@
CFLAGS = @CFLAGS@
BISON = bison
MAKEINFO = makeinfo
RANLIB = ranlib
RANLIB = @RANLIB@
HDEFINES = @HDEFINES@
TDEFINES =
.NOEXPORT:
MAKEOVERRIDES=
CC_FOR_BUILD = cc
X=xstuff.o
XL=-lX11
X=
@ -75,14 +76,10 @@ CSEARCH = -I. -I$(srcdir) -I../../include \
-I../../bfd -I$(INCDIR) -I$(srcdir)/../../bfd -I$(srcdir)/../../gdb -I$(srcdir)/../../newlib/libc/sys/sh
DEP = mkdep
#### Makefile fragments come in here.
# @host_makefile_frag@
###
all: run libsim.a
run: interp.o $(X) run.o table.o
$(CC) $(CFLAGS) -o run $(X) interp.o table.o run.o ../../bfd/libbfd.a ../../libiberty/libiberty.a $(XL)
$(CC) $(CFLAGS) -o run $(X) interp.o table.o run.o ../../bfd/libbfd.a ../../libiberty/libiberty.a $(XL) -lm
interp.o:interp.c code.c table.c
run.o:run.c
@ -100,7 +97,7 @@ table.c:gencode
# indent table.c
gencode:gencode.c
$(CC_FOR_BUILD) -o gencode $(srcdir)/gencode.c
$(CC) -o gencode $(srcdir)/gencode.c
.c.o:
$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
@ -118,6 +115,7 @@ TAGS: force
clean:
rm -f *.[oa] *~ core *.E *.p *.ip aout-params.h gen-aout
rm -f run libsim.a
distclean mostlyclean realclean: clean
rm -f TAGS
@ -130,20 +128,16 @@ force:
# Copy the files into directories where they will be run.
install:
srcroot=`cd $(srcroot); pwd`; export srcroot; \
$(INSTALL_XFORM) run $(bindir)/run ; \
n=`t='$(program_transform_name)'; echo run | sed -e "" $$t`; \
if [ -d $(tooldir) ] ; then \
if [ -d $(tooldir)/bin ] ; then true ; else mkdir $(tooldir)/bin ; fi; \
rm -f $(tooldir)/bin/run; \
ln $(bindir)/$$n $(tooldir)/bin/run \
|| $(INSTALL_PROGRAM) run $(tooldir)/bin/run; \
else true; fi
$(INSTALL_PROGRAM) run $(bindir)/$$n ; \
rm -f $(tooldir)/bin/run; \
ln $(bindir)/$$n $(tooldir)/bin/run \
|| (INSTALL_PROGRAM) run $(tooldir)/bin/run; \
install-man: run.1
$(INSTALL_XFORM1) $(srcdir)/run.1 $(man1dir)/run.1
Makefile: Makefile.in config.status @frags@
Makefile: Makefile.in config.status
$(SHELL) ./config.status
config.status: configure

1021
sim/sh/configure vendored Executable file

File diff suppressed because it is too large Load Diff

View File

@ -8,25 +8,12 @@ AC_ARG_PROGRAM
. ${srcdir}/../../bfd/configure.host
# Set up to make a link between the host's include file and "sysdep.h".
files="../../bfd/hosts/${my_host}.h"
if test ! -f ${srcdir}/${files} ; then
files=../../bfd/hosts/std-host.h
AC_MSG_WARN(shsim has no specific support for host ${host} -- using std-host)
fi
AC_LINK_FILES($files, sysdep.h)
if test -f ${srcdir}/../../bfd/config/${my_host}.mh; then
host_makefile_frag=../../bfd/config/${my_host}.mh
else
host_makefile_frag=/dev/null
fi
frags=
if test $host_makefile_frag != /dev/null; then
frags="$frags $host_makefile_frag"
fi
AC_SUBST_FILE(host_makefile_frag)
AC_SUBST(frags)
AC_PROG_CC
AC_SUBST(CFLAGS)
AC_SUBST(HDEFINES)
AR=${AR-ar}
AC_SUBST(AR)
AC_PROG_RANLIB
AC_PROG_INSTALL
AC_OUTPUT(Makefile)

View File

@ -25,7 +25,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#include <stdio.h>
#include <varargs.h>
#include "bfd.h"
#include "sysdep.h"
#include "remote-sim.h"
#ifndef SIGQUIT