summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Thurman <tthurman@gnome.org>2008-10-23 04:02:48 +0000
committerThomas James Alexander Thurman <tthurman@src.gnome.org>2008-10-23 04:02:48 +0000
commit445b6ae6ede7de72a023b134f4f568eb4f706beb (patch)
treeca3b4ffb1392d598ab1ee7488be0cc919b0fcc4c
parent2e9857b5604461e76805373f2974a0c922ec4277 (diff)
downloadmetacity-445b6ae6ede7de72a023b134f4f568eb4f706beb.tar.gz
support builds outside tree properly. ditto.
2008-10-22 Thomas Thurman <tthurman@gnome.org> * src/core/schema-bindings.c: support builds outside tree properly. * src/Makefile.am: ditto. svn path=/trunk/; revision=3989
-rw-r--r--ChangeLog1
-rw-r--r--src/Makefile.am9
2 files changed, 6 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 1d9e1561..f97390fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
2008-10-22 Thomas Thurman <tthurman@gnome.org>
* src/core/schema-bindings.c: support builds outside tree properly.
+ * src/Makefile.am: ditto.
2008-10-22 Thomas Thurman <tthurman@gnome.org>
diff --git a/src/Makefile.am b/src/Makefile.am
index 932ed354..0615a62a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -139,12 +139,13 @@ metacity_dialog_SOURCES= \
ui/metacity-dialog.c
schema_bindings_SOURCES = \
- core/schema-bindings.c
+ core/schema-bindings.c \
+ metacity.schemas.in.in
schema_bindings_LDADD = @METACITY_LIBS@
-metacity.schemas.in: schema_bindings metacity.schemas.in.in
- @echo Generating keybinding schemas...
- cd ${srcdir};${builddir}/schema_bindings > metacity.schemas.in
+metacity.schemas.in: schema_bindings ${srcdir}/metacity.schemas.in.in
+ @echo Generating keybinding schemas... ${srcdir}/metacity.schemas.in.in
+ ${builddir}/schema_bindings ${srcdir}/metacity.schemas.in.in ${builddir}/metacity.schemas.in
bin_PROGRAMS=metacity metacity-theme-viewer
libexec_PROGRAMS=metacity-dialog