gtk+ r20343 - in trunk: . gtk gtk/xdgmime

[carlosg svn gnome org]

Author: carlosg
Date: Tue Jun 10 00:39:45 2008
New Revision: 20343
URL: http://svn.gnome.org/viewvc/gtk+?rev=20343&view=rev

Log:
2008-06-10  Carlos Garnacho  <carlos imendio com>

        * configure.in:
        * gtk/Makefile.am:
        * gtk/xdgmime: removed local xdgmime copy as Matthias suggested in bug
        #520874, comment #8. It's no longer used directly by GTK+.


Removed:
   trunk/gtk/xdgmime/ChangeLog
   trunk/gtk/xdgmime/Makefile.am
   trunk/gtk/xdgmime/test-mime.c
   trunk/gtk/xdgmime/xdgmime.c
   trunk/gtk/xdgmime/xdgmime.h
   trunk/gtk/xdgmime/xdgmimealias.c
   trunk/gtk/xdgmime/xdgmimealias.h
   trunk/gtk/xdgmime/xdgmimecache.c
   trunk/gtk/xdgmime/xdgmimecache.h
   trunk/gtk/xdgmime/xdgmimeglob.c
   trunk/gtk/xdgmime/xdgmimeglob.h
   trunk/gtk/xdgmime/xdgmimeint.c
   trunk/gtk/xdgmime/xdgmimeint.h
   trunk/gtk/xdgmime/xdgmimemagic.c
   trunk/gtk/xdgmime/xdgmimemagic.h
   trunk/gtk/xdgmime/xdgmimeparent.c
   trunk/gtk/xdgmime/xdgmimeparent.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gtk/Makefile.am

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Jun 10 00:39:45 2008
@@ -2004,7 +2004,6 @@
 gtk/gtk-win32.rc
 gtk/theme-bits/Makefile
 gtk/tests/Makefile
-gtk/xdgmime/Makefile
 modules/Makefile
 modules/other/Makefile
 modules/other/gail/Makefile

Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am	(original)
+++ trunk/gtk/Makefile.am	Tue Jun 10 00:39:45 2008
@@ -1,19 +1,14 @@
 # Makefile.am for gtk+/gtk
 include $(top_srcdir)/Makefile.decl
 
-xdgmimedir =
-
-if OS_UNIX
-xdgmimedir += xdgmime
 if USE_QUARTZ
 GTK_PRINT_PREVIEW_COMMAND="open -a /Applications/Preview.app %f"
 else
 GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f"
 endif
-endif
 
-SUBDIRS = theme-bits $(xdgmimedir) . tests
-DIST_SUBDIRS=theme-bits xdgmime tests
+SUBDIRS = theme-bits . tests
+DIST_SUBDIRS=theme-bits tests
 
 if HAVE_CUPS
 GTK_PRINT_BACKENDS=file,cups
@@ -116,10 +111,6 @@
 	$(GTK_DEP_LIBS)
 deps =
 
-if OS_UNIX
-libadd += xdgmime/libxdgmime.la
-endif
-
 # libtool stuff: set version and export symbols for resolving
 # since automake doesn't support conditionalized libsomething_la_LDFLAGS
 # we use the general approach here