aboutsummaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorNathanael Nerode <neroden@gcc.gnu.org>2003-03-12 20:47:07 +0000
committerNathanael Nerode <neroden@gcc.gnu.org>2003-03-12 20:47:07 +0000
commit3db0a37f8001da3a43a4423be783de7101251ea3 (patch)
tree2418a8c145679f35098ebb959f38ed956656f194 /Makefile.in
parent2336e177169b6a339fdada43bc3d1ce8173290cd (diff)
downloadgdb-3db0a37f8001da3a43a4423be783de7101251ea3.zip
gdb-3db0a37f8001da3a43a4423be783de7101251ea3.tar.gz
gdb-3db0a37f8001da3a43a4423be783de7101251ea3.tar.bz2
* Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. Delete unused
Make macro. * Makefile.in: Regenerate. * configure.in: Clean up gxx_include_dir logic. * configure: Regenerate.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in79
1 files changed, 5 insertions, 74 deletions
diff --git a/Makefile.in b/Makefile.in
index 41b1b64..c9bc160 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -20,6 +20,10 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
+# Don't pass command-line variables to submakes.
+.NOEXPORT:
+MAKEOVERRIDES=
+
# -------------------------------
# Standard Autoconf-set variables
# -------------------------------
@@ -84,7 +88,6 @@ INSTALL_DATA = $(INSTALL) -m 644
# -------------------------------------------------
links=@configlinks@
-enable_version_specific_runtime_libs = @enable_version_specific_runtime_libs@
# The file containing GCC's version number.
gcc_version_trigger = @gcc_version_trigger@
gcc_version = @gcc_version@
@@ -638,8 +641,7 @@ CLEAN_X11_MODULES = \
clean-gdb \
clean-expect \
clean-guile \
- clean-tk \
- clean-tix
+ clean-tk
# The target built for a native build.
# This list only includes modules actually being configured and built.
@@ -5402,73 +5404,6 @@ install-tk: installdirs
(cd tk && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-.PHONY: configure-tix maybe-configure-tix
-maybe-configure-tix:
-configure-tix:
- @test ! -f tix/Makefile || exit 0; \
- [ -d tix ] || mkdir tix; \
- r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- CC="$(CC)"; export CC; \
- CFLAGS="$(CFLAGS)"; export CFLAGS; \
- CXX="$(CXX)"; export CXX; \
- CXXFLAGS="$(CXXFLAGS)"; export CXXFLAGS; \
- if [ z$(build_canonical) != z$(host_canoncial) ] ; then \
- AR="$(AR)"; export AR; \
- AS="$(AS)"; export AS; \
- CC_FOR_BUILD="$(CC_FOR_BUILD)"; export CC_FOR_BUILD; \
- DLLTOOL="$(DLLTOOL)"; export DLLTOOL; \
- LD="$(LD)"; export LD; \
- NM="$(NM)"; export NM; \
- RANLIB="$(RANLIB)"; export RANLIB; \
- WINDRES="$(WINDRES)"; export WINDRES; \
- OBJCOPY="$(OBJCOPY)"; export OBJCOPY; \
- OBJDUMP="$(OBJDUMP)"; export OBJDUMP; \
- fi; \
- echo Configuring in tix; \
- cd tix || exit 1; \
- case $(srcdir) in \
- \.) \
- srcdiroption="--srcdir=."; \
- libsrcdir=".";; \
- /* | [A-Za-z]:[\\/]*) \
- srcdiroption="--srcdir=$(srcdir)/tix"; \
- libsrcdir="$$s/tix";; \
- *) \
- srcdiroption="--srcdir=../$(srcdir)/tix"; \
- libsrcdir="$$s/tix";; \
- esac; \
- $(SHELL) $${libsrcdir}/configure \
- $(HOST_CONFIGARGS) $${srcdiroption} \
- || exit 1
-
-.PHONY: all-tix maybe-all-tix
-maybe-all-tix:
-all-tix: configure-tix
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) all)
-
-
-.PHONY: check-tix
-check-tix:
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) check)
-
-
-
-.PHONY: install-tix maybe-install-tix
-maybe-install-tix:
-install-tix: installdirs
- @r=`${PWD}`; export r; \
- s=`cd $(srcdir); ${PWD}`; export s; \
- $(SET_LIB_PATH) \
- (cd tix && $(MAKE) $(FLAGS_TO_PASS) $(X11_FLAGS_TO_PASS) install)
-
-
.PHONY: configure-libtermcap maybe-configure-libtermcap
maybe-configure-libtermcap:
configure-libtermcap:
@@ -7525,10 +7460,6 @@ config.status: configure $(gcc_version_trigger)
AUTOCONF = autoconf
$(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/config/acx.m4
cd $(srcdir) && $(AUTOCONF)
-#
-
-.NOEXPORT:
-MAKEOVERRIDES=
# Tell GNU make 3.79 not to run the top level in parallel. This
# prevents contention for $builddir/$target/config.cache, as well