gnome-control-center r8389 - in trunk: . capplets/appearance gnome-settings-daemon libwindow-settings vfs-methods/fontilus vfs-methods/themus

[rodrigo svn gnome org]

Author: rodrigo
Date: Mon Jan 14 18:05:06 2008
New Revision: 8389
URL: http://svn.gnome.org/viewvc/gnome-control-center?rev=8389&view=rev

Log:
2008-01-14  Rodrigo Moya <rodrigo gnome-db org>

	* configure.in: disable gnome-settings-daemon build here also.

	* capplets/appearance/Makefile.am:
	* gnome-settings-daemon/Makefile.am:
	* libwindow-settings/Makefile.am:
	* vfs-methods/fontilus/Makefile.am:
	* vfs-methods/themus/Makefile.am: fixes for Cygwin building (#317046)

Modified:
   trunk/capplets/appearance/Makefile.am
   trunk/configure.in
   trunk/gnome-settings-daemon/Makefile.am
   trunk/libwindow-settings/Makefile.am
   trunk/vfs-methods/fontilus/Makefile.am
   trunk/vfs-methods/themus/Makefile.am

Modified: trunk/capplets/appearance/Makefile.am
==============================================================================
--- trunk/capplets/appearance/Makefile.am	(original)
+++ trunk/capplets/appearance/Makefile.am	Mon Jan 14 18:05:06 2008
@@ -38,11 +38,11 @@
 	wp-cellrenderer.h
 
 gnome_appearance_properties_LDADD = \
+	$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
+	$(top_builddir)/capplets/common/libcommon.la \
 	$(GNOMECC_CAPPLETS_LIBS) \
 	$(FONT_CAPPLET_LIBS) \
-	$(METACITY_LIBS) \
-	$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
-	$(top_builddir)/capplets/common/libcommon.la
+	$(METACITY_LIBS)
 gnome_appearance_properties_LDFLAGS = -export-dynamic
 
 gladedir = $(pkgdatadir)/glade

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jan 14 18:05:06 2008
@@ -1,4 +1,4 @@
-AC_INIT([gnome-control-center], [2.21.4],
+AC_INIT([gnome-control-center], [2.21.5],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -518,10 +518,10 @@
 capplets/sound/gnome-settings-sound.desktop.in
 capplets/windows/Makefile
 capplets/windows/window-properties.desktop.in
-gnome-settings-daemon/Makefile
-gnome-settings-daemon/actions/Makefile
-gnome-settings-daemon/gnome-settings-daemon.pc
-gnome-settings-daemon/xrdb/Makefile
+#gnome-settings-daemon/Makefile
+#gnome-settings-daemon/actions/Makefile
+#gnome-settings-daemon/gnome-settings-daemon.pc
+#gnome-settings-daemon/xrdb/Makefile
 help/Makefile
 libbackground/Makefile
 libslab/Makefile

Modified: trunk/gnome-settings-daemon/Makefile.am
==============================================================================
--- trunk/gnome-settings-daemon/Makefile.am	(original)
+++ trunk/gnome-settings-daemon/Makefile.am	Mon Jan 14 18:05:06 2008
@@ -67,12 +67,12 @@
 #	$(AccessX_files)		
 
 gnome_settings_daemon_LDADD = \
-	$(DBUS_LIBS)						\
-	$(LIBGNOMEKBD_LIBS)						\
 	$(top_builddir)/libbackground/libbackground.la			\
 	$(top_builddir)/libsounds/libsounds.a				\
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la 	\
 	$(top_builddir)/gnome-settings-daemon/actions/libacme.la	\
+	$(DBUS_LIBS)						\
+	$(LIBGNOMEKBD_LIBS)						\
 	$(GNOME_SETTINGS_DAEMON_LIBS)					\
 	$(XF86MISC_LIBS) $(GST_LIBS)
 

Modified: trunk/libwindow-settings/Makefile.am
==============================================================================
--- trunk/libwindow-settings/Makefile.am	(original)
+++ trunk/libwindow-settings/Makefile.am	Mon Jan 14 18:05:06 2008
@@ -13,6 +13,7 @@
 
 libgnome_window_settings_la_LDFLAGS = 	\
 	-export_dynamic			\
+	-no-undefined			\
         -version-info 1:0:0
 
 libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
@@ -36,7 +37,7 @@
 	gnome-window-settings-2.0.pc.in		\
 	ChangeLog
 
-wms_flags = -export_dynamic -avoid-version
+wms_flags = -export_dynamic -avoid-version -module -no-undefined
 wmsdir = $(WM_MODULE_DIR)
 
 wms_LTLIBRARIES =			\

Modified: trunk/vfs-methods/fontilus/Makefile.am
==============================================================================
--- trunk/vfs-methods/fontilus/Makefile.am	(original)
+++ trunk/vfs-methods/fontilus/Makefile.am	Mon Jan 14 18:05:06 2008
@@ -8,7 +8,7 @@
 
 bin_PROGRAMS = gnome-thumbnail-font gnome-font-viewer
 
-libfont_method_la_LDFLAGS = -module -avoid-version \
+libfont_method_la_LDFLAGS = -module -avoid-version -no-undefined \
   -export-symbols-regex 'vfs_module_.*'
 libfont_method_la_LIBADD = $(FONT_METHOD_LIBS)
 libfont_method_la_SOURCES = font-method.c
@@ -21,7 +21,7 @@
 
 nautilusdir = $(libdir)/nautilus/extensions-2.0
 nautilus_LTLIBRARIES = libnautilus-fontilus.la
-libnautilus_fontilus_la_LDFLAGS = -module -avoid-version \
+libnautilus_fontilus_la_LDFLAGS = -module -avoid-version -no-undefined \
   -export-symbols-regex 'nautilus_module_.*'
 libnautilus_fontilus_la_LIBADD = $(FONT_CONTEXT_MENU_LIBS)
 libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c

Modified: trunk/vfs-methods/themus/Makefile.am
==============================================================================
--- trunk/vfs-methods/themus/Makefile.am	(original)
+++ trunk/vfs-methods/themus/Makefile.am	Mon Jan 14 18:05:06 2008
@@ -16,7 +16,7 @@
 nautilusdir = $(libdir)/nautilus/extensions-2.0
 nautilus_LTLIBRARIES = libnautilus-themus.la
 
-libtheme_method_la_LDFLAGS = -module -avoid-version \
+libtheme_method_la_LDFLAGS = -module -avoid-version -no-undefined \
   -export-symbols-regex 'vfs_module_.*'
 libtheme_method_la_LIBADD = $(THEME_METHOD_LIBS) \
   $(top_builddir)/capplets/common/libcommon.la $(XCURSOR_LIBS)
@@ -34,7 +34,7 @@
 
 libnautilus_themus_la_LIBADD = $(THEMUS_COMPONENT_LIBS) \
   $(top_builddir)/capplets/common/libcommon.la $(XCURSOR_LIBS)
-libnautilus_themus_la_LDFLAGS = -module -avoid-version \
+libnautilus_themus_la_LDFLAGS = -module -avoid-version -no-undefined \
   -export-symbols-regex 'nautilus_module_.*'
 libnautilus_themus_la_SOURCES = \
 	themus-properties-view.c \