*/Makefile.am: Now passes 'make distcheck'. Now loops. I'm not sure what

*/Makefile.am: Now passes 'make distcheck'. Now loops. I'm not sure what
is up.

1998-12-23  Elliot Lee  <sopwith@redhat.com>

	* gtk/gtkmenu.c: Allow programmer to gtk_object_set_data(obj,
 	"GtkTearoffMenuItem_window_title", ..) on a GtkMenuItem and have
 	it be recognized. If we're getting the title out of the GtkLabel,
 	then remove all underscores.

1 files changed, 132 insertions, 122 deletions

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 6f9ac9bdb0..6374f94de2 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -4,90 +4,67 @@ info_TEXINFOS = gdk.texi gtk.texi
 
 man_MANS = gtk-config.1
 
-EXTRA_DIST =	\
-	texinfo.tex 		\
-	macros.texi		\
-	gtkdocs_fix		\
-	gtkfaq.sgml		\
-        gtk-config.txt          \
-	gtk_tut.sgml		\
-	gtk_tut_it.sgml		\
-	gtk_tut_fr.sgml		\
-	debugging.txt		\
-	developers.txt		\
-	refcounting.txt		\
-	styles.txt		\
-	text_widget.txt 	\
-	widget_system.txt 	\
-	gtk_tut_packbox1.gif 	\
-	gtk_tut_packbox2.gif 	\
-	html/gtk_tut_table.gif	\
-	html/gtk_tut_packbox1.gif 	\
-	html/gtk_tut_packbox2.gif 	\
-	gtk_tut_table.gif	\
-	gtk-config.1		\
-	html/gdk.html            	\
-	html/gdk_toc.html        	\
-	html/gtk.html            	\
-	html/gtk_toc.html        	\
-	html/gtk_tut.html        	\
-	html/gtk_tut-1.html      	\
-	html/gtk_tut-2.html      	\
-	html/gtk_tut-3.html      	\
-	html/gtk_tut-4.html      	\
-	html/gtk_tut-5.html      	\
-	html/gtk_tut-6.html      	\
-	html/gtk_tut-7.html      	\
-	html/gtk_tut-8.html      	\
-	html/gtk_tut-9.html      	\
-	html/gtk_tut-10.html     	\
-	html/gtk_tut-11.html     	\
-	html/gtk_tut-12.html     	\
-	html/gtk_tut-13.html     	\
-	html/gtk_tut-14.html     	\
-	html/gtk_tut-15.html     	\
-	html/gtk_tut-16.html     	\
-	html/gtk_tut-17.html     	\
-	html/gtk_tut-18.html     	\
-	html/gtk_tut-19.html     	\
-	html/gtk_tut-20.html     	\
-	html/gtk_tut-21.html     	\
-	html/gtk_tut-22.html     	\
-	html/gtk_tut-23.html     	\
-	html/gtk_tut-24.html     	\
-	html/gtk_tut-25.html     	\
-	html/gtk_tut-26.html     	\
-	html/gtk_tut-27.html     	\
-	html/gtk_tut-28.html     	\
-	html/gtk_tut-29.html     	\
-	html/gtk_tut-30.html     	\
-	html/gtk_tut-31.html     	\
-	html/gtk_tut_fr.html     	\
-	html/gtk_tut_fr-1.html   	\
-	html/gtk_tut_fr-2.html   	\
-	html/gtk_tut_fr-3.html   	\
-	html/gtk_tut_fr-4.html   	\
-	html/gtk_tut_fr-5.html   	\
-	html/gtk_tut_fr-6.html   	\
-	html/gtk_tut_fr-7.html   	\
-	html/gtk_tut_fr-8.html   	\
-	html/gtk_tut_fr-9.html   	\
-	html/gtk_tut_fr-10.html  	\
-	html/gtk_tut_fr-11.html  	\
-	html/gtk_tut_fr-12.html  	\
-	html/gtk_tut_fr-13.html  	\
-	html/gtk_tut_fr-14.html  	\
-	html/gtk_tut_fr-15.html  	\
-	html/gtk_tut_fr-16.html  	\
-	html/gtk_tut_fr-17.html  	\
-	html/gtk_tut_fr-18.html  	\
-	html/gtk_tut_fr-19.html  	\
-	html/gtk_tut_fr-20.html  	\
-	html/gtk_tut_fr-21.html  	\
-	html/gtk_tut_fr-22.html  	\
-	html/gtk_tut_fr-23.html  	\
-	html/gtk_tut_fr-24.html  	\
-	html/gtk_tut_it.html     	\
+TUTORIAL_FR_FILES=html/gtk_tut_fr-1.html   	\
+html/gtk_tut_fr-2.html   	\
+html/gtk_tut_fr-3.html   	\
+html/gtk_tut_fr-4.html   	\
+html/gtk_tut_fr-5.html   	\
+html/gtk_tut_fr-6.html   	\
+html/gtk_tut_fr-7.html   	\
+html/gtk_tut_fr-8.html   	\
+html/gtk_tut_fr-9.html   	\
+html/gtk_tut_fr-10.html  	\
+html/gtk_tut_fr-11.html  	\
+html/gtk_tut_fr-12.html  	\
+html/gtk_tut_fr-13.html  	\
+html/gtk_tut_fr-14.html  	\
+html/gtk_tut_fr-15.html  	\
+html/gtk_tut_fr-16.html  	\
+html/gtk_tut_fr-17.html  	\
+html/gtk_tut_fr-18.html  	\
+html/gtk_tut_fr-19.html  	\
+html/gtk_tut_fr-20.html  	\
+html/gtk_tut_fr-21.html  	\
+html/gtk_tut_fr-22.html  	\
+html/gtk_tut_fr-23.html  	\
+html/gtk_tut_fr-24.html  	\
+html/gtk_tut_fr.html text/gtk_tut_fr.txt
+
+TUTORIAL_FILES=text/gtk_tut.txt html/gtk_tut.html \
+html/gtk_tut.html        	\
+html/gtk_tut-1.html      	\
+html/gtk_tut-2.html      	\
+html/gtk_tut-3.html      	\
+html/gtk_tut-4.html      	\
+html/gtk_tut-5.html      	\
+html/gtk_tut-6.html      	\
+html/gtk_tut-7.html      	\
+html/gtk_tut-8.html      	\
+html/gtk_tut-9.html      	\
+html/gtk_tut-10.html     	\
+html/gtk_tut-11.html     	\
+html/gtk_tut-12.html     	\
+html/gtk_tut-13.html     	\
+html/gtk_tut-14.html     	\
+html/gtk_tut-15.html     	\
+html/gtk_tut-16.html     	\
+html/gtk_tut-17.html     	\
+html/gtk_tut-18.html     	\
+html/gtk_tut-19.html     	\
+html/gtk_tut-20.html     	\
+html/gtk_tut-21.html     	\
+html/gtk_tut-22.html     	\
+html/gtk_tut-23.html     	\
+html/gtk_tut-24.html     	\
+html/gtk_tut-25.html     	\
+html/gtk_tut-26.html     	\
+html/gtk_tut-27.html     	\
+html/gtk_tut-28.html     	\
+html/gtk_tut-29.html     	\
+html/gtk_tut-30.html     	\
+html/gtk_tut-31.html
+
+TUTORIAL_IT_FILES=	html/gtk_tut_it.html     	\
 	html/gtk_tut_it-1.html   	\
 	html/gtk_tut_it-2.html   	\
 	html/gtk_tut_it-3.html   	\
@@ -111,8 +88,10 @@ EXTRA_DIST =	\
 	html/gtk_tut_it-21.html  	\
 	html/gtk_tut_it-22.html  	\
 	html/gtk_tut_it-23.html  	\
-	html/gtk_tut_it-24.html  	\
-	html/gtkfaq.html		\
+	html/gtk_tut_it-24.html		\
+	text/gtk_tut_it.txt
+
+FAQ_FILES=html/gtkfaq.html		\
 	html/gtkfaq-1.html       	\
 	html/gtkfaq-2.html       	\
 	html/gtkfaq-3.html       	\
@@ -121,56 +100,87 @@ EXTRA_DIST =	\
 	html/gtkfaq-6.html       	\
 	html/gtkfaq-7.html		\
 	text/gtkfaq.txt			\
-	text/gtk_tut.txt		\
-	text/gtk_tut_it.txt		\
-	text/gtk_tut_fr.txt
+
+EXTRA_DIST =	\
+	texinfo.tex 		\
+	macros.texi		\
+	gtkdocs_fix		\
+	gtkfaq.sgml		\
+        gtk-config.txt          \
+	gtk_tut.sgml		\
+	gtk_tut_it.sgml		\
+	gtk_tut_fr.sgml		\
+	debugging.txt		\
+	developers.txt		\
+	refcounting.txt		\
+	styles.txt		\
+	text_widget.txt 	\
+	widget_system.txt 	\
+	gtk_tut_packbox1.gif 	\
+	gtk_tut_packbox2.gif 	\
+	html/gtk_tut_table.gif	\
+	html/gtk_tut_packbox1.gif 	\
+	html/gtk_tut_packbox2.gif 	\
+	gtk_tut_table.gif	\
+	gtk-config.1		\
+	html/gdk.html            	\
+	html/gdk_toc.html        	\
+	html/gtk.html            	\
+	html/gtk_toc.html        	\
+	$(TUTORIAL_FILES)		\
+	$(TUTORIAL_FR_FILES)		\
+	$(TUTORIAL_IT_FILES)		\
+	$(FAQ_FILES)
 
 .PHONY: html htmldir gdk.html gtk.html faq tutorial tutorial_it tutorial_fr files
 
 distdocs: gdk.html gtk.html faq tutorial tutorial_it tutorial_fr
 
 htmldir:
-	mkdir -p html
-	cp gtk_tut*gif html/
+	(cd $(srcdir); mkdir -p html; cp gtk_tut*gif html)
 
 textdir:
-	mkdir -p text
+	mkdir -p $(srcdir)/text
 
-gdk.html: htmldir
-	texi2html gdk.texi
-	mv gdk.html gdk_toc.html html/
+html/gdk.html html/gdk_toc.html: htmldir
+	(cd $(srcdir); texi2html gdk.texi; mv gdk.html gdk_toc.html html)
 
-gtk.html: htmldir
-	texi2html gtk.texi
-	mv gtk.html gtk_toc.html html/
+html/gtk.html html/gtk_toc.html: htmldir
+	(cd $(srcdir); texi2html gtk.texi; mv gtk.html gtk_toc.html html)
 
 faq: htmldir textdir
-	sgml2html gtkfaq.sgml
-	perl gtkdocs_fix gtkfaq*html
-	mv gtkfaq*html html/
-	sgml2txt gtkfaq.sgml
-	mv gtkfaq.txt text/
+	(cd $(srcdir); sgml2html gtkfaq.sgml; \
+	perl gtkdocs_fix gtkfaq*html; \
+	mv gtkfaq*html html/; \
+	sgml2txt gtkfaq.sgml; \
+	mv gtkfaq.txt text/)
+
+$(TUTORIAL_FILES): tutorial
+
+$(TUTORIAL_FR_FILES): tutorial_fr
+
+$(TUTORIAL_IT_FILES): tutorial_it
 
 tutorial: htmldir textdir
-	sgml2html gtk_tut.sgml
-	perl gtkdocs_fix gtk_tut*html
-	mv gtk_tut*html html/
-	sgml2txt gtk_tut.sgml
-	mv gtk_tut.txt text/
-
-tutorial_it: htmldir
-	sgml2html gtk_tut_it.sgml
-	perl gtkdocs_fix gtk_tut_it*html
-	mv gtk_tut_it*html html/
-	sgml2txt gtk_tut_it.sgml
-	mv gtk_tut_it.txt text/
-
-tutorial_fr: htmldir
-	sgml2html gtk_tut_fr.sgml
-	perl gtkdocs_fix gtk_tut_fr*html
-	mv gtk_tut_fr*html html/
-	sgml2txt gtk_tut_fr.sgml
-	mv gtk_tut_fr.txt text/
+	(cd $(srcdir); sgml2html gtk_tut.sgml; \
+	perl gtkdocs_fix gtk_tut*html; \
+	mv gtk_tut*html html/; \
+	sgml2txt gtk_tut.sgml; \
+	mv gtk_tut.txt text/)
+
+tutorial_it: htmldir textdir
+	(cd $(srcdir); sgml2html gtk_tut_it.sgml; \
+	perl gtkdocs_fix gtk_tut_it*html; \
+	mv gtk_tut_it*html html/; \
+	sgml2txt gtk_tut_it.sgml; \
+	mv gtk_tut_it.txt text/)
+
+tutorial_fr: htmldir textdir
+	(cd $(srcdir); sgml2html gtk_tut_fr.sgml; \
+	perl gtkdocs_fix gtk_tut_fr*html; \
+	mv gtk_tut_fr*html html/; \
+	sgml2txt gtk_tut_fr.sgml; \
+	mv gtk_tut_fr.txt text/)
 
 
 files: