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

[jacob berkman <jacob ximian com>]

On Tue, 2001-10-02 at 17:48, Owen Taylor wrote:
> 
> 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.

ok, here are fixed patches for glib and pango.  the gtk one is going to
take a bit longer to get right...

jacob
-- 

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/11 16:02:18
@@ -179,7 +179,7 @@
 	@false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc html-build.stamp dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/sgml
 	mkdir $(distdir)/html
Index: docs/reference/gobject/Makefile.am
===================================================================
RCS file: /cvs/gnome/glib/docs/reference/gobject/Makefile.am,v
retrieving revision 1.18
diff -u -r1.18 Makefile.am
--- docs/reference/gobject/Makefile.am	2001/09/08 18:23:03	1.18
+++ docs/reference/gobject/Makefile.am	2001/10/11 16:02:18
@@ -165,7 +165,7 @@
 	@false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc html-build.stamp dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/sgml
 	mkdir $(distdir)/html
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/11 16:02:18
@@ -14,6 +14,14 @@
 
 libglib = $(top_builddir)/glib/libglib-1.3.la
 
+$(libglib): update-libglib
+	@true
+
+update-libglib:
+	@cd $(top_builddir)/glib && $(MAKE) $(AM_MAKEFLAGS)
+
+.PHONY: update-libglib
+
 # libraries to compile and install
 lib_LTLIBRARIES = libgobject-1.3.la
 

Index: docs/Makefile.am
===================================================================
RCS file: /cvs/gnome/pango/docs/Makefile.am,v
retrieving revision 1.16
diff -u -r1.16 Makefile.am
--- docs/Makefile.am	2001/08/12 14:34:27	1.16
+++ docs/Makefile.am	2001/10/11 16:41:47
@@ -57,7 +57,7 @@
 GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC)
 GTKDOC_LD=$(LIBTOOL) --mode=link $(CC)
 
-dist-hook-local:
+dist-hook-local: all-local
 	mkdir $(distdir)/TEXT;          \
 	for f in $(srcdir)/TEXT/* ; do  \
 	  test -f $$f && cp -p $$f $(distdir)/TEXT; \
@@ -182,7 +182,7 @@
 	@false
 endif
 
-dist-hook: dist-check-gtkdoc dist-hook-local
+dist-hook: dist-check-gtkdoc html-build.stamp dist-hook-local
 	mkdir $(distdir)/tmpl
 	mkdir $(distdir)/sgml
 	mkdir $(distdir)/html