disable gnome-settings-daemon build here also.
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) svn path=/trunk/; revision=8389
This commit is contained in:
parent
506e9e9bfc
commit
a7d00c7cda
6 changed files with 16 additions and 15 deletions
|
@ -38,11 +38,11 @@ gnome_appearance_properties_SOURCES = \
|
||||||
wp-cellrenderer.h
|
wp-cellrenderer.h
|
||||||
|
|
||||||
gnome_appearance_properties_LDADD = \
|
gnome_appearance_properties_LDADD = \
|
||||||
|
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
|
||||||
|
$(top_builddir)/capplets/common/libcommon.la \
|
||||||
$(GNOMECC_CAPPLETS_LIBS) \
|
$(GNOMECC_CAPPLETS_LIBS) \
|
||||||
$(FONT_CAPPLET_LIBS) \
|
$(FONT_CAPPLET_LIBS) \
|
||||||
$(METACITY_LIBS) \
|
$(METACITY_LIBS)
|
||||||
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
|
|
||||||
$(top_builddir)/capplets/common/libcommon.la
|
|
||||||
gnome_appearance_properties_LDFLAGS = -export-dynamic
|
gnome_appearance_properties_LDFLAGS = -export-dynamic
|
||||||
|
|
||||||
gladedir = $(pkgdatadir)/glade
|
gladedir = $(pkgdatadir)/glade
|
||||||
|
|
10
configure.in
10
configure.in
|
@ -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])
|
[http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-control-center])
|
||||||
|
|
||||||
AC_CONFIG_MACRO_DIR([m4])
|
AC_CONFIG_MACRO_DIR([m4])
|
||||||
|
@ -518,10 +518,10 @@ capplets/sound/Makefile
|
||||||
capplets/sound/gnome-settings-sound.desktop.in
|
capplets/sound/gnome-settings-sound.desktop.in
|
||||||
capplets/windows/Makefile
|
capplets/windows/Makefile
|
||||||
capplets/windows/window-properties.desktop.in
|
capplets/windows/window-properties.desktop.in
|
||||||
gnome-settings-daemon/Makefile
|
#gnome-settings-daemon/Makefile
|
||||||
gnome-settings-daemon/actions/Makefile
|
#gnome-settings-daemon/actions/Makefile
|
||||||
gnome-settings-daemon/gnome-settings-daemon.pc
|
#gnome-settings-daemon/gnome-settings-daemon.pc
|
||||||
gnome-settings-daemon/xrdb/Makefile
|
#gnome-settings-daemon/xrdb/Makefile
|
||||||
help/Makefile
|
help/Makefile
|
||||||
libbackground/Makefile
|
libbackground/Makefile
|
||||||
libslab/Makefile
|
libslab/Makefile
|
||||||
|
|
|
@ -67,12 +67,12 @@ gnome_settings_daemon_SOURCES = \
|
||||||
# $(AccessX_files)
|
# $(AccessX_files)
|
||||||
|
|
||||||
gnome_settings_daemon_LDADD = \
|
gnome_settings_daemon_LDADD = \
|
||||||
$(DBUS_LIBS) \
|
|
||||||
$(LIBGNOMEKBD_LIBS) \
|
|
||||||
$(top_builddir)/libbackground/libbackground.la \
|
$(top_builddir)/libbackground/libbackground.la \
|
||||||
$(top_builddir)/libsounds/libsounds.a \
|
$(top_builddir)/libsounds/libsounds.a \
|
||||||
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
|
$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
|
||||||
$(top_builddir)/gnome-settings-daemon/actions/libacme.la \
|
$(top_builddir)/gnome-settings-daemon/actions/libacme.la \
|
||||||
|
$(DBUS_LIBS) \
|
||||||
|
$(LIBGNOMEKBD_LIBS) \
|
||||||
$(GNOME_SETTINGS_DAEMON_LIBS) \
|
$(GNOME_SETTINGS_DAEMON_LIBS) \
|
||||||
$(XF86MISC_LIBS) $(GST_LIBS)
|
$(XF86MISC_LIBS) $(GST_LIBS)
|
||||||
|
|
||||||
|
|
|
@ -13,6 +13,7 @@ lib_LTLIBRARIES = libgnome-window-settings.la
|
||||||
|
|
||||||
libgnome_window_settings_la_LDFLAGS = \
|
libgnome_window_settings_la_LDFLAGS = \
|
||||||
-export_dynamic \
|
-export_dynamic \
|
||||||
|
-no-undefined \
|
||||||
-version-info 1:0:0
|
-version-info 1:0:0
|
||||||
|
|
||||||
libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
|
libgnome_window_settings_la_LIBADD = $(GNOMECC_LIBS)
|
||||||
|
@ -36,7 +37,7 @@ EXTRA_DIST = \
|
||||||
gnome-window-settings-2.0.pc.in \
|
gnome-window-settings-2.0.pc.in \
|
||||||
ChangeLog
|
ChangeLog
|
||||||
|
|
||||||
wms_flags = -export_dynamic -avoid-version
|
wms_flags = -export_dynamic -avoid-version -module -no-undefined
|
||||||
wmsdir = $(WM_MODULE_DIR)
|
wmsdir = $(WM_MODULE_DIR)
|
||||||
|
|
||||||
wms_LTLIBRARIES = \
|
wms_LTLIBRARIES = \
|
||||||
|
|
|
@ -8,7 +8,7 @@ vfsmodule_LTLIBRARIES = libfont-method.la
|
||||||
|
|
||||||
bin_PROGRAMS = gnome-thumbnail-font gnome-font-viewer
|
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_.*'
|
-export-symbols-regex 'vfs_module_.*'
|
||||||
libfont_method_la_LIBADD = $(FONT_METHOD_LIBS)
|
libfont_method_la_LIBADD = $(FONT_METHOD_LIBS)
|
||||||
libfont_method_la_SOURCES = font-method.c
|
libfont_method_la_SOURCES = font-method.c
|
||||||
|
@ -21,7 +21,7 @@ gnome_font_viewer_SOURCES = ftstream-vfs.c font-view.c
|
||||||
|
|
||||||
nautilusdir = $(libdir)/nautilus/extensions-2.0
|
nautilusdir = $(libdir)/nautilus/extensions-2.0
|
||||||
nautilus_LTLIBRARIES = libnautilus-fontilus.la
|
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_.*'
|
-export-symbols-regex 'nautilus_module_.*'
|
||||||
libnautilus_fontilus_la_LIBADD = $(FONT_CONTEXT_MENU_LIBS)
|
libnautilus_fontilus_la_LIBADD = $(FONT_CONTEXT_MENU_LIBS)
|
||||||
libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c
|
libnautilus_fontilus_la_SOURCES = fontilus-context-menu.c
|
||||||
|
|
|
@ -16,7 +16,7 @@ vfsmodule_LTLIBRARIES = libtheme-method.la
|
||||||
nautilusdir = $(libdir)/nautilus/extensions-2.0
|
nautilusdir = $(libdir)/nautilus/extensions-2.0
|
||||||
nautilus_LTLIBRARIES = libnautilus-themus.la
|
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_.*'
|
-export-symbols-regex 'vfs_module_.*'
|
||||||
libtheme_method_la_LIBADD = $(THEME_METHOD_LIBS) \
|
libtheme_method_la_LIBADD = $(THEME_METHOD_LIBS) \
|
||||||
$(top_builddir)/capplets/common/libcommon.la $(XCURSOR_LIBS)
|
$(top_builddir)/capplets/common/libcommon.la $(XCURSOR_LIBS)
|
||||||
|
@ -34,7 +34,7 @@ themus_theme_applier_SOURCES = \
|
||||||
|
|
||||||
libnautilus_themus_la_LIBADD = $(THEMUS_COMPONENT_LIBS) \
|
libnautilus_themus_la_LIBADD = $(THEMUS_COMPONENT_LIBS) \
|
||||||
$(top_builddir)/capplets/common/libcommon.la $(XCURSOR_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_.*'
|
-export-symbols-regex 'nautilus_module_.*'
|
||||||
libnautilus_themus_la_SOURCES = \
|
libnautilus_themus_la_SOURCES = \
|
||||||
themus-properties-view.c \
|
themus-properties-view.c \
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue