libgnomeui r5506 - in trunk: . file-chooser

[tml svn gnome org]

Author: tml
Date: Fri Jan 25 15:08:28 2008
New Revision: 5506
URL: http://svn.gnome.org/viewvc/libgnomeui?rev=5506&view=rev

Log:
2008-01-25  Tor Lillqvist  <tml novell com>

	* libgnomeui-zip.in: Use @GTK_BINARY_VERSION@ instead of
	hardcoding. Don't try to package pixmaps no longer present.

	* file-chooser/Makefile.am: Don't bother building libgnome-vfs.la
	on Windows.



Modified:
   trunk/ChangeLog
   trunk/file-chooser/Makefile.am
   trunk/libgnomeui-zip.in

Modified: trunk/file-chooser/Makefile.am
==============================================================================
--- trunk/file-chooser/Makefile.am	(original)
+++ trunk/file-chooser/Makefile.am	Fri Jan 25 15:08:28 2008
@@ -20,8 +20,13 @@
 module_flags = -export_dynamic -avoid-version -module -no-undefined
 modulesdir = $(libdir)/gtk-2.0/$(GTK_BINARY_VERSION)/filesystems
 
-modules_LTLIBRARIES =				\
-	libgnome-vfs.la			\
+if OS_WIN32
+else
+libgnome_vfs = libgnome-vfs.la
+endif
+
+modules_LTLIBRARIES =			\
+	$(libgnome_vfs)			\
 	libgio.la			\
 	$(NULL)
 

Modified: trunk/libgnomeui-zip.in
==============================================================================
--- trunk/libgnomeui-zip.in	(original)
+++ trunk/libgnomeui-zip.in	Fri Jan 25 15:08:28 2008
@@ -13,14 +13,9 @@
 
 zip $ZIP -@ <<EOF
 bin/libgnomeui-2-$current_minus_age.dll
-lib/gtk-2.0/2.4.0/filesystems/libgnome-vfs.dll
+lib/gtk-2.0/@GTK_BINARY_VERSION@/filesystems/libgio.dll
 lib/libglade/2.0/libgnome.dll
 share/pixmaps/gnome-about-logo.png
-share/pixmaps/gnome-default-dlg.png
-share/pixmaps/gnome-error.png
-share/pixmaps/gnome-info.png
-share/pixmaps/gnome-question.png
-share/pixmaps/gnome-warning.png
 EOF
 
 if [ -f share/locale/de/LC_MESSAGES/libgnomeui-2.0.mo ]; then