applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix various issues raised by running distcheck

Browse source
This commit is contained in:
Thomas Wood 2010-05-21 14:48:34 +01:00
parent abfb0b96dc
commit 95143ad4c7
6 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Makefile.am
View file

@ -1,6 +1,6 @@
SUBDIRS = po libwindow-settings libgnome-control-center shell capplets panels \ SUBDIRS = po libwindow-settings libgnome-control-center shell capplets panels \
font-viewer help docs font-viewer help docs
DIST_SUBDIRS = po libwindow-settings capplets font-viewer help shell typing-break examples DIST_SUBDIRS = po libwindow-settings capplets font-viewer help shell typing-break docs examples panels libgnome-control-center
if HAVE_TYPING_BREAK if HAVE_TYPING_BREAK
SUBDIRS += typing-break SUBDIRS += typing-break
@ -47,7 +47,7 @@ EXTRA_DIST = \
MAINTAINERS \ MAINTAINERS \
gnome-doc-utils.make gnome-doc-utils.make
DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --enable-gtk-doc DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --disable-update-mimedb --enable-gtk-doc --enable-examples
GITIGNOREFILES=m4 GITIGNOREFILES=m4

1
configure.ac
View file

@ -2,7 +2,6 @@ m4_define([gnome_control_center_version], 2.31.1)
AC_INIT([gnome-control-center], [gnome_control_center_version], AC_INIT([gnome-control-center], [gnome_control_center_version],
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center]) [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([shell]) AC_CONFIG_SRCDIR([shell])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])

2
docs/reference/libgnome-control-center/Makefile.am
View file

@ -66,7 +66,7 @@ HTML_IMAGES=
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
# e.g. content_files=running.sgml building.sgml changes-2.0.sgml # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
content_files= content_files=version.xml
# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded # SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
# These files must be listed here *and* in content_files # These files must be listed here *and* in content_files

22
po/POTFILES.in
View file

@ -64,10 +64,10 @@ capplets/keyboard/gnome-keyboard-properties-xkbmc.c
capplets/keyboard/gnome-keyboard-properties-xkbot.c capplets/keyboard/gnome-keyboard-properties-xkbot.c
capplets/keyboard/gnome-keyboard-properties-xkbpv.c capplets/keyboard/gnome-keyboard-properties-xkbpv.c
capplets/keyboard/keyboard.desktop.in.in capplets/keyboard/keyboard.desktop.in.in
capplets/mouse/gnome-mouse-accessibility.c panels/mouse/gnome-mouse-accessibility.c
capplets/mouse/gnome-mouse-properties.c panels/mouse/gnome-mouse-properties.c
[type: gettext/glade]capplets/mouse/gnome-mouse-properties.ui [type: gettext/glade]panels/mouse/gnome-mouse-properties.ui
capplets/mouse/gnome-settings-mouse.desktop.in.in panels/mouse/gnome-settings-mouse.desktop.in.in
capplets/network/gnome-network-properties.c capplets/network/gnome-network-properties.c
capplets/network/gnome-network-properties.desktop.in.in capplets/network/gnome-network-properties.desktop.in.in
[type: gettext/glade]capplets/network/gnome-network-properties.ui [type: gettext/glade]capplets/network/gnome-network-properties.ui
@ -78,7 +78,7 @@ libwindow-settings/gnome-wm-manager.c
libwindow-settings/metacity-window-manager.c libwindow-settings/metacity-window-manager.c
shell/control-center.c shell/control-center.c
shell/control-center.schemas.in shell/control-center.schemas.in
shell/gnomecc.desktop.in.in shell/gnome-control-center.desktop.in.in
shell/gnomecc.directory.in shell/gnomecc.directory.in
typing-break/drw-break-window.c typing-break/drw-break-window.c
typing-break/drwright.c typing-break/drwright.c
@ -87,10 +87,8 @@ font-viewer/fontilus.schemas.in
font-viewer/font-view.c font-viewer/font-view.c
font-viewer/gnome-font-viewer.desktop.in.in font-viewer/gnome-font-viewer.desktop.in.in
font-viewer/font-thumbnailer.c font-viewer/font-thumbnailer.c
libslab/app-shell.c examples/gnome-example-panel.desktop.in.in
libslab/application-tile.c panels/mouse/gnome-settings-mouse.desktop.in.in
libslab/bookmark-agent.c shell/gnome-control-center.desktop.in.in
libslab/directory-tile.c [type: gettext/glade]shell/shell.ui
libslab/document-tile.c
libslab/search-bar.c
libslab/system-tile.c

7
po/POTFILES.skip
View file

@ -22,3 +22,10 @@ capplets/localization/localization.ui
schemas/apps_gnome_settings_daemon_default_editor.schemas.in schemas/apps_gnome_settings_daemon_default_editor.schemas.in
schemas/apps_gnome_settings_daemon_keybindings.schemas.in schemas/apps_gnome_settings_daemon_keybindings.schemas.in
schemas/apps_gnome_settings_daemon_screensaver.schemas.in schemas/apps_gnome_settings_daemon_screensaver.schemas.in
examples/gnome-example-panel.desktop.in
panels/mouse/gnome-settings-mouse.desktop.in
shell/gnome-control-center.desktop.in
examples/gnome-example-panel.desktop.in
panels/mouse/gnome-settings-mouse.desktop.in
shell/gnome-control-center.desktop.in

1
shell/Makefile.am
View file

@ -20,7 +20,6 @@ cc-shell-marshal.c: cc-shell-marshal.list
gnome_control_center_SOURCES = \ gnome_control_center_SOURCES = \
control-center.c \ control-center.c \
control-center.h \
gnome-control-center.c \ gnome-control-center.c \
gnome-control-center.h \ gnome-control-center.h \
shell-search-renderer.c \ shell-search-renderer.c \