This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
Re: [patch] regression: Fix in-tree build [Re: [patch] Create general staging area for data-directory files.]
On Thursday 07 October 2010 00:24:15, Jan Kratochvil wrote:
> On Tue, 05 Oct 2010 02:18:19 +0200, Doug Evans wrote:
> > --- /dev/null 2010-09-23 16:28:04.543730915 -0700
> > +++ data-directory/Makefile.in 2010-10-04 16:56:01.000000000 -0700
> > +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @frags@
> > + cd $(top_builddir) && $(MAKE) data-directory/Makefile
>
Does this need to depend on @frags@ in the first place?
> ->
> Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ./config/i386/linux64.mh
>
> cd /home/...; ./configure; make
> [...]
> make[4]: Entering directory `/home/.../gdb/data-directory'
> make[4]: *** No rule to make target `config/i386/linux64.mh', needed by `Makefile'. Stop.
>
> I will be away for a day, please check it in if it looks OK.
>
>
> Thanks,
> Jan
>
>
> gdb/
> 2010-10-07 Jan Kratochvil <jan.kratochvil@redhat.com>
>
> * Makefile.in (top_srcdir): New substituted variable.
> * configure.ac: New variable host_makefile_frag_1. Use $(top_srcdir)
> prefix for @frags@.
> * configure: Regenerate.
>
> --- ./gdb/Makefile.in 2010-10-06 18:46:12.000000000 +0200
> +++ ./gdb/Makefile.in 2010-10-07 00:55:59.000000000 +0200
> @@ -97,6 +97,7 @@ POSTCOMPILE = @true
>
> # Directory containing source files.
> srcdir = @srcdir@
> +top_srcdir = @top_srcdir@
> VPATH = @srcdir@
>
> YACC=@YACC@
> --- ./gdb/configure.ac 2010-10-06 18:02:43.000000000 +0200
> +++ ./gdb/configure.ac 2010-10-07 00:57:59.000000000 +0200
> @@ -2046,11 +2046,13 @@ AC_SUBST(target_subdir)
>
> frags=
> if test "${gdb_native}" = "yes"; then
> - host_makefile_frag=${srcdir}/config/${gdb_host_cpu}/${gdb_host}.mh
> + host_makefile_frag_1=config/${gdb_host_cpu}/${gdb_host}.mh
> + host_makefile_frag=${srcdir}/${host_makefile_frag_1}
> if test ! -f ${host_makefile_frag}; then
> AC_MSG_ERROR("*** Gdb does not support native target ${host}")
> fi
> - frags="$frags $host_makefile_frag"
> + # @frags@ may be used in a different subdirectory - use $(top_srcdir).
> + frags="$frags \$(top_srcdir)/$host_makefile_frag_1"
> else
> host_makefile_frag=/dev/null
> fi
>
--
Pedro Alves