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

prepare for 2.21.5.

Browse source 
2008-01-14  Rodrigo Moya <rodrigo@gnome-db.org>

	* configure.in:
	* NEWS: prepare for 2.21.5.

	* capplets/common/Makefile.am: fixed CFLAGS and LIBS.

	* capplets/common/activate-settings-daemon.c: include new built
	header file for DBus interface.

	* configure.in: check gnome-settings-daemon.

svn path=/trunk/; revision=8395
This commit is contained in:
Rodrigo Moya 2008-01-15 11:45:27 +00:00 • committed by Rodrigo Moya
parent 262ed40e3a
commit 5f3355c499
9 changed files with 109 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

50
capplets/common/Makefile.am
View file

@ -8,32 +8,44 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/libbackground \
-I$(top_srcdir)/libwindow-settings \
@DBUS_CFLAGS@ \
@VFS_CAPPLET_CFLAGS@ \
@GNOME_DESKTOP_CFLAGS@ \
@METACITY_CFLAGS@
$(DBUS_CFLAGS) \
$(VFS_CAPPLET_CFLAGS) \
$(GNOME_DESKTOP_CFLAGS) \
$(METACITY_CFLAGS) \
$(GSD_DBUS_CFLAGS)
noinst_LTLIBRARIES = libcommon.la
libcommon_la_SOURCES = \
activate-settings-daemon.c activate-settings-daemon.h \
capplet-util.c capplet-util.h \
gconf-property-editor.c gconf-property-editor.h \
gconf-property-editor-marshal.c gconf-property-editor-marshal.h \
file-transfer-dialog.c file-transfer-dialog.h \
gnome-theme-info.c gnome-theme-info.h \
wm-common.c wm-common.h \
capplet-stock-icons.c capplet-stock-icons.h \
theme-thumbnail.c theme-thumbnail.h \
gnome-theme-apply.c gnome-theme-apply.h \
gtkrc-utils.c gtkrc-utils.h
activate-settings-daemon.c \
activate-settings-daemon.h \
capplet-stock-icons.c \
capplet-stock-icons.h \
capplet-util.c \
capplet-util.h \
file-transfer-dialog.c \
file-transfer-dialog.h \
gconf-property-editor.c \
gconf-property-editor.h \
gconf-property-editor-marshal.c \
gconf-property-editor-marshal.h \
gnome-theme-apply.c \
gnome-theme-apply.h \
gnome-theme-info.c \
gnome-theme-info.h \
gtkrc-utils.c \
gtkrc-utils.h \
theme-thumbnail.c \
theme-thumbnail.h \
wm-common.c \
wm-common.h
libcommon_la_LIBADD = $(top_builddir)/libbackground/libbackground.la \
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
@METACITY_LIBS@ \
@DBUS_LIBS@ \
@GNOME_DESKTOP_LIBS@
$(METACITY_LIBS) \
$(DBUS_LIBS) \
$(GNOME_DESKTOP_LIBS)
gnome_theme_test_SOURCES = \
gnome-theme-test.c
@ -43,4 +55,4 @@ gnome_theme_test_LDADD = \
$(GNOMECC_CAPPLETS_LIBS)
noinst_PROGRAMS = \
gnome-theme-test
gnome-theme-test

4
capplets/keyboard/ChangeLog
View file

@ -1,3 +1,7 @@
2008-01-14 Rodrigo Moya <rodrigo@gnome-db.org>
* Makefile.am: added missing headers to SOURCES.
2008-01-14 Denis Washington <denisw@svn.gnome.org>
* gnome-keyboard-properties.glade:

20
capplets/keyboard/Makefile.am
View file

@ -3,15 +3,17 @@ cappletname = keyboard
bin_PROGRAMS = gnome-keyboard-properties
gnome_keyboard_properties_SOURCES = gnome-keyboard-properties.c \
gnome-keyboard-properties-a11y.c \
gnome-keyboard-properties-xkb.c \
gnome-keyboard-properties-xkbmc.c \
gnome-keyboard-properties-xkblt.c \
gnome-keyboard-properties-xkbltadd.c \
gnome-keyboard-properties-xkbot.c \
gnome-keyboard-properties-xkbpv.c \
gnome-keyboard-properties-xkb.h
gnome_keyboard_properties_SOURCES = \
gnome-keyboard-properties.c \
gnome-keyboard-properties-a11y.c \
gnome-keyboard-properties-a11y.h \
gnome-keyboard-properties-xkb.c \
gnome-keyboard-properties-xkbmc.c \
gnome-keyboard-properties-xkblt.c \
gnome-keyboard-properties-xkbltadd.c \
gnome-keyboard-properties-xkbot.c \
gnome-keyboard-properties-xkbpv.c \
gnome-keyboard-properties-xkb.h
gnome_keyboard_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(LIBGNOMEKBDUI_LIBS)