From 52d7cdeeeac14e9d5a8fa8f94ba268f26a6deebe Mon Sep 17 00:00:00 2001 From: Nathanael Nerode Date: Mon, 2 Dec 2002 03:26:59 +0000 Subject: [PATCH] * Makefile.tpl: Restore bkorb's style patch, accidentally lost during replay. * Makefile.in: Regenerate. --- ChangeLog | 4 ++++ Makefile.in | 6 +++--- Makefile.tpl | 24 +++++++++++++++++------- 3 files changed, 24 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index a3d86624686..5865abc065f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-12-02 Nathanael Nerode + * Makefile.tpl: Restore bkorb's style patch, accidentally lost + during replay. + * Makefile.in: Regenerate. + (finishing slow-motion replay) * configure: Remove skip-this-dir support. * Makefile.tpl: Remove skip-this-dir support. diff --git a/Makefile.in b/Makefile.in index e054015dabf..67c239b4976 100644 --- a/Makefile.in +++ b/Makefile.in @@ -540,7 +540,7 @@ CONFIGURE_TARGET_MODULES = \ configure-target-zlib \ configure-target-boehm-gc \ configure-target-qthreads \ - configure-target-rda + configure-target-rda configure-target: $(CONFIGURE_TARGET_MODULES) @@ -606,7 +606,7 @@ CLEAN_MODULES = \ clean-wdiff \ clean-zip \ clean-zlib \ - clean-utils + clean-utils # All of the target modules that can be cleaned CLEAN_TARGET_MODULES = \ @@ -624,7 +624,7 @@ CLEAN_TARGET_MODULES = \ clean-target-zlib \ clean-target-boehm-gc \ clean-target-qthreads \ - clean-target-rda + clean-target-rda # All of the x11 modules that can be cleaned CLEAN_X11_MODULES = \ diff --git a/Makefile.tpl b/Makefile.tpl index 45181c19157..af1b9133fc8 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1,4 +1,4 @@ -[+ AutoGen5 template +[+ AutoGen5 template -*- Mode: Makefile -*- in +] @@ -527,18 +527,28 @@ GCC_FLAGS_TO_PASS = $(BASE_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) # 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 +] configure-target: $(CONFIGURE_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 +][+ ELIF with_x +][+ ELSE clean +]\ - clean-[+module+] [+ ENDIF no_clean +][+ ENDFOR host_modules +] +CLEAN_MODULES =[+ + FOR host_modules +][+ + IF (not (or (exist? "no_clean") (exist? "with_x"))) +] \ + 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 = [+ FOR host_modules +][+ IF with_x +]\ -- 2.30.2