summaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2004-12-28 17:39:43 +0000
committerPaolo Bonzini <bonzini@gnu.org>2004-12-28 17:39:43 +0000
commite603596bfe892dd4bc783c1eea4eae432d0f6122 (patch)
tree06f2870e872eefa0105143de7037cfff90bac76a /Makefile.tpl
parentc589f879649ecf17a68c0236ba1ae431cbbe2425 (diff)
downloadgdb-e603596bfe892dd4bc783c1eea4eae432d0f6122.tar.gz
2004-12-28 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/17383 * Makefile.def (target_modules): Remove stage parameter, it is always true now. * Makefile.tpl (configure-build-[+module+], configure-target-[+module+]): Always build symlink tree for the directory and for include. BUILD_SUBDIR and TARGET_SUBDIR cannot be . anymore. * Makefile.in: Regenerate.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r--Makefile.tpl74
1 files changed, 36 insertions, 38 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index 44c15fd53cc..d85d0902f76 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -822,31 +822,30 @@ configure-build-[+module+]:
echo Configuring in $(BUILD_SUBDIR)/[+module+]; \
cd "$(BUILD_SUBDIR)/[+module+]" || exit 1; \
case $(srcdir) in \
- /* | [A-Za-z]:[\\/]*) \
- topdir=$(srcdir) ;; \
- *) \
- case "$(BUILD_SUBDIR)" in \
- .) topdir="../$(srcdir)" ;; \
- *) topdir="../../$(srcdir)" ;; \
- esac ;; \
+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+ *) topdir="../../$(srcdir)" ;; \
esac; \
if [ "$(srcdir)" = "." ] ; then \
- if [ "$(BUILD_SUBDIR)" != "." ] ; then \
- if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
- if [ -f Makefile ]; then \
- if $(MAKE) distclean; then \
- true; \
- else \
- exit 1; \
- fi; \
- else \
+ if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
+ if [ -f Makefile ]; then \
+ if $(MAKE) distclean; then \
true; \
+ else \
+ exit 1; \
fi; \
else \
- exit 1; \
+ true; \
fi; \
else \
+ exit 1; \
+ fi; \
+ if [ -d ../include ] ; then \
true; \
+ else \
+ mkdir ../include; \
+ cd ../include; \
+ $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \
+ cd ../[+module+]; \
fi; \
srcdiroption="--srcdir=."; \
libsrcdir="."; \
@@ -1032,38 +1031,37 @@ ENDIF raw_cxx +]
echo Configuring in $(TARGET_SUBDIR)/[+module+]; \
cd "$(TARGET_SUBDIR)/[+module+]" || exit 1; \
case $(srcdir) in \
- /* | [A-Za-z]:[\\/]*) \
- topdir=$(srcdir) ;; \
- *) \
- case "$(TARGET_SUBDIR)" in \
- .) topdir="../$(srcdir)" ;; \
- *) topdir="../../$(srcdir)" ;; \
- esac ;; \
- esac; \[+ IF stage +]
+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
+ *) topdir="../../$(srcdir)" ;; \
+ esac; \
if [ "$(srcdir)" = "." ] ; then \
- if [ "$(TARGET_SUBDIR)" != "." ] ; then \
- if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
- if [ -f Makefile ]; then \
- if $(MAKE) distclean; then \
- true; \
- else \
- exit 1; \
- fi; \
- else \
+ if $(SHELL) $$s/symlink-tree $${topdir}/[+module+] "no-such-file" ; then \
+ if [ -f Makefile ]; then \
+ if $(MAKE) distclean; then \
true; \
+ else \
+ exit 1; \
fi; \
else \
- exit 1; \
+ true; \
fi; \
else \
+ exit 1; \
+ fi; \
+ if [ -d ../include ] ; then \
true; \
+ else \
+ mkdir ../include; \
+ cd ../include; \
+ $(SHELL) $$s/symlink-tree $${topdir}/include "no-such-file"; \
+ cd ../[+module+]; \
fi; \
srcdiroption="--srcdir=."; \
libsrcdir="."; \
- else \[+ ENDIF stage +]
+ else \
srcdiroption="--srcdir=$${topdir}/[+module+]"; \
- libsrcdir="$$s/[+module+]"; \[+ IF stage +]
- fi; \[+ ENDIF stage +]
+ libsrcdir="$$s/[+module+]"; \
+ fi; \
rm -f no-such-file || : ; \
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) $${srcdiroption} \