Warning fixes.

[deliverable/binutils-gdb.git] / sim / Makefile.in

diff --git a/sim/Makefile.in b/sim/Makefile.in
index 9a044f060432ff0b6970e7c5d28492db2bb78a93..7551f95c7c38315802fc2ccb01577238d36655aa 100644 (file)
--- a/sim/Makefile.in
+++ b/sim/Makefile.in
@@ -56,6 +56,7 @@ AR_FLAGS = rc
 CC = @CC@
 CFLAGS = @CFLAGS@
 CC_FOR_BUILD = @CC_FOR_BUILD@
+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
 MAKEINFO = makeinfo
 RANLIB = @RANLIB@
 
@@ -65,10 +66,6 @@ INCDIR = $(srcdir)/../include
 CSEARCH = -I. -I$(srcdir) -I$(INCDIR)
 DEP = mkdep
 
-# compilers to use to create programs which must be run in the build
-# environment.
-CC_FOR_BUILD = $(CC)
-
 #### Makefile fragments come in here.
 # @target_makefile_frag@
 ###
@@ -85,12 +82,16 @@ RUNTESTFLAGS=
 FLAGS_TO_PASS = \
        "prefix=$(prefix)" \
        "exec_prefix=$(exec_prefix)" \
+       "bindir=$(bindir)" \
+       "mandir=$(mandir)" \
+       "libdir=$(libdir)" \
        "against=$(against)" \
        "AR=$(AR)" \
        "AR_FLAGS=$(AR_FLAGS)" \
        "CC=$(CC)" \
        "CC_FOR_BUILD=$(CC_FOR_BUILD)" \
        "CFLAGS=$(CFLAGS)" \
+       "CFLAGS_FOR_BUILD=$(CFLAGS_FOR_BUILD)" \
        "RANLIB=$(RANLIB)" \
        "MAKEINFO=$(MAKEINFO)" \
        "INSTALL=$(INSTALL)" \
@@ -128,7 +129,7 @@ all:
                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
 
@@ -138,7 +139,7 @@ clean mostlyclean:
                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
 
@@ -148,7 +149,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
@@ -159,7 +160,7 @@ 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
 
@@ -206,19 +207,19 @@ config.status: configure
 
 # Utility to run autoconf in each directory that uses the common framework.
 # This is intended to be invoked in $srcdir as
-# "make -f Makefile.in autoconf-common".
-.PHONY: autoconf-common
+# "make -f Makefile.in autoconf-common SHELL=/bin/sh".
+.PHONY: autoconf-common autoheader-common
 autoconf-common autoheader-common:
        for d in * ; \
        do \
-           if [ -d $$d -a -f $$d/configure.in ] ; \
+           if [ -d $$d -a -f $$d/configure.ac ] ; \
            then \
                 echo "Running autoconf in $$d ..." ; \
-                (cd $$d && autoconf) ; \
-                if [ $@ = autoheader-common ] ; \
+                (cd $$d && autoconf --force) ; \
+                if [ $@ = autoheader-common ] && [ -f $$d/config.in ] ; \
                 then \
                   echo "Running autoheader in $$d ..." ; \
-                  (cd $$d && autoheader) ; \
+                  (cd $$d && autoheader --force) ; \
                 fi ; \
            fi ; \
        done
@@ -235,7 +236,7 @@ autoconf-changelog autoheader-changelog:
        echo "$$date $$name $$id@$$host" ; \
        for d in * ; \
        do \
-           if [ -d $$d -a -f $$d/configure.in ] ; \
+           if [ -d $$d -a -f $$d/configure.ac ] ; \
            then \
                 echo "Creating new-$(ChangeLog) in $$d ..." ; \
                 ( echo "$$date  $$name  <$$id@$$host>" ; \
@@ -254,7 +255,7 @@ autoconf-changelog autoheader-changelog:
 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 \
                 echo "Moving $$d/new-$(ChangeLog) to $$d/$(ChangeLog) ..." ; \
                 mv $$d/new-$(ChangeLog) $$d/$(ChangeLog) ; \