[ontv] Make OnTV pass make distcheck

[Olof Kindgren <olki src gnome org>]

commit a2e2bf510d1bc5bbb675ddd4f14c288353d2790f
Author: Olof Kindgren <olki src gnome org>
Date:   Mon Jun 14 19:27:59 2010 +0200

    Make OnTV pass make distcheck
    
    Some changes were made to keep "make distcheck" happy.
    Unfortunately I'm not very good at using autotools, so this might
    be completely wrong
    * ChangeLog is generated from git log
    * Executables are distributed
    * Unused pygtk-codegen is removed
    * keybindingsdir is relative to datadir
    * ontv.schemas.in.in is added to extra_dist
    * POTFILES.in and .skip are updated

 Makefile.am      |   22 +++--
 bin/Makefile.am  |    4 +-
 configure.ac     |    4 -
 data/Makefile.am |    3 +-
 po/POTFILES.in   |    9 +-
 po/POTFILES.skip |    1 +
 svn2cl.xsl       |  295 ------------------------------------------------------
 7 files changed, 24 insertions(+), 314 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 50e6f97..61d4bef 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,6 @@ DISTCLEANFILES =		\
 	intltool-update
 
 EXTRA_DIST =			\
-	ChangeLog		\
 	FAQ			\
 	HACKING			\
 	README			\
@@ -14,11 +13,16 @@ EXTRA_DIST =			\
 	intltool-merge.in	\
 	intltool-update.in
 
-ChangeLog:
-	@if test -f $(top_srcdir)/.svn/entries; then \
-	    svn log -v --xml http://svn.gnome.org/svn/ontv | \
-	    xsltproc --stringparam strip-prefix "ontv/trunk" \
-	    --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \
-	    fi
-
-.PHONY: ChangeLog
+dist-hook:
+	@if test -d "$(srcdir)/.git"; \
+	then \
+		echo Creating ChangeLog && \
+		( cd "$(top_srcdir)" && \
+		echo '# Generated by Makefile. Do not edit.'; echo; \
+		  $(top_srcdir)/missing --run git log --stat ) > ChangeLog.tmp \
+		&& mv -f ChangeLog.tmp $(top_distdir)/ChangeLog \
+		|| ( rm -f ChangeLog.tmp ; \
+		     echo Failed to generate ChangeLog >&2 ); \
+	else \
+		echo A git clone is required to generate a ChangeLog >&2; \
+	fi
diff --git a/bin/Makefile.am b/bin/Makefile.am
index 83c1006..32fccc3 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,5 +1,5 @@
-libexec_SCRIPTS = ontv-applet
-bin_SCRIPTS = ontv ontv-dbus
+dist_libexec_SCRIPTS = ontv-applet
+dist_bin_SCRIPTS = ontv ontv-dbus
 
 ontv_applet_in_file = ontv-applet.in
 ontv_in_file = ontv.in
diff --git a/configure.ac b/configure.ac
index 358a3b9..3881b83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,10 +71,6 @@ else
     AC_MSG_ERROR([vte Python module required to build ontv])
 fi
 
-AC_PATH_PROG(PYGTK_CODEGEN, pygtk-codegen-2.0, no)
-if test "x$PYGTK_CODEGEN" = xno; then
-    AC_MSG_ERROR(could not find pygtk-codegen-2.0 script)
-fi
 
 AC_MSG_CHECKING(for pygtk defs)
 PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
diff --git a/data/Makefile.am b/data/Makefile.am
index f1d99e9..7a63695 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -41,7 +41,7 @@ schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
 xml_in_files = 90-ontv.xml.in
 
 if CUSTOM_KEYBINDINGS
-xmldir   = $(KEYBINDINGS_DIR)
+xmldir   = $(datadir)/gnome-control-center/keybindings
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 endif
 
@@ -55,6 +55,7 @@ DISTCLEANFILES =		\
 	$(xml_DATA)
 
 EXTRA_DIST =				\
+	ontv.schemas.in.in		\
 	GNOME_OnTVApplet.server.in.in	\
 	GNOME_OnTVApplet.xml		\
 	$(glade_DATA)			\
diff --git a/po/POTFILES.in b/po/POTFILES.in
index febc9f6..1ae4ce2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,14 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
 data/90-ontv.xml.in
+data/about_dialog.ui
 data/GNOME_OnTVApplet.server.in.in
 data/GNOME_OnTVApplet.xml
-data/ontv.glade
 data/ontv.schemas.in.in
+data/preferences_dialog.ui
+data/program_dialog.ui
+data/search_dialog.ui
+data/status_icon.ui
 ontv/applet.py
 ontv/assistant.py
 ontv/channel.py
@@ -12,9 +16,8 @@ ontv/config.py
 ontv/dialogs.py
 ontv/gui.py
 ontv/listings.py
-ontv/main.py
 ontv/notify.py
-data/ontv.ui
+ontv/ontv_core.py
 ontv/program.py
 ontv/reminders.py
 ontv/utils.py
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 0a72765..ec62d9a 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -2,3 +2,4 @@
 # should NOT be translated.
 # Please keep this file sorted alphabetically.
 data/GNOME_OnTVApplet.server.in
+data/ontv.schemas.in