From b93e1111fa07674f779ba0081ea08c939f43094d Mon Sep 17 00:00:00 2001 From: Michael Chastain Date: Fri, 14 Mar 2003 18:59:59 +0000 Subject: [PATCH] 2003-03-14 Michael Chastain * Makefile.in: Regenerate with correct Makefile.def. --- ChangeLog | 4 +++ Makefile.in | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 675551274..fc3fb527a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2003-03-14 Michael Chastain + + * Makefile.in: Regenerate with correct Makefile.def. + 2003-03-12 Nathanael Nerode * Makefile.tpl: Move .NOEXPORT, MAKEOVERRIDES up. Delete unused diff --git a/Makefile.in b/Makefile.in index c9bc160df..c40fd8155 100644 --- a/Makefile.in +++ b/Makefile.in @@ -641,7 +641,8 @@ CLEAN_X11_MODULES = \ 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. @@ -5404,6 +5405,73 @@ 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: -- 2.43.5