Re: Insight snapshots down -- PATCH

[Andrew Cagney <ac131313 at ges dot redhat dot com>]

> On Thu, 5 Sep 2002, Andrew Cagney wrote:
>
>
> > FYI,
> >
> > There is a problem with insight snapshots.  The log shows:
> > > Making distclean in doc
> > > itcl: make distclean
> > > itk: make distclean
> > > itcl: make distclean
> > > make[5]: *** No rule to make target `distclean'.  Stop.
> > > make[4]: *** [distclean] Error 1
> > > make[3]: *** [do-distclean] Error 1
> > > make[2]: *** [do-proto-toplev] Error 2
> > > make[1]: *** [gdb-tar] Error 2
> > > make: *** [insight+dejagnu.tar] Error 2
>
> Hi,
>
> I've committed the following patch which fixes the problem (and finishes 
> the distclean). Simple autoconf problem.
Thanks!  I've re-enabled the snapshots.  Lets see what happens next.

Andrew


> Keith
>
> ChangeLog
> 2002-09-05  Keith Seitz  <keiths@redhat.com>
>
>         * itk/Makefile.in (distclean): Remove pkgIndex.tcl and
>         itkConfig.sh
>         * itcl/Makefile.in (distclean): Remove pkgIndex.tcl and
>         itclConfig.sh
>         * iwidgets3.0.0/Makefile.in (distclean): Remove pkgIndex.tcl and
>         iwidgets.tcl.
>         * configure.in (subdirs): New variable. Don't put AC_CONFIG_SUBDIRS
>         macro into configure.in twice: it confuses autoconf. Instead use
>         the variable to hold the subdirs to be configured.
>         * configure: Regenerated.
>
> Patch
> Index: configure.in
> ===================================================================
> RCS file: /cvs/src/src/itcl/configure.in,v
> retrieving revision 1.2
> diff -p -r1.2 configure.in
> *** configure.in	6 Aug 2002 18:51:13 -0000	1.2
> --- configure.in	5 Sep 2002 20:21:37 -0000
> *************** AC_PREFIX_DEFAULT(/usr/local)
> *** 25,35 ****
>   AC_PREFIX_PROGRAM(itclsh)
>   
>   # Source-Navigator does not use the iwidgets packag
>   if test -d ${srcdir}/../snavigator && test ! -d ${srcdir}/../gdb/gdbtk ; then
> !     AC_CONFIG_SUBDIRS(itcl itk)
>   else
> !     AC_CONFIG_SUBDIRS(itcl itk iwidgets3.0.0)
>   fi
>   
>   AC_OUTPUT(Makefile,
>   	chmod +x ${srcdir}/config/install-sh ${srcdir}/config/mkinstalldirs)
> --- 25,38 ----
>   AC_PREFIX_PROGRAM(itclsh)
>   
>   # Source-Navigator does not use the iwidgets packag
> + subdirs=
> + 
>   if test -d ${srcdir}/../snavigator && test ! -d ${srcdir}/../gdb/gdbtk ; then
> !     subdirs="itcl itk"
>   else
> !     subdirs="itcl itk iwidgets3.0.0"
>   fi
> + AC_CONFIG_SUBDIRS($subdirs)
>   
>   AC_OUTPUT(Makefile,
>   	chmod +x ${srcdir}/config/install-sh ${srcdir}/config/mkinstalldirs)
> Index: itcl/Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/itcl/itcl/Makefile.in,v
> retrieving revision 1.1.1.1
> diff -p -r1.1.1.1 Makefile.in
> *** itcl/Makefile.in	9 Sep 2001 19:49:04 -0000	1.1.1.1
> --- itcl/Makefile.in	5 Sep 2002 20:21:37 -0000
> *************** distclean: clean
> *** 407,413 ****
>   	-rm -f *.tab.c
>   	-rm -f Makefile $(CONFIG_CLEAN_FILES)
>   	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
> ! 	-rm -f config.status
>   
>   #========================================================================
>   # Install binary object libraries.  On Windows this includes both .dll and
> --- 407,413 ----
>   	-rm -f *.tab.c
>   	-rm -f Makefile $(CONFIG_CLEAN_FILES)
>   	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
> ! 	-rm -f config.status itclConfig.sh pkgIndex.tcl
>   
>   #========================================================================
>   # Install binary object libraries.  On Windows this includes both .dll and
> Index: itk/Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/itcl/itk/Makefile.in,v
> retrieving revision 1.1.1.1
> diff -p -r1.1.1.1 Makefile.in
> *** itk/Makefile.in	9 Sep 2001 19:49:05 -0000	1.1.1.1
> --- itk/Makefile.in	5 Sep 2002 20:21:37 -0000
> *************** distclean: clean
> *** 381,387 ****
>   	-rm -f *.tab.c
>   	-rm -f Makefile $(CONFIG_CLEAN_FILES)
>   	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
> ! 	-rm -f config.status
>   
>   #========================================================================
>   # Install binary object libraries.  On Windows this includes both .dll and
> --- 381,387 ----
>   	-rm -f *.tab.c
>   	-rm -f Makefile $(CONFIG_CLEAN_FILES)
>   	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
> ! 	-rm -f config.status itkConfig.sh pkgIndex.tcl
>   
>   #========================================================================
>   # Install binary object libraries.  On Windows this includes both .dll and
> Index: iwidgets3.0.0/Makefile.in
> ===================================================================
> RCS file: /cvs/src/src/itcl/iwidgets3.0.0/Makefile.in,v
> retrieving revision 1.3
> diff -p -r1.3 Makefile.in
> *** iwidgets3.0.0/Makefile.in	6 Aug 2002 19:24:25 -0000	1.3
> --- iwidgets3.0.0/Makefile.in	5 Sep 2002 20:21:37 -0000
> *************** clean:
> *** 226,231 ****
> --- 226,232 ----
>   
>   distclean: clean
>   	rm -f Makefile config.status config.cache config.log
> + 	rm -f iwidgets.tcl pkgIndex.tcl
>   
>   depend:
>   	makedepend -- $(CC_SWITCHES) -- $(SRCS)