* configure configure.in Makefile.in: Update to new configure

	scheme which is more compatible with WinGDB builds.
	* configure.in:  Improve comment on how to run autoconf.
	* configure:  Re-run autoconf to get new ../common/aclocal.m4.
	* Makefile.in:  Use autoconf substitution to install common
	makefile fragment.

1 files changed, 7 insertions, 131 deletions

diff --git a/sim/arm/Makefile.in b/sim/arm/Makefile.in
index 54c6f00..2528be3 100644
--- a/sim/arm/Makefile.in
+++ b/sim/arm/Makefile.in
@@ -1,5 +1,5 @@
 #    Makefile template for Configure for the arm sim library.
-#    Copyright (C) 1995 Free Software Foundation, Inc.
+#    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
 #    Written by Cygnus Support.
 # 
 # This program is free software; you can redistribute it and/or modify
@@ -16,150 +16,26 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-VPATH = @srcdir@
-srcdir = @srcdir@
-srcroot = $(srcdir)/../..
-
-prefix = @prefix@
-exec_prefix = @exec_prefix@
-
-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)
-
-datadir = $(prefix)/lib
-mandir = $(prefix)/man
-man1dir = $(mandir)/man1
-man2dir = $(mandir)/man2
-man3dir = $(mandir)/man3
-man4dir = $(mandir)/man4
-man5dir = $(mandir)/man5
-man6dir = $(mandir)/man6
-man7dir = $(mandir)/man7
-man8dir = $(mandir)/man8
-man9dir = $(mandir)/man9
-infodir = $(prefix)/info
-includedir = $(prefix)/include
-docdir = $(datadir)/doc
-
-SHELL = /bin/sh
-
-INSTALL = $(srcroot)/install.sh -c
-INSTALL_PROGRAM = $(INSTALL)
-INSTALL_DATA = $(INSTALL)
-INSTALL_XFORM = $(INSTALL) -t='$(program_transform_name)'
-INSTALL_XFORM1= $(INSTALL_XFORM) -b=.1
-
-AR = @AR@
-AR_FLAGS = rc
-CC = @CC@
-CFLAGS = @CFLAGS@
-MAKEINFO = makeinfo
-RANLIB = @RANLIB@
-
-HDEFINES = @HDEFINES@
-TDEFINES =
-
-.NOEXPORT:
-MAKEOVERRIDES=
-
-X=xstuff.o
-XL=-lX11
-X=
-XL=
-
-INCDIR = $(srcdir)/../../include 
-CSEARCH = -I. -I$(srcdir)  -I../../include  -I../../bfd -I$(INCDIR) -I$(srcdir)/../../bfd -I$(srcdir)/../../gdb
-DEP = mkdep
-
-ARMOBJ=armcopro.o armemu26.o armemu32.o arminit.o armos.o  armsupp.o armvirt.o bag.o
-OUROBJ=wrapper.o 
-
-OBJ=$(ARMOBJ) $(OUROBJ)
-
-all:	run libsim.a
-
-run:	$(OBJ) run.o
-	$(CC) $(CFLAGS) -o run $(OBJ)  run.o ../../bfd/libbfd.a ../../libiberty/libiberty.a $(XL)
-
-run.o:run.c 
+SIM_OBJS = armcopro.o armemu26.o armemu32.o arminit.o armos.o armsupp.o \
+	armvirt.o bag.o wrapper.o
 
+@COMMON_MAKEFILE_FRAG@
 
 armos.o: armos.c armdefs.h armos.h armfpe.h
 
 armcopro.o: armcopro.c armdefs.h 
 
 armemu26.o: armemu.c armdefs.h armemu.h 
-	$(CC) $(CFLAGS) -o armemu26.o -c $<
+	$(CC) -c $< -o armemu26.o $(ALL_CFLAGS)
 
 armemu32.o: armemu.c armdefs.h armemu.h
-	$(CC) $(CFLAGS) -o armemu32.o -DMODE32 -c $<
+	$(CC) -c $< -o armemu32.o -DMODE32 $(ALL_CFLAGS)
 
 arminit.o: arminit.c armdefs.h armemu.h
 
 armrdi.o: armrdi.c armdefs.h armemu.h armos.h dbg_cp.h dbg_conf.h dbg_rdi.h \
-		dbg_hif.h communicate.h
+	dbg_hif.h communicate.h
 
 armsupp.o: armsupp.c armdefs.h armemu.h
 
 bag.o: bag.c bag.h
-
-
-libsim.a: $(OBJ)
-	$(AR) $(ARFLAGS) libsim.a $(OBJ)
-	$(RANLIB) libsim.a
-
-.c.o:
-	$(CC) -c $(CFLAGS) $(HDEFINES) $(TDEFINES) $(CSEARCH) $(CSWITCHES) $<
-
-check:
-
-info:
-clean-info:
-install-info:
-
-tags etags: TAGS
-
-TAGS: force
-	etags $(INCDIR)/*.h $(srcdir)/*.h $(srcdir)/*.c
-
-mostlyclean clean:
-	rm -f *.[oa] *~ core *.E *.p *.ip aout-params.h gen-aout
-	rm -f run libsim.a config.log
-
-distclean realclean: clean
-	rm -f TAGS
-	rm -f Makefile config.cache config.log config.status
-
-# Dummy target to force execution of dependent targets.
-#
-force:
-
-# Copy the files into directories where they will be run.
-install:
-	$(INSTALL_XFORM) run $(bindir)/run
-
-install-man: run.1
-	$(INSTALL_XFORM1) $(srcdir)/run.1 $(man1dir)/run.1
-
-
-Makefile: Makefile.in
-	$(SHELL) ./config.status
-
-config.status: configure
-	$(SHELL) ./config.status --recheck
-
-dep: $(CFILES)
-	mkdep $(CFLAGS) $?
-
-
-# What appears below is generated by a hacked mkdep using gcc -MM.
-
-# DO NOT DELETE THIS LINE -- mkdep uses it.
-# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
-
-
-# IF YOU PUT ANYTHING HERE IT WILL GO AWAY