From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 27394 invoked by alias); 14 Mar 2003 16:42:25 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 27315 invoked from network); 14 Mar 2003 16:42:24 -0000 Received: from unknown (HELO duracef.shout.net) (204.253.184.12) by sources.redhat.com with SMTP; 14 Mar 2003 16:42:24 -0000 Received: (from mec@localhost) by duracef.shout.net (8.11.6/8.11.6) id h2EGgN818875; Fri, 14 Mar 2003 10:42:23 -0600 Date: Fri, 14 Mar 2003 16:42:00 -0000 From: Michael Elizabeth Chastain Message-Id: <200303141642.h2EGgN818875@duracef.shout.net> To: binutils@sources.redhat.com, gdb-patches@sources.redhat.com Subject: [rfa] Regenerate Makefile.in to fix tix omission Cc: hunt@redhat.com, neroden@gcc.gnu.org X-SW-Source: 2003-03/txt/msg00323.txt.bz2 The version of Makefile.in currently in CVS was generated from a Makefile.def that is not in CVS, and it does not work properly: 'make install' fails with missing goal on 'maybe-install-tix'. This patch regenerates Makefile.in from Makefile.tpl and Makefile.def. Glitches happen, this is just a cleanup patch for a glitch. Testing: I tested this with 'make install' on native i686-pc-linux-gnu. OK to commit? Michael C 2003-03-14 Michael Chastain * Makefile.in: Regenerate with correct Makefile.def. Index: Makefile.in =================================================================== RCS file: /cvs/src/src/Makefile.in,v retrieving revision 1.120 diff -u -r1.120 Makefile.in --- Makefile.in 12 Mar 2003 20:47:07 -0000 1.120 +++ Makefile.in 14 Mar 2003 16:31:47 -0000 @@ -641,7 +641,8 @@ clean-gdb \ clean-expect \ clean-guile \ - clean-tk + clean-tk \ + clean-tix # The target built for a native build. # This list only includes modules actually being configured and built. @@ -5402,6 +5403,73 @@ s=`cd $(srcdir); ${PWD}`; export s; \ $(SET_LIB_PATH) \ (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