diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Makefile.tpl | 69 |
2 files changed, 54 insertions, 19 deletions
@@ -1,3 +1,7 @@ +2002-11-13 Bruce Korb <bkorb@gnu.org> + + * Makefile.tpl: syntactic cleanup + 2002-11-04 Kevin Buettner <kevinb@redhat.com> * Makefile.def (host_modules): Add rda. diff --git a/Makefile.tpl b/Makefile.tpl index 58d50ce..7428f41 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1,4 +1,4 @@ -[+ AutoGen5 template +[+ AutoGen5 template -*- Mode: Makefile -*- in +] @@ -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 = \ |