Re: [PATCH] make make dist work without making first



jacob berkman <jacob ximian com> writes:

> this patch was required for me to be able to make dist without distcheck
> or building initially.

Hmm, in general, I'd consider this to be a rather unsupported usage,
just because it is hard to keep a check on, but I guess we can 
try to apply some patches and see if we can do it.

> Index: gobject/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/glib/gobject/Makefile.am,v
> retrieving revision 1.40
> diff -u -r1.40 Makefile.am
> --- gobject/Makefile.am	2001/09/25 06:03:22	1.40
> +++ gobject/Makefile.am	2001/10/01 22:28:54
> @@ -14,6 +14,9 @@
>  
>  libglib = $(top_builddir)/glib/libglib-1.3.la
>  
> +$(libglib):
> +	$(MAKE) -C $(top_builddir)/glib

This is fairly evil because there is no guarantee that the $(libglib)
is up-to-date, just that it exists. What I did for a similar case
in Pango was something along the lines of:

===
$(libglib): update-libglib
        @true

update-libglib: 
        @cd $(top_builddir)/glib && $(MAKE) $(AM_MAKEFLAGS)

.PHONY: update-libglib
===

Which gets slow if you do it all over the place, but may be OK
here.

> Index: docs/reference/glib/Makefile.am
> ===================================================================
> RCS file: /cvs/gnome/glib/docs/reference/glib/Makefile.am,v
> retrieving revision 1.25
> diff -u -r1.25 Makefile.am
> --- docs/reference/glib/Makefile.am	2001/09/10 15:49:52	1.25
> +++ docs/reference/glib/Makefile.am	2001/10/01 22:28:54
> @@ -60,6 +60,7 @@
>  GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
>  GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
>  
> +dist-hook-local: all-local
>  
>  ####################################
>  # Everything below here is generic #

I assume that this is meant to be _below_ 
"Everything below here is generic"? If it is generic, then it 
needs to be updated simultaneously in all 7 gtk-doc Makefiles
inb glib/pango/atk/gtk+ since everything below that comment 
is supposed to be identical everywhere and is liable to get
lost if it is different between the Makefiles.

But there are a couple of problems here - I'd rather see it as:

 dist-hook-local: html-build.stamp

And actually, what you should do since it is generic is simply
in the _generic_ gtk-doc dist-hook (dist-hook-local is something
that is added in the gtk-doc Makefiles and not an automake thing),
do:

dist-hook: dist-check-gtkdoc html-build.stamp dist-hook-local

Regards,
                                        Owen





[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]