aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2007-08-20 05:07:38 +0800
committerxclaesse <xclaesse@4ee84921-47dd-4033-b63a-18d7a039a3e4>2007-08-20 05:07:38 +0800
commit4bb650a22f3e2b56d8e8c81d4985ed841fee1334 (patch)
tree73f279358508cdacdbb2017b499a7547d865f1c3
parentee80a3d68bc38e200842ef83353a25b3630feb82 (diff)
downloadgsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.tar
gsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.tar.gz
gsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.tar.bz2
gsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.tar.lz
gsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.tar.xz
gsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.tar.zst
gsoc2013-empathy-4bb650a22f3e2b56d8e8c81d4985ed841fee1334.zip
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. git-svn-id: svn+ssh://svn.gnome.org/svn/empathy/trunk@265 4ee84921-47dd-4033-b63a-18d7a039a3e4
-rw-r--r--ChangeLog7
-rw-r--r--python/pyempathy/Makefile.am7
-rw-r--r--python/pyempathy/pyempathy.override1
-rw-r--r--python/pyempathygtk/Makefile.am7
4 files changed, 19 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 9f2c7e0a5..57b5fde00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
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:
* python/pyempathy/pyempathymodule.c:
* python/pyempathy/Makefile.am:
diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index 3c0bdbf2d..4778fdf20 100644
--- 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 824339273..607a9e520 100644
--- 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 fa8f9f9dd..f7338654e 100644
--- 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)