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

Stop linking to the gnome libraries, except in the shell and in the font

Browse source 
Sun Oct 26 19:15:22 2008  Søren Sandmann  <sandmann@redhat.com>

	* configure.in: Stop linking to the gnome libraries, except in the
	shell and in the font viewer.


svn path=/trunk/; revision=9127
This commit is contained in:
Søren Sandmann 2008-10-26 23:15:42 +00:00 • committed by Søren Sandmann Pedersen
parent 2f4279fc08
commit fab37a0965
4 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Oct 26 19:15:22 2008 Søren Sandmann <sandmann@redhat.com>
* configure.in: Stop linking to the gnome libraries, except in the
shell and in the font viewer.
2008-10-26 Jens Granseuer <jensgr@gmx.net>
* configure.in: bump gnome-desktop requirement to 2.25.1

6
configure.in
View file

@ -89,13 +89,12 @@ COMMON_MODULES="gtk+-2.0 >= 2.13.1 dnl
glib-2.0 >= 2.17.4 dnl
gio-2.0 dnl
gconf-2.0 dnl
libgnomeui-2.0 >= 2.2.0 dnl
libglade-2.0 >= 2.0.0 dnl
gnome-desktop-2.0 >= 2.25.1"
PKG_CHECK_MODULES(LIBSLAB, $COMMON_MODULES gnome-desktop-2.0 librsvg-2.0 libgnome-menu pango eel-2.0)
PKG_CHECK_MODULES(CAPPLET, $COMMON_MODULES)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1 libpanelapplet-2.0)
PKG_CHECK_MODULES(GNOME, libgnomeui-2.0)
PKG_CHECK_MODULES(GNOMECC, $COMMON_MODULES libgnome-menu >= 2.10.1)
PKG_CHECK_MODULES(GNOMECC_SHELL, $COMMON_MODULES libgnomeui-2.0 libgnome-menu libpanelapplet-2.0)
PKG_CHECK_MODULES(DBUS, dbus-1 dbus-glib-1)
PKG_CHECK_MODULES(GNOME_DESKTOP, gnome-desktop-2.0)
PKG_CHECK_MODULES(DEFAULT_APPLICATIONS_CAPPLET, libxml-2.0)
@ -120,6 +119,7 @@ if $PKG_CONFIG --exists xft ; then
fi
PKG_CHECK_MODULES(FONT_CAPPLET, $COMMON_MODULES $xft_modules)
PKG_CHECK_MODULES(FONT_VIEWER, $COMMON_MODULES $xft_modules gnome-vfs-2.0 libgnomeui-2.0)
PKG_CHECK_MODULES(AT_CAPPLET, $COMMON_MODULES)

6
font-viewer/Makefile.am
View file

@ -1,13 +1,13 @@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
INCLUDES = $(FONT_VIEWER_CFLAGS) $(GNOMECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
bin_PROGRAMS = gnome-thumbnail-font gnome-font-viewer
gnome_thumbnail_font_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(FONT_CAPPLET_LIBS)
gnome_thumbnail_font_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(FONT_VIEWER_LIBS)
gnome_thumbnail_font_SOURCES = ftstream-vfs.c font-thumbnailer.c
gnome_font_viewer_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(FONT_CAPPLET_LIBS)
gnome_font_viewer_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(FONT_VIEWER_LIBS)
gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
schemasdir = $(GCONF_SCHEMA_FILE_DIR)

4
shell/Makefile.am
View file

@ -1,6 +1,6 @@
INCLUDES = \
-I$(top_srcdir)/libslab \
$(GNOMECC_CFLAGS)
$(GNOMECC_SHELL_CFLAGS)
bin_PROGRAMS = gnome-control-center
@ -8,7 +8,7 @@ gnome_control_center_SOURCES = \
control-center.c
gnome_control_center_LDADD = \
$(GNOMECC_LIBS) \
$(GNOMECC_SHELL_LIBS) \
$(top_builddir)/libslab/libslab.la
AM_CPPFLAGS = \