diff options
| author | Emanuele Aina <emanuele.aina@collabora.com> | 2012-03-06 07:04:51 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-03-06 23:14:47 +0800 |
| commit | aeab15ec37370f3c3aa8b4e1a4aec480109a6803 (patch) | |
| tree | 4c79d77e6f5b877208c0706f70f448a89e00dd62 /data | |
| parent | 912a95b7ceb56e16854fa09af9c31cb33b6303ca (diff) | |
| download | gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.tar gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.tar.gz gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.tar.bz2 gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.tar.lz gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.tar.xz gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.tar.zst gsoc2013-empathy-aeab15ec37370f3c3aa8b4e1a4aec480109a6803.zip | |
Run from the source directory without installing
Use the tools/empathy-env wrapper to set an appropriate environment
and launch the compiled programs without installing them.
https://bugzilla.gnome.org/show_bug.cgi?id=671447
Diffstat (limited to 'data')
| -rw-r--r-- | data/.gitignore | 1 | ||||
| -rw-r--r-- | data/Makefile.am | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/data/.gitignore b/data/.gitignore index e004da8ed..2c0f33226 100644 --- a/data/.gitignore +++ b/data/.gitignore @@ -2,6 +2,7 @@ empathy.desktop empathy.desktop.in org.gnome.Empathy.gschema.valid org.gnome.Empathy.gschema.xml +gschemas.compiled org.freedesktop.Telepathy.Client.Empathy.Chat.service org.freedesktop.Telepathy.Client.Empathy.AudioVideo.service org.freedesktop.Telepathy.Client.Empathy.Call.service diff --git a/data/Makefile.am b/data/Makefile.am index f3da574ae..a2be750cf 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -15,6 +15,13 @@ gsettings_SCHEMAS = $(gsettings_files:.xml.in=.xml) @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ +# We need to compile schemas at make time +# to run from source tree +gschemas.compiled: $(gsettings_SCHEMAS:.xml=.valid) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --targetdir=. . + +all-local: gschemas.compiled + convertdir = $(datarootdir)/GConf/gsettings convert_DATA = \ empathy.convert @@ -82,4 +89,5 @@ DISTCLEANFILES = \ $(schemas_DATA) \ $(servicefile_DATA) \ $(gsettings_SCHEMAS) \ + gschemas.compiled \ $(NULL) |