aboutsummaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2009-02-03 04:10:06 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2009-02-03 04:10:06 +0800
commit4be89d9fab208320c3df9d81334f8d1e9c390f7b (patch)
treee29ca490d0778df5e931b6a74558f045bcd58b85 /python
parent4d7df20da0eec9c250aa4afeefa4f8a26bd35240 (diff)
downloadgsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.tar
gsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.tar.gz
gsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.tar.bz2
gsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.tar.lz
gsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.tar.xz
gsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.tar.zst
gsoc2013-empathy-4be89d9fab208320c3df9d81334f8d1e9c390f7b.zip
Allow Empathy to be built from outside the source tree.
Patch by Theppitak Karoonboonyanan, fix bug #570080. svn path=/trunk/; revision=2372
Diffstat (limited to 'python')
-rw-r--r--python/pyempathy/Makefile.am9
-rw-r--r--python/pyempathygtk/Makefile.am11
2 files changed, 13 insertions, 7 deletions
diff --git a/python/pyempathy/Makefile.am b/python/pyempathy/Makefile.am
index a7efea367..fa973bf03 100644
--- a/python/pyempathy/Makefile.am
+++ b/python/pyempathy/Makefile.am
@@ -3,6 +3,7 @@ PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/libempathy \
+ -I$(top_builddir)/libempathy \
-I$(top_srcdir) \
-DDATADIR=\""$(datadir)"\" \
$(PYTHON_BINDING_CFLAGS) \
@@ -16,7 +17,9 @@ pyempathydir = $(pyexecdir)
pyempathy_LTLIBRARIES = empathy.la
empathy_la_SOURCES = \
- pyempathymodule.c \
+ pyempathymodule.c
+
+nodist_empathy_la_SOURCES = \
pyempathy.c
empathy_la_LIBADD = \
@@ -31,8 +34,8 @@ pyempathy.c: pyempathy.override pyempathy.defs
--prefix empathy \
--register $(PYDEFS)/gdk-types.defs \
--register $(PYDEFS)/gtk-types.defs \
- --override pyempathy.override \
- pyempathy.defs > $@
+ --override $(srcdir)/pyempathy.override \
+ $(srcdir)/pyempathy.defs > $@
EXTRA_DIST = \
pyempathy.override \
diff --git a/python/pyempathygtk/Makefile.am b/python/pyempathygtk/Makefile.am
index d44e1f4ab..ba0ee11df 100644
--- a/python/pyempathygtk/Makefile.am
+++ b/python/pyempathygtk/Makefile.am
@@ -3,6 +3,7 @@ PYDEFS=`pkg-config --variable=defsdir pygtk-2.0`
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/libempathy-gtk \
+ -I$(top_builddir)/libempathy-gtk \
-I$(top_srcdir) \
-DDATADIR=\""$(datadir)"\" \
$(PYTHON_BINDING_CFLAGS) \
@@ -15,7 +16,9 @@ pyempathygtkdir = $(pyexecdir)
pyempathygtk_LTLIBRARIES = empathygtk.la
empathygtk_la_SOURCES = \
- pyempathygtkmodule.c \
+ pyempathygtkmodule.c
+
+nodist_empathygtk_la_SOURCES = \
pyempathygtk.c
empathygtk_la_LIBADD = \
@@ -31,9 +34,9 @@ pyempathygtk.c: pyempathygtk.override pyempathygtk.defs
--prefix empathy \
--register $(PYDEFS)/gdk-types.defs \
--register $(PYDEFS)/gtk-types.defs \
- --register ../pyempathy/pyempathy.defs \
- --override pyempathygtk.override \
- pyempathygtk.defs > $@
+ --register $(srcdir)/../pyempathy/pyempathy.defs \
+ --override $(srcdir)/pyempathygtk.override \
+ $(srcdir)/pyempathygtk.defs > $@
EXTRA_DIST = \
pyempathygtk.override \