Fix build system, make distcheck now works.

2007-08-19 Xavier Claessens  <xclaesse@gmail.com>

	* python/pyempathy/Makefile.am:
	* python/pyempathy/pyempathy.override:
	* python/pyempathygtk/Makefile.am: Fix build system, make distcheck now
	works.

svn path=/trunk/; revision=265

diff --git a/ChangeLog b/ChangeLog
index 9f2c7e0a524e7ca8b68f8344155373529e099e38..57b5fde00178b3ab7b75b1ba3d2bc74786d79d4a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-08-19 Xavier Claessens  <xclaesse@gmail.com>
+
+       * python/pyempathy/Makefile.am:
+       * python/pyempathy/pyempathy.override:
+       * python/pyempathygtk/Makefile.am: Fix build system, make distcheck now
+       works.
+
 2007-08-19 Xavier Claessens  <xclaesse@gmail.com>
 
        * python/pyempathy/pyempathy.defs:

diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index 3c0bdbf2d317df6ae25e1555141c897cb4e8e190..4778fdf20340c5a6a96c10f5b1ed984e6196f5dc 100644 (file)
--- a/python/pyempathy/Makefile.am
+++ b/python/pyempathy/Makefile.am
@@ -28,11 +28,16 @@ empathy_la_LDFLAGS =                                        \
        -module -avoid-version
 
 pyempathy.c: pyempathy.override pyempathy.defs
-       pygtk-codegen-2.0 --prefix empathy              \
+       pygtk-codegen-2.0                               \
+               --prefix empathy                        \
                --register $(PYDEFS)/gdk-types.defs     \
                --register $(PYDEFS)/gtk-types.defs     \
                --override pyempathy.override           \
                pyempathy.defs > $@ 
 
+EXTRA_DIST =                   \
+       pyempathy.override      \
+       pyempathy.defs
+
 CLEANFILES = $(BUILT_SOURCES)
 

diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override
index 82433927300f60482d5c3485cbb299e0668c9575..607a9e520f8f97688fd1e484f1e0b57483a78764 100644 (file)
--- a/python/pyempathy/pyempathy.override
+++ b/python/pyempathy/pyempathy.override
@@ -14,7 +14,6 @@ headers
 #include "empathy-filter.h"
 #include "empathy-idle.h"
 #include "empathy-log-manager.h"
-#include "empathy-marshal.h"
 #include "empathy-message.h"
 #include "empathy-presence.h"
 #include "empathy-time.h"

diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am
index fa8f9f9dd26d759a6aafce821a0e394686e0eae3..f7338654e4d08188309a93b790671e7ad1319476 100644 (file)
--- a/python/pyempathygtk/Makefile.am
+++ b/python/pyempathygtk/Makefile.am
@@ -28,12 +28,17 @@ empathygtk_la_LDFLAGS =                                     \
        -module -avoid-version
 
 pyempathygtk.c: pyempathygtk.override pyempathygtk.defs
-       pygtk-codegen-2.0 --prefix empathy                              \
+       pygtk-codegen-2.0                                               \
+               --prefix empathy                                        \
                --register $(PYDEFS)/gdk-types.defs                     \
                --register $(PYDEFS)/gtk-types.defs                     \
                --register ../pyempathy/pyempathy.defs                  \
                --override pyempathygtk.override                        \
                pyempathygtk.defs > $@ 
 
+EXTRA_DIST =                   \
+       pyempathygtk.override   \
+       pyempathygtk.defs
+
 CLEANFILES = $(BUILT_SOURCES)