toplevel Makefile: autogenerate more

[Nathanael Nerode <neroden at doctormoo dot dyndns dot org>]

Autogenerate more.  Only changes in Makefile.in are spacing and a change
in the order of '*-expect' and '*-guile' in some targets, which seems
harmless given that guile isn't even in the gcc or src trees.

I did this the way I did it for a reason; in the end the with_x and not with_x
cases will share more code in the template (since the only difference is what
flags are passed).

	* Makefile.tpl: Autogenerate more.
	* Makefile.def: Autogenerate more.
	* Makefile.in: Regenerate.

Index: Makefile.tpl
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.tpl,v
retrieving revision 1.11
diff -u -r1.11 Makefile.tpl
--- Makefile.tpl	3 Oct 2002 19:06:15 -0000	1.11
+++ Makefile.tpl	5 Oct 2002 03:59:25 -0000
@@ -522,8 +522,8 @@
 
 # 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 +][+ IF with_x +][+ ELSE with_x +]\
+	all-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]\
 	$(EXTRA_TARGET_HOST_ALL_MODULES)
 
 # This is a list of the check targets for all of the modules which are
@@ -539,7 +539,7 @@
 	check-flex \
 	check-zip
 
-CROSS_CHECK_MODULES = [+ FOR host_modules +][+ IF no_check  +][+ ELIF no_check_cross +][+ ELSE x +]\
+CROSS_CHECK_MODULES = [+ FOR host_modules +][+ IF no_check  +][+ ELIF no_check_cross +][+ ELIF with_x +][+ ELSE check +]\
 	check-[+module+] [+ ENDIF no_check +][+ ENDFOR host_modules +]\
 	$(EXTRA_TARGET_HOST_CHECK_MODULES)
 
@@ -547,39 +547,24 @@
 
 # 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_MODULES = [+ FOR host_modules+][+ IF no_install +][+ ELIF with_x +][+ ELSE 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
 # using $(X11_FLAGS_TO_PASS).
-ALL_X11_MODULES = \
-	all-gdb \
-	all-expect \
-	all-guile \
-	all-tclX \
-	all-tk \
-	all-tix
+ALL_X11_MODULES = [+ FOR host_modules +][+ IF with_x +]\
+	all-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
-CHECK_X11_MODULES = \
-	check-gdb \
-	check-guile \
-	check-expect \
-	check-tclX \
-	check-tk \
-	check-tix
+CHECK_X11_MODULES = [+ FOR host_modules +][+ IF with_x +]\
+	check-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]
 
 # This is a list of the install targets for all the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
-INSTALL_X11_MODULES = \
-	install-gdb \
-	install-guile \
-	install-expect \
-	install-tclX \
-	install-tk \
-	install-tix
+INSTALL_X11_MODULES = [+ FOR host_modules +][+ IF with_x +]\
+	install-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(TARGET_FLAGS_TO_PASS).
@@ -602,7 +587,7 @@
 	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_MODULES = [+ FOR host_modules +][+ IF no_clean +][+ ELIF with_x +][+ ELSE clean +]\
 	clean-[+module+] [+ ENDIF no_clean +][+ ENDFOR host_modules +]
 
 # All of the target modules that can be cleaned
@@ -610,13 +595,8 @@
 	clean-target-[+module+] [+ ENDIF no_clean +][+ ENDFOR target_modules +]
 
 # All of the x11 modules that can be cleaned
-CLEAN_X11_MODULES = \
-	clean-gdb \
-	clean-expect \
-	clean-guile \
-	clean-tclX \
-	clean-tk \
-	clean-tix
+CLEAN_X11_MODULES = [+ FOR host_modules +][+ IF with_x +]\
+	clean-[+module+] [+ ENDIF with_x +][+ ENDFOR host_modules +]
 
 # The target built for a native build.
 .PHONY: all.normal
Index: Makefile.def
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.def,v
retrieving revision 1.3
diff -u -r1.3 Makefile.def
--- Makefile.def	2 Oct 2002 06:27:24 -0000	1.3
+++ Makefile.def	5 Oct 2002 03:59:25 -0000
@@ -61,6 +61,13 @@
 host_modules= { module= wdiff; };
 host_modules= { module= zip; no_check_cross=true; };
 host_modules= { module= zlib; no_install=true; no_check=true; };
+host_modules= { module= gdb; with_x=true; };
+host_modules= { module= expect; with_x=true; };
+host_modules= { module= guile; with_x=true; };
+host_modules= { module= tclX; with_x=true; };
+host_modules= { module= tk; with_x=true; };
+host_modules= { module= tix; with_x=true; };
+
 
 target_modules = { module= libstdc++-v3; };
 target_modules = { module= newlib; };
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/Makefile.in,v
retrieving revision 1.125
diff -u -r1.125 Makefile.in
--- Makefile.in	3 Oct 2002 19:06:15 -0000	1.125
+++ Makefile.in	5 Oct 2002 03:59:29 -0000
@@ -721,27 +721,27 @@
 	all-guile \
 	all-tclX \
 	all-tk \
-	all-tix
+	all-tix 
 
 # This is a list of the check targets for all of the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
 CHECK_X11_MODULES = \
 	check-gdb \
-	check-guile \
 	check-expect \
+	check-guile \
 	check-tclX \
 	check-tk \
-	check-tix
+	check-tix 
 
 # This is a list of the install targets for all the modules which are
 # compiled using $(X11_FLAGS_TO_PASS).
 INSTALL_X11_MODULES = \
 	install-gdb \
-	install-guile \
 	install-expect \
+	install-guile \
 	install-tclX \
 	install-tk \
-	install-tix
+	install-tix 
 
 # This is a list of the targets for all of the modules which are compiled
 # using $(TARGET_FLAGS_TO_PASS).
@@ -901,7 +901,7 @@
 	clean-guile \
 	clean-tclX \
 	clean-tk \
-	clean-tix
+	clean-tix 
 
 # The target built for a native build.
 .PHONY: all.normal