Remove a bunch of stuff from the old control-center.

2001-07-12  Richard Hestilow  <hestilow@ximian.com>

	* Makefile.am: Remove a bunch of stuff from the old control-center.

	* configure.in: Ditto.

	* capplets/Makefile.am: Ditto.

	* po/POTFILES.in: Ditto

	* autogen.sh: Look for the right directory structure.

	* capplets/file-types/Makefile.am: Compile the file-types-* files,
	not nautilus-mime-type-* files (they were renamed.)

	* capplets/file-types/*.c: Include the renamed headers.

	* capplets/file-types/libuuid/Makefile.am: Change $(GLIB_CFLAGS)
	to @GLIB_CFLAGS@ for pkg-config purposes.

capplets/file-types/Makefile.am

@@ -17,19 +17,18 @@ INCLUDES = -I. 						\
 bin_PROGRAMS = file-types-capplet
 
 file_types_capplet_SOURCES =			\
-	nautilus-mime-type-capplet.h 		\
+	file-types-capplet.h 		\
-	nautilus-mime-type-capplet-dialogs.h 	\
+	file-types-capplet-dialogs.h 	\
-	nautilus-mime-type-icon-entry.h		\
+	file-types-icon-entry.h		\
-	nautilus-mime-type-capplet.c		\
+	file-types-capplet.c		\
-	nautilus-mime-type-capplet-dialogs.c 	\
+	file-types-capplet-dialogs.c 	\
-	nautilus-mime-type-icon-entry.c		\
+	file-types-icon-entry.c		\
 	$(NULL)
 
 
 file_types_capplet_LDADD =						\
 			@VFS_CAPPLET_LIBS@				\
 			$(INTLLIBS) 					\
-			$(top_builddir)/libgnomevfs/libgnomevfs.la 	\
 			-lgdk_pixbuf					\
 			$/libuuid/libuuid.a				\
 			$(NULL)

capplets/file-types/file-types-capplet-dialogs.c

@@ -38,8 +38,8 @@
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include "libuuid/uuid.h"
-#include "nautilus-mime-type-capplet.h"
+#include "file-types-capplet.h"
-#include "nautilus-mime-type-capplet-dialogs.h"
+#include "file-types-capplet-dialogs.h"
 
 /* gtk_window_set_default_width (and some other functions) use a
  * magic undocumented number of -2 to mean "ignore this parameter".

capplets/file-types/file-types-capplet.c

@@ -43,10 +43,10 @@
 #include <libgnomevfs/gnome-vfs-init.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 
-#include "nautilus-mime-type-capplet-dialogs.h"
+#include "file-types-capplet-dialogs.h"
-#include "nautilus-mime-type-icon-entry.h"
+#include "file-types-icon-entry.h"
 
-#include "nautilus-mime-type-capplet.h"
+#include "file-types-capplet.h"
 
 #define DEFAULT_REGULAR_ICON "nautilus/i-regular-24.png"
 #define DEFAULT_ACTION_ICON "nautilus/i-executable.png"

capplets/file-types/file-types-icon-entry.c

@@ -11,8 +11,8 @@
  */
 #include <config.h>
 
-#include "nautilus-mime-type-icon-entry.h"
+#include "file-types-icon-entry.h"
-#include "nautilus-mime-type-capplet.h"
+#include "file-types-capplet.h"
 
 #include <gdk_imlib.h>
 #include <gnome.h>

capplets/file-types/libuuid/Makefile.am

@@ -22,6 +22,6 @@ libuuid_a_SOURCES = \
 	$(NULL)
 
 INCLUDES = \
-	$(GLIB_CFLAGS)	\
+	@GLIB_CFLAGS@	\
 	$(WERROR)	\
 	$(NULL)