small build fixes

gnome/mime-type/Makefile.am

@@ -1,8 +1,7 @@
 INCLUDES = -I. -I$(srcdir) 				\
 	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-I$(srcdir)/../../libcapplet		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(includedir) $(GNOME_INCLUDEDIR)
+	$(CAPPLET_CFLAGS)
 
 bin_PROGRAMS = mime-type-capplet
 
@@ -11,9 +10,7 @@ mime_type_capplet_SOURCES = mime-type-capplet.c\
 	edit-window.h mime-info.c mime-info.h \
 	new-mime-window.h new-mime-window.c
 
-mime_type_capplet_LDADD = ../../libcapplet/libcapplet.la \
-			     $(GNOME_LIBS) $(ORBIT_LIBS) \
-			     $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(INTLLIBS)
+mime_type_capplet_LDADD = $(CAPPLET_LIBS)
 
 EXTRA_DIST = \
 	mime-type.desktop