From 788cbc91b2517cecdbb00e454307a65f64b29cff Mon Sep 17 00:00:00 2001
From: Thomas Thurman <tthurman@gnome.org>
Date: Wed, 22 Oct 2008 13:08:44 +0000
Subject: [PATCH] Fixes to make distcheck work again.
2008-10-22 Thomas Thurman <tthurman@gnome.org>
Fixes to make distcheck work again.
* src/Makefile.am: include *-binding.h, and make the schema
building work when builddir != srcdir
* po/POTFILES.in (src/core/keybindings.): include *-binding.h
svn path=/trunk/; revision=3985
---
ChangeLog | 8 ++++++++
po/POTFILES.in | 4 ++--
src/Makefile.am | 10 ++++++----
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index c45b92ab1..a5c80296e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-10-22 Thomas Thurman <tthurman@gnome.org>
+
+ Fixes to make distcheck work again.
+
+ * src/Makefile.am: include *-binding.h, and make the schema
+ building work when builddir != srcdir
+ * po/POTFILES.in (src/core/keybindings.): include *-binding.h
+
2008-10-22 Götz Waschk <waschk@mandriva.org>
* configure.in: add libm reference. Closes #557357.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index e53f89ca9..fe5eafbdb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -10,14 +10,14 @@ src/core/keybindings.c
src/core/main.c
src/core/prefs.c
src/core/screen.c
-src/core/screen-bindings.h
src/core/schema-bindings.c
src/core/session.c
src/core/util.c
-src/core/window-bindings.h
src/core/window.c
src/core/window-props.c
src/core/xprops.c
+src/include/screen-bindings.h
+src/include/window-bindings.h
src/metacity.desktop.in
src/metacity.schemas.in.in
src/metacity-wm.desktop.in
diff --git a/src/Makefile.am b/src/Makefile.am
index fc0552264..932ed354b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -96,7 +96,9 @@ metacity_SOURCES= \
ui/theme.h \
ui/themewidget.c \
ui/themewidget.h \
- ui/ui.c
+ ui/ui.c \
+ include/window-bindings.h \
+ include/screen-bindings.h
# by setting libmetacity_private_la_CFLAGS, the files shared with
# metacity proper will be compiled with different names.
@@ -140,9 +142,9 @@ schema_bindings_SOURCES = \
core/schema-bindings.c
schema_bindings_LDADD = @METACITY_LIBS@
-metacity.schemas.in: schema_bindings
+metacity.schemas.in: schema_bindings metacity.schemas.in.in
@echo Generating keybinding schemas...
- ./schema_bindings > metacity.schemas.in
+ cd ${srcdir};${builddir}/schema_bindings > metacity.schemas.in
bin_PROGRAMS=metacity metacity-theme-viewer
libexec_PROGRAMS=metacity-dialog
@@ -199,7 +201,7 @@ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h
-CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas 50-metacity-desktop-key.xml 50-metacity-key.xml
+CLEANFILES = inlinepixbufs.h metacity.desktop metacity-wm.desktop metacity.schemas metacity.schemas.in 50-metacity-desktop-key.xml 50-metacity-key.xml
inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h