gnome-control-center r9068 - in trunk: . font-viewer

[davyd svn gnome org]

Author: davyd
Date: Thu Oct 16 13:52:09 2008
New Revision: 9068
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=9068&view=rev

Log:
2008-10-16  Davyd Madeley  <davyd madeley id au>

        * configure.in:
        * font-viewer/Makefile.am:
        * Makefile.am:
        - hook gnome-font-viewer and gnome-thumbnail font back into the build
        - need to check to see if the strings were lost from the translations


Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/font-viewer/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Oct 16 13:52:09 2008
@@ -1,4 +1,4 @@
-SUBDIRS = po libwindow-settings libslab capplets shell help
+SUBDIRS = po libwindow-settings libslab capplets font-viewer shell help
 
 if HAVE_TYPING_BREAK
 SUBDIRS += typing-break

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct 16 13:52:09 2008
@@ -369,6 +369,8 @@
 capplets/sound/gnome-settings-sound.desktop.in
 capplets/windows/Makefile
 capplets/windows/window-properties.desktop.in
+font-viewer/Makefile
+font-viewer/gnome-font-viewer.desktop.in
 help/Makefile
 libslab/Makefile
 libslab/libslab.pc

Modified: trunk/font-viewer/Makefile.am
==============================================================================
--- trunk/font-viewer/Makefile.am	(original)
+++ trunk/font-viewer/Makefile.am	Thu Oct 16 13:52:09 2008
@@ -1,14 +1,13 @@
 
-INCLUDES = $(FONT_METHOD_CFLAGS) $(FONT_THUMBNAILER_CFLAGS) $(FONT_VIEW_CFLAGS) \
-  $(FONT_CONTEXT_MENU_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
+INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -DDIRECTORY_DIR=\"$(directorydir)\" \
   -DGNOMELOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = gnome-thumbnail-font gnome-font-viewer
 
-gnome_thumbnail_font_LDADD = $(FONT_THUMBNAILER_LIBS)
+gnome_thumbnail_font_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(FONT_CAPPLET_LIBS)
 gnome_thumbnail_font_SOURCES = ftstream-vfs.c font-thumbnailer.c
 
-gnome_font_viewer_LDADD = $(FONT_VIEW_LIBS)
+gnome_font_viewer_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(FONT_CAPPLET_LIBS)
 gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
 
 schemasdir = $(GCONF_SCHEMA_FILE_DIR)