Don't include generated files in the tarball. Bug #319440.

2006-01-03  Christian Persch  <chpe@cvs.gnome.org>

	* embed/Makefile.am:
	* embed/mozilla/Makefile.am:
	* lib/Makefile.am:
	* lib/egg/Makefile.am:
	* src/Makefile.am:
	* src/bookmarks/Makefile.am:

	Don't include generated files in the tarball. Bug #319440.

	R help/C/Makefile.am:
	R help/es/Makefile.am:
	R help/eu/Makefile.am:
	R help/fi/Makefile.am:
	R help/ja/Makefile.am:
	R help/uk/Makefile.am:

	Remove obsolete files.

17 files changed, 94 insertions, 86 deletions

diff --git a/ChangeLog b/ChangeLog
index bb3070289..0d639a290 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2006-01-03  Christian Persch  <chpe@cvs.gnome.org>
+
+	* embed/Makefile.am:
+	* embed/mozilla/Makefile.am:
+	* lib/Makefile.am:
+	* lib/egg/Makefile.am:
+	* src/Makefile.am:
+	* src/bookmarks/Makefile.am:
+
+	Don't include generated files in the tarball. Bug #319440.
+
+	R help/C/Makefile.am:
+	R help/es/Makefile.am:
+	R help/eu/Makefile.am:
+	R help/fi/Makefile.am:
+	R help/ja/Makefile.am:
+	R help/uk/Makefile.am:
+
+	Remove obsolete files.
+
 2006-01-03  Jean-François Rameau  <jframeau@cvs.gnome.org>
 
 	* src/ephy-dbus.c: (ephy_dbus_connect_to_session_bus):
diff --git a/NEWS b/NEWS
index 4e16e8d9d..0ab429e66 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+1.9.4.90 dummy
+
 ==============
 Epiphany 1.9.4
 ==============
diff --git a/data/Makefile.am b/data/Makefile.am
index a5c2bcba9..13b4bb716 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -74,20 +74,21 @@ if GCONF_SCHEMAS_INSTALL
 endif
 
 EXTRA_DIST = \
-	     $(server_in_files)     	\
-	     $(schema_in_files)         \
-	     $(font_schema_files)	\
-	     $(desktop_in_files)	\
-	     $(about_DATA)		\
-	     $(applications_DATA)	\
-	     $(mimepermission_DATA)	\
-	     $(pkgconfig_DATA)		\
-	     $(default_prefs_in_FILES)	\
-	     $(xsl_DATA)		\
-	     $(service_DATA)		\
-	     $(m4data_DATA)		\
-	     check-mime.py		\
-	     generate-font-schemas.py
+	$(server_in_files)		\
+	$(schema_in_files)		\
+	$(font_schema_files)		\
+	$(desktop_in_files)		\
+	$(about_DATA)			\
+	$(applications_DATA)		\
+	$(mimepermission_DATA)		\
+	$(pkgconfig_DATA)		\
+	$(default_prefs_in_FILES)	\
+	$(xsl_DATA)			\
+	$(service_DATA)			\
+	$(m4data_DATA)			\
+	epiphany-service.xml		\
+	check-mime.py			\
+	generate-font-schemas.py
 
 DISTCLEANFILES = \
 	$(server_DATA)		\
diff --git a/doc/reference/tmpl/ephy-embed.sgml b/doc/reference/tmpl/ephy-embed.sgml
index cdb8d1f5b..bf976179d 100644
--- a/doc/reference/tmpl/ephy-embed.sgml
+++ b/doc/reference/tmpl/ephy-embed.sgml
@@ -306,6 +306,9 @@ be done by casting).
 @:
 @: 
 @: 
+@:
+@: 
+@: 
 @: 
 
 <!-- ##### SIGNAL EphyEmbed::ge-search-key-press ##### -->
diff --git a/embed/Makefile.am b/embed/Makefile.am
index b97b81d54..3be8a73b2 100644
--- a/embed/Makefile.am
+++ b/embed/Makefile.am
@@ -31,6 +31,10 @@ INST_H_FILES = \
 	ephy-password-manager.h		\
 	ephy-permission-manager.h
 
+BUILT_SOURCES = \
+	ephy-embed-type-builtins.c	\
+	ephy-embed-type-builtins.h
+
 libephyembed_la_SOURCES = \
 	ephy-adblock-manager.c		\
 	downloader-view.c		\
@@ -51,8 +55,7 @@ libephyembed_la_SOURCES = \
 	ephy-permission-manager.c	\
 	print-dialog.c			\
 	$(INST_H_FILES)			\
-	$(NOINST_H_FILES)		\
-	$(BUILT_SOURCES)
+	$(NOINST_H_FILES)
 
 if ENABLE_CERTIFICATE_MANAGER
 INST_H_FILES += \
@@ -64,6 +67,9 @@ libephyembed_la_SOURCES += \
 	ephy-x509-cert.c
 endif
 
+nodist_libephyembed_la_SOURCES = \
+	$(BUILT_SOURCES)
+
 libephyembed_la_CPPFLAGS = \
 	-I$(top_builddir)/lib       	\
 	-I$(top_srcdir)/embed/mozilla   \
@@ -91,10 +97,6 @@ libephyembedfactory_la_CFLAGS = \
 	$(DEPENDENCIES_CFLAGS) 	\
 	$(AM_CFLAGS)
 
-BUILT_SOURCES = \
-	ephy-embed-type-builtins.c	\
-	ephy-embed-type-builtins.h
-
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
diff --git a/embed/mozilla/Makefile.am b/embed/mozilla/Makefile.am
index dff497be4..a1dedc6c7 100644
--- a/embed/mozilla/Makefile.am
+++ b/embed/mozilla/Makefile.am
@@ -117,7 +117,9 @@ mozilla_include_subdirs = \
 
 # Grr, damn gentoo has a dodgy header layout
 # http://bugs.gentoo.org/show_bug.cgi?id=100804
-mozilla_include_subdirs += find pref
+mozilla_include_subdirs += \
+	find			\
+	pref
 
 libephymozillaembed_la_CPPFLAGS = \
 	-I$(top_srcdir)/lib	    		\
diff --git a/embed/print-dialog.c b/embed/print-dialog.c
index 7dfd0525b..18162c4c9 100755
--- a/embed/print-dialog.c
+++ b/embed/print-dialog.c
@@ -270,9 +270,8 @@ ephy_print_verify_postscript (GnomePrintDialog *print_dialog)
                                 config, (guchar *)"Settings.Engine.Backend.Driver"));
         }
 
-	if (GTK_WINDOW (print_dialog)->group)
-		gtk_window_group_add_window (GTK_WINDOW (print_dialog)->group,
-					     GTK_WINDOW (dialog));
+	gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (print_dialog)),
+				     GTK_WINDOW (dialog));
 
 	gtk_dialog_run (GTK_DIALOG (dialog));
 	gtk_widget_destroy (dialog);
@@ -423,10 +422,9 @@ ephy_print_dialog_new (GtkWidget *parent,
 			  G_CALLBACK (ephy_print_dialog_response_cb), info);
 	
 	gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (parent));
-	
-	if (GTK_WINDOW (parent)->group)
-		gtk_window_group_add_window (GTK_WINDOW (parent)->group,
-					     GTK_WINDOW (dialog));
+
+	gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (parent)),
+				     GTK_WINDOW (dialog));
 
 	return dialog;
 }
diff --git a/help/C/Makefile.am b/help/C/Makefile.am
deleted file mode 100644
index f4f50f3b8..000000000
--- a/help/C/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = epiphany
-lang = C
-omffile = epiphany-C.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/es/Makefile.am b/help/es/Makefile.am
deleted file mode 100644
index f5caaac0b..000000000
--- a/help/es/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = epiphany
-lang = es
-omffile = epiphany-es.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/eu/Makefile.am b/help/eu/Makefile.am
deleted file mode 100644
index 526d6e926..000000000
--- a/help/eu/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = epiphany
-lang = eu
-omffile = epiphany-eu.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/fi/Makefile.am b/help/fi/Makefile.am
deleted file mode 100644
index 80ec08a93..000000000
--- a/help/fi/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = epiphany
-lang = fi
-omffile = epiphany-fi.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/ja/Makefile.am b/help/ja/Makefile.am
deleted file mode 100644
index 09978b2d0..000000000
--- a/help/ja/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = epiphany
-lang = ja
-omffile = epiphany-ja.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/help/uk/Makefile.am b/help/uk/Makefile.am
deleted file mode 100644
index bf917f246..000000000
--- a/help/uk/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-figdir = figures
-docname = epiphany
-lang = uk
-omffile = epiphany-uk.omf
-entities = legal.xml
-include $(top_srcdir)/xmldocs.make
-dist-hook: app-dist-hook
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 97b2832fc..697213940 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -65,7 +65,9 @@ libephymisc_la_SOURCES = \
 	ephy-stock-icons.c			\
 	ephy-zoom.c				\
 	$(INST_H_FILES)				\
-	$(NOINST_H_FILES)			\
+	$(NOINST_H_FILES)
+
+nodist_libephymisc_la_SOURCES = \
 	$(BUILT_SOURCES)
 
 libephymisc_la_CPPFLAGS = \
@@ -147,5 +149,4 @@ stamp-ephy-lib-type-builtins.h: $(TYPES_H_FILES)
 	&& echo timestamp > $(@F)
 
 EXTRA_DIST = 			\
-	ephy-marshal.list	\
-	epiphany-service.xml
+	ephy-marshal.list
diff --git a/lib/egg/Makefile.am b/lib/egg/Makefile.am
index b87aae55e..cf04e9bda 100644
--- a/lib/egg/Makefile.am
+++ b/lib/egg/Makefile.am
@@ -25,7 +25,9 @@ noinst_LTLIBRARIES = libegg.la
 
 libegg_la_SOURCES = \
 	$(EGGSOURCES) \
-	$(EGGHEADERS) \
+	$(EGGHEADERS)
+
+nodist_libegg_la_SOURCES = \
 	$(BUILT_SOURCES)
 
 libegg_la_CPPFLAGS = \
diff --git a/src/Makefile.am b/src/Makefile.am
index 960dc9bc8..b6b6c1413 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,6 +8,8 @@ endif
 
 bin_PROGRAMS = epiphany
 
+EXTRA_DIST =
+
 CXXLD = $(CXX)
 LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
 
@@ -54,7 +56,6 @@ INST_H_FILES = \
 	ephy-window.h
 
 libephymain_la_SOURCES = \
-	$(TYPES_SOURCE)			\
 	ephy-activation.c		\
 	ephy-action-helper.c		\
 	ephy-completion-model.c		\
@@ -94,6 +95,9 @@ libephymain_la_SOURCES = \
 	$(INST_H_FILES)			\
 	$(NOINST_H_FILES)
 
+nodist_libephymain_la_SOURCES = \
+	$(TYPES_SOURCE)
+
 if ENABLE_CERTIFICATE_MANAGER
 NOINST_H_FILES += \
 	ephy-cert-manager-dialog.h
@@ -135,9 +139,10 @@ libpyphany_la_SOURCES = \
 	ephy-python-extension.c	\
 	ephy-python-extension.h	\
 	ephy-python-loader.c	\
-	ephy-python-loader.h	\
-	$(BUILT_PYPHANY_SOURCE)	\
-	$(TYPES_SOURCE)
+	ephy-python-loader.h
+	
+nodist_libpyphany_la_SOURCES = \
+	$(BUILT_PYPHANY_SOURCE)
 
 libpyphany_la_CPPFLAGS = \
 	-I$(top_srcdir)/lib		\
@@ -220,7 +225,7 @@ if ENABLE_PYTHON
 pydefsdir = $(datadir)/pygtk/2.0/defs
 pydefs_DATA = epiphany.defs
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	epiphany.override	\
 	$(pydefs_DATA)
 endif
@@ -281,6 +286,16 @@ stamp-ephy-type-builtins.h: $(INST_H_FILES) $(NOINST_H_FILES)
 	&& rm -f xgen-$(@F) \
 	&& echo timestamp > $(@F)
 
+ephy-dbus-server-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile
+	$(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-server $< > xgen-$(@F) \
+	&& ( cmp -s xgen-$(@F) $(@F) || cp xgen-$(@F) $(@F) ) \
+	&& rm -f xgen-$(@F)
+	
+ephy-dbus-client-bindings.h: $(top_srcdir)/data/epiphany-service.xml Makefile
+	$(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-client $< > xgen-$(@F) \
+	&& ( cmp -s xgen-$(@F) $(@F) || cp xgen-$(@F) $(@F) ) \
+	&& rm -f xgen-$(@F)
+
 epiphany.c: epiphany.defs epiphany.override
 	( cd $(srcdir) && $(PYGTK_CODEGEN) \
 		--register $(PYGTK_DEFSDIR)/pango-types.defs \
@@ -289,12 +304,6 @@ epiphany.c: epiphany.defs epiphany.override
 		--override $*.override \
 		--prefix py$* $(<F) ) > $@ 
 
-ephy-dbus-server-bindings.h:  $(top_builddir)/data/epiphany-service.xml
-	$(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-server $< > $@
-	
-ephy-dbus-client-bindings.h:  $(top_builddir)/data/epiphany-service.xml
-	$(DBUS_BINDING_TOOL) --prefix=ephy_activation --mode=glib-client $< > $@
-
 CLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 DISTCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
 MAINTAINERCLEANFILES = $(stamp_files) $(BUILT_SOURCES)
@@ -471,3 +480,11 @@ check-python-binding:
 #check-local: check-python-binding
 
 endif
+
+dist-check-python-binding:
+if !ENABLE_PYTHON
+        @echo "Python bindings must be enabled in order to make dist!"
+        @false
+endif
+
+dist-hook: dist-check-python-binding
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 29c85d9c5..4901a385d 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -28,7 +28,6 @@ NOINST_H_FILES =		 	\
 	ephy-nodes-cover.h
 
 libephybookmarks_la_SOURCES = 		\
-	$(BUILT_SOURCES)		\
 	ephy-bookmarks.c		\
 	ephy-bookmark-action.c		\
 	ephy-bookmarks-editor.c		\
@@ -50,6 +49,9 @@ libephybookmarks_la_SOURCES = 		\
 	$(NOINST_H_FILES)		\
 	$(INST_H_FILES)
 
+nodist_libephybookmarks_la_SOURCES = 	\
+	$(BUILT_SOURCES)
+
 BUILT_SOURCES =	$(TYPES_SOURCE)
 
 TYPES_SOURCE = \