* config/tc-s390.c (tc_s390_fix_adjustable): Re-add patch to prevent

[deliverable/binutils-gdb.git] / Makefile.tpl

diff --git a/Makefile.tpl b/Makefile.tpl
index 01532e6e2b939352ab3c2f340f9529e8d19f2fc8..7428f4124519e3beba0669481318a224fe935d28 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1,4 +1,4 @@
-[+ AutoGen5 template
+[+ AutoGen5 template -*- Mode: Makefile -*-
 in
 +]
 
@@ -204,11 +204,11 @@ BUILD_CONFIGARGS = @build_configargs@
 
 # This is set by configure to REALLY_SET_LIB_PATH if --enable-shared
 # was used.
-SET_LIB_PATH =
+SET_LIB_PATH = @SET_LIB_PATH@
 
 # This is the name of the environment variable used for the path to
 # the libraries.  This may be changed by configure.in.
-RPATH_ENVVAR = LD_LIBRARY_PATH
+RPATH_ENVVAR = @RPATH_ENVVAR@
 
 # This is the list of directories that may be needed in RPATH_ENVVAR
 # so that programs built for the host machine work.
@@ -522,8 +522,10 @@ CONFIGURE_BUILD_MODULES = \
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(FLAGS_TO_PASS).
-ALL_MODULES = [+ FOR host_modules +]\
-       all-[+module+] [+ ENDFOR host_modules +]\
+ALL_MODULES =[+
+    FOR host_modules +] \
+       all-[+module+][+
+    ENDFOR host_modules +] \
        $(EXTRA_TARGET_HOST_ALL_MODULES)
 
 # This is a list of the check targets for all of the modules which are
@@ -539,16 +541,25 @@ NATIVE_CHECK_MODULES = \
        check-flex \
        check-zip
 
-CROSS_CHECK_MODULES = [+ FOR host_modules +][+ IF no_check  +][+ ELIF no_check_cross +][+ ELSE x +]\
-       check-[+module+] [+ ENDIF no_check +][+ ENDFOR host_modules +]\
+CROSS_CHECK_MODULES =[+
+    FOR host_modules +][+
+        IF (not (or (exist? "no_check_cross") (exist? "no_check")))
+           +] \
+       check-[+module+][+
+        ENDIF no_check +][+
+    ENDFOR host_modules +] \
        $(EXTRA_TARGET_HOST_CHECK_MODULES)
 
 CHECK_MODULES=$(NATIVE_CHECK_MODULES) $(CROSS_CHECK_MODULES)
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(FLAGS_TO_PASS).
-INSTALL_MODULES = [+ FOR host_modules+][+ IF no_install +][+ ELSE no_install +]\
-       install-[+module+] [+ ENDIF no_install +][+ ENDFOR host_modules +]\
+INSTALL_MODULES =[+
+    FOR host_modules+][+
+        IF (not (exist? "no_install")) +] \
+       install-[+module+][+
+        ENDIF no_install +][+
+    ENDFOR host_modules +] \
        $(EXTRA_TARGET_HOST_INSTALL_MODULES)
 
 # This is a list of the targets for all of the modules which are compiled
@@ -583,31 +594,51 @@ INSTALL_X11_MODULES = \
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(TARGET_FLAGS_TO_PASS).
-ALL_TARGET_MODULES = [+ FOR target_modules +]\
-       all-target-[+module+] [+ ENDFOR target_modules +]
+ALL_TARGET_MODULES =[+
+    FOR target_modules +] \
+       all-target-[+module+][+
+    ENDFOR target_modules +]
 
 # This is a list of the configure targets for all of the modules which
 # are compiled using the target tools.
-CONFIGURE_TARGET_MODULES = [+ FOR target_modules +]\
-       configure-target-[+module+] [+ ENDFOR target_modules +]
+CONFIGURE_TARGET_MODULES =[+
+    FOR target_modules +] \
+       configure-target-[+module+][+
+    ENDFOR target_modules +]
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
-CHECK_TARGET_MODULES = [+ FOR target_modules +][+ IF no_check +][+ ELSE check +]\
-       check-target-[+module+] [+ ENDIF no_check +][+ ENDFOR target_modules +]
+CHECK_TARGET_MODULES =[+
+    FOR target_modules +][+
+        IF (not (exist? "no_check")) +] \
+       check-target-[+module+][+
+        ENDIF no_check +][+
+    ENDFOR target_modules +]
 
 # This is a list of the install targets for all of the modules which are
 # compiled using $(TARGET_FLAGS_TO_PASS).
-INSTALL_TARGET_MODULES = [+ FOR target_modules +][+ IF no_install +][+ ELSE install +]\
-       install-target-[+module+] [+ ENDIF no_install +][+ ENDFOR target_modules +]
+INSTALL_TARGET_MODULES =[+
+    FOR target_modules +][+
+        IF (not (exist? "no_install")) +] \
+       install-target-[+module+][+
+        ENDIF no_install +][+
+    ENDFOR target_modules +]
 
 # This is a list of the targets for which we can do a clean-{target}.
-CLEAN_MODULES = [+ FOR host_modules +][+ IF no_clean +][+ ELSE no_clean +]\
-       clean-[+module+] [+ ENDIF no_clean +][+ ENDFOR host_modules +]
+CLEAN_MODULES =[+
+    FOR host_modules +][+
+        IF (not (exist? "no_clean")) +] \
+       clean-[+module+][+
+        ENDIF no_clean +][+
+    ENDFOR host_modules +]
 
 # All of the target modules that can be cleaned
-CLEAN_TARGET_MODULES = [+ FOR target_modules +][+ IF no_clean +][+ ELSE clean +]\
-       clean-target-[+module+] [+ ENDIF no_clean +][+ ENDFOR target_modules +]
+CLEAN_TARGET_MODULES =[+
+    FOR target_modules +][+
+        IF (not (exist? "no_clean")) +] \
+       clean-target-[+module+][+
+        ENDIF no_clean +][+
+    ENDFOR target_modules +]
 
 # All of the x11 modules that can be cleaned
 CLEAN_X11_MODULES = \
@@ -1242,8 +1273,8 @@ all-gcc:
 # In theory, on an SMP all those dependencies can be resolved
 # in parallel.
 #
-.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean
-bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean: all-bootstrap
+.PHONY: bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap
+bootstrap bootstrap-lean bootstrap2 bootstrap2-lean bootstrap3 bootstrap3-lean bootstrap4 bootstrap4-lean bubblestrap quickstrap cleanstrap restrap: all-bootstrap
        @r=`${PWD}`; export r; \
        s=`cd $(srcdir); ${PWD}`; export s; \
        $(SET_LIB_PATH) \