brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes to make distcheck work again.

Browse Source 
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
This commit is contained in:
Thomas Thurman 2008-10-22 13:08:44 +00:00 committed by Thomas James Alexander Thurman
parent 9cb0b6ff52
commit 788cbc91b2
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -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> 2008-10-22 Götz Waschk <waschk@mandriva.org>
* configure.in: add libm reference. Closes #557357. * configure.in: add libm reference. Closes #557357.

4
po/POTFILES.in
View File

@ -10,14 +10,14 @@ src/core/keybindings.c
src/core/main.c src/core/main.c
src/core/prefs.c src/core/prefs.c
src/core/screen.c src/core/screen.c
src/core/screen-bindings.h
src/core/schema-bindings.c src/core/schema-bindings.c
src/core/session.c src/core/session.c
src/core/util.c src/core/util.c
src/core/window-bindings.h
src/core/window.c src/core/window.c
src/core/window-props.c src/core/window-props.c
src/core/xprops.c src/core/xprops.c
src/include/screen-bindings.h
src/include/window-bindings.h
src/metacity.desktop.in src/metacity.desktop.in
src/metacity.schemas.in.in src/metacity.schemas.in.in
src/metacity-wm.desktop.in src/metacity-wm.desktop.in

10
src/Makefile.am
View File

@ -96,7 +96,9 @@ metacity_SOURCES= \
ui/theme.h \ ui/theme.h \
ui/themewidget.c \ ui/themewidget.c \
ui/themewidget.h \ 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 # by setting libmetacity_private_la_CFLAGS, the files shared with
# metacity proper will be compiled with different names. # metacity proper will be compiled with different names.
@ -140,9 +142,9 @@ schema_bindings_SOURCES = \
core/schema-bindings.c core/schema-bindings.c
schema_bindings_LDADD = @METACITY_LIBS@ schema_bindings_LDADD = @METACITY_LIBS@
metacity.schemas.in: schema_bindings metacity.schemas.in: schema_bindings metacity.schemas.in.in
@echo Generating keybinding schemas... @echo Generating keybinding schemas...
./schema_bindings > metacity.schemas.in cd ${srcdir};${builddir}/schema_bindings > metacity.schemas.in
bin_PROGRAMS=metacity metacity-theme-viewer bin_PROGRAMS=metacity metacity-theme-viewer
libexec_PROGRAMS=metacity-dialog libexec_PROGRAMS=metacity-dialog
@ -199,7 +201,7 @@ VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
stock_delete_data $(srcdir)/stock_delete.png stock_delete_data $(srcdir)/stock_delete.png
BUILT_SOURCES = inlinepixbufs.h 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) inlinepixbufs.h: $(IMAGES)
$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h