aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorAlexandre Oliva <aoliva@redhat.com>2002-12-29 19:05:04 +0000
committerAlexandre Oliva <aoliva@redhat.com>2002-12-29 19:05:04 +0000
commite6bfb94a3eb5094c196acecb3423194ed510fc95 (patch)
tree9a2ac334269a45045963f03a791ede171d01a535 /Makefile.tpl
parent685db7b2198ad8713d0c956d3b55fece7388500a (diff)
downloadgdb-e6bfb94a3eb5094c196acecb3423194ed510fc95.zip
gdb-e6bfb94a3eb5094c196acecb3423194ed510fc95.tar.gz
gdb-e6bfb94a3eb5094c196acecb3423194ed510fc95.tar.bz2
* Makefile.tpl (local-distclean): Don't remove...
(multilib.ts): ... this. Moved into... (multilib.out): ... this. Don't use sub-make. ($(BUILD_SUBDIR)/[+module+]/Makefile, [+module+]/Makefile, $(TARGET_SUBDIR)/[+module+]/Makefile, gcc/Makefile): Moved into... (configure-build-[+module+], configure-[+module+], configure-target-[+module+], configure-gcc): ... these. Test for Makefile existence. Drop config.status from dependencies. * Makefile.in: Rebuilt. * configure.in: Move gcc-version-trigger to the end of ac_configure_args. Add comments to maybedep.tmp and serdep.tmp. Introduce --disable-serial-configure. Remove nonopt from baseargs, matching and removing corresponding whitespace while at it. * configure: Rebuilt.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl42
1 files changed, 19 insertions, 23 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index ea5fd91..8b66bb6 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -641,7 +641,7 @@ local-clean:
local-distclean:
-rm -f Makefile config.status config.cache mh-frag mt-frag
- -rm -f multilib.out multilib.ts multilib.tmp maybedep.tmp serdep.tmp
+ -rm -f multilib.out multilib.tmp maybedep.tmp serdep.tmp
-if [ "$(TARGET_SUBDIR)" != "." ]; then \
rm -rf $(TARGET_SUBDIR); \
else true; fi
@@ -789,9 +789,10 @@ TAGS: do-TAGS
[+ FOR build_modules +]
.PHONY: configure-build-[+module+] maybe-configure-build-[+module+]
maybe-configure-build-[+module+]:
-configure-build-[+module+]: $(BUILD_SUBDIR)/[+module+]/Makefile
-$(BUILD_SUBDIR)/[+module+]/Makefile: config.status
- @[ -d $(BUILD_SUBDIR)/[+module+] ] || mkdir $(BUILD_SUBDIR)/[+module+];\
+configure-build-[+module+]:
+ @test ! -f $(BUILD_SUBDIR)/[+module+]/Makefile || exit 0; \
+ [ -d $(BUILD_SUBDIR)/[+module+] ] || \
+ mkdir $(BUILD_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
AR="$(AR_FOR_BUILD)"; export AR; \
@@ -862,10 +863,9 @@ all-build-[+module+]: configure-build-[+module+]
[+ FOR host_modules +]
.PHONY: configure-[+module+] maybe-configure-[+module+]
maybe-configure-[+module+]:
-configure-[+module+]: [+module+]/Makefile
-
-[+module+]/Makefile: config.status
- @[ -d [+module+] ] || mkdir [+module+]; \
+configure-[+module+]:
+ @test ! -f [+module+]/Makefile || exit 0; \
+ [ -d [+module+] ] || mkdir [+module+]; \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
CC="$(CC)"; export CC; \
@@ -964,15 +964,18 @@ install-[+module+]: installdirs
[+ FOR target_modules +]
.PHONY: configure-target-[+module+] maybe-configure-target-[+module+]
maybe-configure-target-[+module+]:
-configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/Makefile
# There's only one multilib.out. Cleverer subdirs shouldn't need it copied.
$(TARGET_SUBDIR)/[+module+]/multilib.out: multilib.out
- @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
+ @[ -d $(TARGET_SUBDIR)/[+module+] ] || \
+ mkdir $(TARGET_SUBDIR)/[+module+]; \
+ rm -f $(TARGET_SUBDIR)/[+module+]/Makefile || : ; \
cp multilib.out $(TARGET_SUBDIR)/[+module+]/multilib.out
-$(TARGET_SUBDIR)/[+module+]/Makefile: config.status $(TARGET_SUBDIR)/[+module+]/multilib.out
- @[ -d $(TARGET_SUBDIR)/[+module+] ] || mkdir $(TARGET_SUBDIR)/[+module+];\
+configure-target-[+module+]: $(TARGET_SUBDIR)/[+module+]/multilib.out
+ @test ! -f $(TARGET_SUBDIR)/[+module+]/Makefile || exit 0; \
+ [ -d $(TARGET_SUBDIR)/[+module+] ] || \
+ mkdir $(TARGET_SUBDIR)/[+module+];\
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
@@ -1092,10 +1095,9 @@ install-target-[+module+]: installdirs
# gcc is the only module which uses GCC_FLAGS_TO_PASS.
.PHONY: configure-gcc maybe-configure-gcc
maybe-configure-gcc:
-configure-gcc: gcc/Makefile
-
-gcc/Makefile: config.status
- @[ -d gcc ] || mkdir gcc; \
+configure-gcc:
+ @test ! -f gcc/Makefile || exit 0; \
+ [ -d gcc ] || mkdir gcc; \
r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
CC="$(CC)"; export CC; \
@@ -1395,17 +1397,11 @@ configure-target-qthreads: $(ALL_GCC_C)
# work around various timestamp bugs on some systems.
# We use move-if-change so that it's only considered updated when it
# actually changes, because it has to depend on a phony target.
-multilib.out: multilib.ts
- @if [ -f multilib.out ] ; then : else \
- rm -f multilib.ts; $(MAKE) multilib.ts; \
- fi
-
-multilib.ts: maybe-all-gcc
+multilib.out: maybe-all-gcc
@r=`${PWD}`; export r; \
echo "Checking multilib configuration..."; \
$(CC_FOR_TARGET) --print-multi-lib > multilib.tmp 2> /dev/null ; \
$(SHELL) $(srcdir)/move-if-change multilib.tmp multilib.out ; \
- echo timestamp > multilib.ts
# Rebuilding Makefile.in, using autogen.
AUTOGEN = autogen