metacity r3985 - in trunk: . po src

[tthurman svn gnome org]

Author: tthurman
Date: Wed Oct 22 13:08:44 2008
New Revision: 3985
URL: http://svn.gnome.org/viewvc/metacity?rev=3985&view=rev

Log:
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



Modified:
   trunk/ChangeLog
   trunk/po/POTFILES.in
   trunk/src/Makefile.am

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Wed Oct 22 13:08:44 2008
@@ -10,14 +10,14 @@
 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

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Oct 22 13:08:44 2008
@@ -96,7 +96,9 @@
 	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 @@
         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 @@
           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