summaryrefslogtreecommitdiff
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorBastien Nocera <hadess@hadess.net>2007-04-05 09:22:19 +0000
committerBastien Nocera <hadess@src.gnome.org>2007-04-05 09:22:19 +0000
commitf32712937b96f4b7540dea348b42ac24644cc845 (patch)
tree4072165de1eab42751a9ce9f24d325ffe32f4d36 /src/Makefile.am
parent43d4ea3f3b9ee99acd06eb26e18a952d3bd73cce (diff)
downloadmetacity-f32712937b96f4b7540dea348b42ac24644cc845.tar.gz
metacity-f32712937b96f4b7540dea348b42ac24644cc845.tar.bz2
Add new control-center key bindings definitions (Closes: #420145)
2007-04-05 Bastien Nocera <hadess@hadess.net> * src/50-metacity-desktop-key.xml.in: * src/50-metacity-key.xml.in: * src/Makefile.am: Add new control-center key bindings definitions (Closes: #420145) 2007-04-05 Bastien Nocera <hadess@hadess.net> * POTFILES.in: add the XML keys definitions to the list svn path=/trunk/; revision=3170
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 4815aa4..40b349e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -161,6 +161,12 @@ schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_in_files = metacity.schemas.in
schema_DATA = $(schema_in_files:.schemas.in=.schemas)
+@INTLTOOL_XML_NOMERGE_RULE@
+
+xmldir = $(datadir)/control-center/keybindings
+xml_in_files = 50-metacity-desktop-key.xml.in 50-metacity-key.xml.in
+xml_DATA = $(xml_in_files:.xml.in=.xml)
+
@INTLTOOL_SCHEMAS_RULE@
if GCONF_SCHEMAS_INSTALL
@@ -177,7 +183,7 @@ VARIABLES=default_icon_data $(srcdir)/default_icon.png \
stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
@@ -190,4 +196,6 @@ EXTRA_DIST=$(desktopfiles_files) \
$(IMAGES) $(schema_DATA) \
$(desktopfiles_in_files) \
$(schema_in_files) \
+ $(xml_in_files) \
libmetacity-private.pc.in
+