X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=sim%2FMakefile.in;h=fdbcdedeb7bb6b2b3da89e4953f651b98e0ae687;hb=fcc392a34e8faa72fdc186f13905b4156e83d4b9;hp=4bb1243defd092f3092b7f554383eb72b7a1f0e7;hpb=27b9abfd02edb8aef107796353f60adf8e021725;p=deliverable%2Fbinutils-gdb.git

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 4bb1243def..fdbcdedeb7 100644
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -1,5 +1,5 @@
 #    Makefile template for Configure for the sim library.
-#    Copyright (C) 1993, 1995 Free Software Foundation, Inc.
+#    Copyright (C) 1993, 1995, 1997, 1998 Free Software Foundation, Inc.
 #    Written by Cygnus Support.
 # 
 # This file is part of BFD, the Binary File Descriptor library.
@@ -45,7 +45,7 @@ man9dir = $(mandir)/man9
 infodir = @infodir@
 includedir = @includedir@
 
-SHELL = /bin/sh
+SHELL = @SHELL@
 
 INSTALL = @INSTALL@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -61,10 +61,6 @@ RANLIB = @RANLIB@
 
 SUBDIRS = @subdirs@
 
-.NOEXPORT:
-MAKEOVERRIDES=
-
-
 INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 DEP = mkdep
@@ -77,9 +73,20 @@ CC_FOR_BUILD = $(CC)
 # @target_makefile_frag@
 ###
 
+# Name of the ChangeLog file.
+ChangeLog = ChangeLog
+
+
+RUNTEST = `if [ -f $${srcdir}/../dejagnu/runtest ] ; then \
+		echo $${srcdir}/../dejagnu/runtest ; else echo runtest; \
+	   fi`
+RUNTESTFLAGS=
+
 FLAGS_TO_PASS = \
 	"prefix=$(prefix)" \
 	"exec_prefix=$(exec_prefix)" \
+	"bindir=$(bindir)" \
+	"mandir=$(mandir)" \
 	"against=$(against)" \
 	"AR=$(AR)" \
 	"AR_FLAGS=$(AR_FLAGS)" \
@@ -90,25 +97,50 @@ FLAGS_TO_PASS = \
 	"MAKEINFO=$(MAKEINFO)" \
 	"INSTALL=$(INSTALL)" \
 	"INSTALL_DATA=$(INSTALL_DATA)" \
-	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)"
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)" \
+	"SHELL=$(SHELL)"
+
+# The use of $$(x_FOR_TARGET) reduces the command line length by not
+# duplicating the lengthy definition.
+TARGET_FLAGS_TO_PASS = \
+	"prefix=$(prefix)" \
+	"exec_prefix=$(exec_prefix)" \
+	"against=$(against)" \
+	'CC=$$(CC_FOR_TARGET)' \
+	"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
+	"CFLAGS=$(CFLAGS)" \
+	"CHILLFLAGS=$(CHILLFLAGS)" \
+	'CHILL=$$(CHILL_FOR_TARGET)' \
+	"CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
+	"CHILL_LIB=$(CHILL_LIB)" \
+	'CXX=$$(CXX_FOR_TARGET)' \
+	"CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \
+	"CXXFLAGS=$(CXXFLAGS)" \
+	"INSTALL=$(INSTALL)" \
+	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+	"INSTALL_DATA=$(INSTALL_DATA)" \
+	"MAKEINFO=$(MAKEINFO)" \
+	"RUNTESTFLAGS=$(RUNTESTFLAGS)"
+
 
 all:
 	@rootme=`pwd` ; export rootme ; \
-	for dir in . ${SUBDIRS}; do \
+	for dir in . `echo ${SUBDIRS} | sed 's/testsuite//'` ; do \
 		if [ "$$dir" = "." ]; then \
 			true; \
 		elif [ -d $$dir ]; then \
-			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS)); \
+			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS)) || exit 1; \
 		else true; fi; \
 	done
 
-clean mostlyclean: 
+clean mostlyclean:
 	@rootme=`pwd` ; export rootme ; \
 	for dir in . ${SUBDIRS}; do \
 		if [ "$$dir" = "." ]; then \
 			true; \
 		elif [ -d $$dir ]; then \
-			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@); \
+			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@) || exit 1; \
 		else true; fi; \
 	done
 
@@ -118,7 +150,7 @@ distclean maintainer-clean realclean:
 		if [ "$$dir" = "." ]; then \
 			true; \
 		elif [ -d $$dir ]; then \
-			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@); \
+			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS) $@) || exit 1; \
 		else true; fi; \
 	done
 	rm -f Makefile config.cache config.log config.status
@@ -129,10 +161,27 @@ install:
 		if [ "$$dir" = "." ]; then \
 			true; \
 		elif [ -d $$dir ]; then \
-			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS) install); \
+			(cd $$dir; $(MAKE) $(FLAGS_TO_PASS) install) || exit 1; \
 		else true; fi; \
 	done
 
+installcheck:
+	@echo No installcheck target is available yet for the GNU simulators.
+
+installcheck:
+
+# The check target can not use subdir_do, because subdir_do does not
+# use TARGET_FLAGS_TO_PASS.
+check: force
+	@if [ -f testsuite/Makefile ]; then \
+	  rootme=`pwd`; export rootme; \
+	  rootsrc=`cd $(srcdir); pwd`; export rootsrc; \
+	  cd testsuite; \
+	  $(MAKE) $(TARGET_FLAGS_TO_PASS) check; \
+	else true; fi
+
+
+
 info:
 install-info:
 dvi:
@@ -140,6 +189,9 @@ dvi:
 ### 
 ### 
 
+.NOEXPORT:
+MAKEOVERRIDES=
+
 .PHONY: check installcheck
 check:
 installcheck:
@@ -158,15 +210,55 @@ config.status: configure
 # This is intended to be invoked in $srcdir as
 # "make -f Makefile.in autoconf-common".
 .PHONY: autoconf-common
-autoconf-common:
+autoconf-common autoheader-common:
+	for d in * ; \
+	do \
+	    if [ -d $$d -a -f $$d/configure.ac ] ; \
+	    then \
+		 echo "Running autoconf in $$d ..." ; \
+		 (cd $$d && autoconf --force) ; \
+		 if [ $@ = autoheader-common ] ; \
+		 then \
+		   echo "Running autoheader in $$d ..." ; \
+		   (cd $$d && autoheader --force) ; \
+		 fi ; \
+	    fi ; \
+	done
+
+autoconf-changelog autoheader-changelog:
+	id=$(ID) ; \
+	test x$$id = x && id="`id | sed -e 's/^[^(]*(\([^)]*\).*$$/\1/'`" ; \
+	name=$(NAME) ; \
+	test x$$name = x && name=`grep "^$$id:" /etc/passwd | cut -f 5 -d ':'` ; \
+	host=$(HOST) ; \
+	test x$$host = x && host="`hostname`" ; \
+	date=$(DATE) ; \
+	test x$$date = x && date="`date +%Y-%m-%d`" ; \
+	echo "$$date $$name $$id@$$host" ; \
+	for d in * ; \
+	do \
+	    if [ -d $$d -a -f $$d/configure.ac ] ; \
+	    then \
+		 echo "Creating new-$(ChangeLog) in $$d ..." ; \
+		 ( echo "$$date  $$name  <$$id@$$host>" ; \
+		   echo "" ; \
+		   echo "	* configure: Regenerated to track ../common/aclocal.m4 changes." ; \
+		   if [ $@ = autoheader-changelog ] ; \
+		   then \
+		     echo "	* config.in: Ditto." ; \
+		   fi ; \
+		   echo "" ; \
+		   cat $$d/$(ChangeLog) \
+		 ) > $$d/new-$(ChangeLog) ; \
+	    fi ; \
+	done
+
+autoconf-install autoheader-install:
 	for d in * ; \
 	do \
-	    if [ -d $$d -a -f $$d/configure.in ] ; \
+	    if [ -d $$d -a -f $$d/configure.ac ] ; \
 	    then \
-		if grep SIM_AC_COMMON $$d/configure.in >/dev/null ; \
-		then \
-		    echo "Running autoconf in $$d ..." ; \
-		    (cd $$d && autoconf) ; \
-		fi ; \
+		 echo "Moving $$d/new-$(ChangeLog) to $$d/$(ChangeLog) ..." ; \
+		 mv $$d/new-$(ChangeLog) $$d/$(ChangeLog) ; \
 	    fi ; \
 	done