Removing lots of empty files and useless directory structures so that

	the source tarballs will look much better and useless files won't be
	installed.  Hope this doesn't break anyone's buildtree.

73 files changed, 82 insertions, 962 deletions

diff --git a/ChangeLog b/ChangeLog
index e8f6d1a1a..046ae8fc9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,79 @@
+2000-08-07  set J Shane Culpepper  <pepper@eazel.com>
+
+	* components/services/inventory/Makefile.am:
+	* components/services/inventory/idl/.cvsignore:
+	* components/services/inventory/idl/Makefile.am:
+	* components/services/inventory/idl/trilobite-eazel-inventory.idl:
+	* components/services/inventory/lib/Makefile.am:
+	* components/services/inventory/nautilus-view/Makefile.am:
+	* components/services/inventory/nautilus-view/icons/.cvsignore:
+	* components/services/inventory/nautilus-view/icons/Makefile.am:
+	* components/services/inventory/service/.cvsignore:
+	* components/services/inventory/service/Makefile.am:
+	* components/services/inventory/service/main.c:
+	*
+	components/services/inventory/service/trilobite-eazel-inventory-imp
+	l.c:
+	* components/services/login/Makefile.am:
+	* components/services/login/idl/.cvsignore:
+	* components/services/login/idl/Makefile.am:
+	* components/services/login/idl/trilobite-eazel-login.idl:
+	* components/services/login/lib/.cvsignore:
+	* components/services/login/lib/Makefile.am:
+	* components/services/login/lib/trilobite-eazel-login-public.h:
+	* components/services/login/nautilus-view/Makefile.am:
+	* components/services/login/nautilus-view/icons/.cvsignore:
+	* components/services/login/nautilus-view/icons/Makefile.am:
+	* components/services/login/service/.cvsignore:
+	* components/services/login/service/Makefile.am:
+	* components/services/login/service/main.c:
+	* components/services/login/service/trilobite-eazel-login-impl.c:
+	* components/services/startup/Makefile.am:
+	* components/services/startup/lib/.cvsignore:
+	* components/services/startup/lib/Makefile.am:
+	* components/services/startup/nautilus-view/Makefile.am:
+	* components/services/startup/nautilus-view/icons/.cvsignore:
+	* components/services/startup/nautilus-view/icons/Makefile.am:
+	* components/services/summary/Makefile.am:
+	* components/services/summary/idl/.cvsignore:
+	* components/services/summary/idl/Makefile.am:
+	* components/services/summary/idl/trilobite-eazel-summary.idl:
+	* components/services/summary/lib/.cvsignore:
+	* components/services/summary/lib/Makefile.am:
+	* components/services/summary/lib/trilobite-eazel-summary-public.h:
+	* components/services/summary/nautilus-view/Makefile.am:
+	* components/services/summary/nautilus-view/icons/.cvsignore:
+	* components/services/summary/nautilus-view/icons/Makefile.am:
+	* components/services/summary/service/.cvsignore:
+	* components/services/summary/service/Makefile.am:
+	* components/services/summary/service/main.c:
+	*
+	components/services/summary/service/trilobite-eazel-summary-impl.c:
+	* components/services/vault/Makefile.am:
+	* components/services/vault/command-line/Makefile.am:
+	* components/services/vault/idl/.cvsignore:
+	* components/services/vault/idl/Makefile.am:
+	* components/services/vault/idl/trilobite-eazel-vault.idl:
+	* components/services/vault/lib/.cvsignore:
+	* components/services/vault/lib/Makefile.am:
+	* components/services/vault/lib/trilobite-eazel-vault-public.h:
+	* components/services/vault/nautilus-view/.cvsignore:
+	* components/services/vault/nautilus-view/Makefile.am:
+	* components/services/vault/nautilus-view/icons/.cvsignore:
+	* components/services/vault/nautilus-view/icons/Makefile.am:
+	* components/services/vault/nautilus-view/main.c:
+	* components/services/vault/nautilus-view/nautilus-vault-view.c:
+	* components/services/vault/nautilus-view/nautilus-vault-view.h:
+	* components/services/vault/service/.cvsignore:
+	* components/services/vault/service/Makefile.am:
+	* components/services/vault/service/main.c:
+	* components/services/vault/service/trilobite-eazel-vault-impl.c:
+	* configure.in:
+
+	Removing lots of empty files and useless directory structures so that
+	the source tarballs will look much better and useless files won't be
+	installed.  Hope this doesn't break anyone's buildtree.
+
 2000-08-07  Darin Adler  <darin@eazel.com>
 
 	Fixed bugs 1985 and 1986 (infinite loops using Mozilla).
diff --git a/components/services/inventory/Makefile.am b/components/services/inventory/Makefile.am
index 7132bfbdb..821eeee61 100644
--- a/components/services/inventory/Makefile.am
+++ b/components/services/inventory/Makefile.am
@@ -1 +1 @@
-SUBDIRS = idl lib nautilus-view
+SUBDIRS = lib nautilus-view
diff --git a/components/services/inventory/idl/.cvsignore b/components/services/inventory/idl/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/inventory/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/inventory/idl/Makefile.am b/components/services/inventory/idl/Makefile.am
deleted file mode 100644
index 67c85ba0e..000000000
--- a/components/services/inventory/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = ${prefix}/idl
-idl_DATA =			\
-	trilobite-eazel-inventory.idl
-
-EXTRA_DIST=			\
-	$(idl_DATA)
diff --git a/components/services/inventory/idl/trilobite-eazel-inventory.idl b/components/services/inventory/idl/trilobite-eazel-inventory.idl
deleted file mode 100644
index 0e43f8818..000000000
--- a/components/services/inventory/idl/trilobite-eazel-inventory.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <Bonobo.idl>
-
-module Trilobite {
-        module Eazel {
-
-                interface Inventory : Bonobo::Unknown {
-                };
-        };
-};
-
diff --git a/components/services/inventory/lib/Makefile.am b/components/services/inventory/lib/Makefile.am
index 847620ef0..a774a2912 100644
--- a/components/services/inventory/lib/Makefile.am
+++ b/components/services/inventory/lib/Makefile.am
@@ -16,32 +16,10 @@ INCLUDES = \
 	$(GHTTP_CFLAGS)						\
 	$(NULL)
 
-noinst_LIBRARIES = libinventory.a libinventory_corba.a
+noinst_LIBRARIES = libinventory.a
 
 libinventory_a_SOURCES =						\
 	eazel-inventory-shared.h					\
 	eazel-inventory-shared.c					\
 	$(NULL)
 
-## CORBA magic
-
-CORBA_GENERATED =							\
-	trilobite-eazel-inventory-common.c				\
-	trilobite-eazel-inventory-skels.c				\
-	trilobite-eazel-inventory-stubs.c				\
-	$(NULL)
-
-$(CORBA_GENERATED): trilobite-eazel-inventory.h
-
-IDLDIR = $(top_srcdir)/components/services/inventory/idl
-IDL = $(IDLDIR)/trilobite-eazel-inventory.idl
-
-trilobite-eazel-inventory.h: $(IDL)
-	$(ORBIT_IDL) $(IDL_CFLAGS) -I$(IDLDIR) $(IDL)
-
-CLEANFILES+=$(CORBA_GENERATED) trilobite-eazel-inventory.h
-
-libinventory_corba_a_SOURCES = 					\
-	$(CORBA_GENERATED)					\
-	$(NULL)
-
diff --git a/components/services/inventory/nautilus-view/Makefile.am b/components/services/inventory/nautilus-view/Makefile.am
index f7a9937ef..c56ccbb29 100644
--- a/components/services/inventory/nautilus-view/Makefile.am
+++ b/components/services/inventory/nautilus-view/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-SUBDIR = icons
-
 CPPFLAGS =							\
 	-DPREFIX=\"$(prefix)\"					\
 	 -DG_LOG_DOMAIN=\"trilobite-eazel-inventory\"		\
@@ -34,7 +32,6 @@ nautilus_inventory_view_SOURCES =					\
 	$(NULL)
 
 nautilus_inventory_view_LDADD =							\
-	$(top_builddir)/components/services/inventory/lib/libinventory_corba.a  \
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
 	$(top_builddir)/libnautilus/libnautilus.la				\
 	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
diff --git a/components/services/inventory/nautilus-view/icons/.cvsignore b/components/services/inventory/nautilus-view/icons/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/inventory/nautilus-view/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/inventory/nautilus-view/icons/Makefile.am b/components/services/inventory/nautilus-view/icons/Makefile.am
deleted file mode 100644
index ee0a1f219..000000000
--- a/components/services/inventory/nautilus-view/icons/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-NULL = 
-
-icondir = $(datadir)/pixmaps/nautilus
-
-icon_DATA =			\
-	$(NULL)
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/components/services/inventory/service/.cvsignore b/components/services/inventory/service/.cvsignore
deleted file mode 100644
index c2a6363f9..000000000
--- a/components/services/inventory/service/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-trilobite-eazel-inventory-service
diff --git a/components/services/inventory/service/Makefile.am b/components/services/inventory/service/Makefile.am
deleted file mode 100644
index 761389037..000000000
--- a/components/services/inventory/service/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-NULL =
-
-CPPFLAGS = 								\
-	-DPREFIX=\"$(prefix)\"						\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-inventory\"			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 			\
-	$(NULL)
-
-INCLUDES =								\
-	-I$(top_srcdir) 						\
-	-I$(top_builddir) 						\
-	-I$(top_srcdir)/components/services/trilobite			\
-	-I$(top_srcdir)/components/services/inventory/lib		\
-	$(GCONF_CFLAGS) 						\
-	$(GNOME_CFLAGS) 						\
-	$(GNOME_INCLUDEDIR) 						\
-	$(OAF_CFLAGS) 							\
-	$(XML_CFLAGS) 							\
-	$(NULL)
-
-LDFLAGS = 								\
-	$(GLIB_LIBS)							\
-	$(OAF_LIBS) 							\
-	$(NULL)
-
-
-oafdir = $(datadir)/oaf
-
-oaf_DATA = trilobite-eazel-inventory-service.oafinfo
-
-bin_PROGRAMS = trilobite-eazel-inventory-service
-
-trilobite_eazel_inventory_service_SOURCES =				\
-	trilobite-eazel-inventory-impl.c				\
-	main.c								\
-	$(NULL)
-
-trilobite_eazel_inventory_service_LDADD =				\
-	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
-	$(top_builddir)/components/services/inventory/lib/libinventory_corba.a	\
-	$(NULL)
-
-EXTRA_DIST = 								\
-	$(oaf_DATA)							\
-	$(NULL)
diff --git a/components/services/inventory/service/main.c b/components/services/inventory/service/main.c
deleted file mode 100644
index b90414834..000000000
--- a/components/services/inventory/service/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
-#include <config.h>
-
-int main (int argc, char *argv[]) {
-
-	return 0;
-};
diff --git a/components/services/inventory/service/trilobite-eazel-inventory-impl.c b/components/services/inventory/service/trilobite-eazel-inventory-impl.c
deleted file mode 100644
index 1eac73441..000000000
--- a/components/services/inventory/service/trilobite-eazel-inventory-impl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
diff --git a/components/services/inventory/service/trilobite-eazel-inventory-service.oafinfo b/components/services/inventory/service/trilobite-eazel-inventory-service.oafinfo
deleted file mode 100644
index e69de29bb..000000000
--- a/components/services/inventory/service/trilobite-eazel-inventory-service.oafinfo
+++ /dev/null
diff --git a/components/services/login/Makefile.am b/components/services/login/Makefile.am
index 7132bfbdb..c48d17697 100644
--- a/components/services/login/Makefile.am
+++ b/components/services/login/Makefile.am
@@ -1 +1 @@
-SUBDIRS = idl lib nautilus-view
+SUBDIRS = nautilus-view
diff --git a/components/services/login/idl/.cvsignore b/components/services/login/idl/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/login/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/login/idl/Makefile.am b/components/services/login/idl/Makefile.am
deleted file mode 100644
index 667c6ff10..000000000
--- a/components/services/login/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = ${prefix}/idl
-idl_DATA =			\
-	trilobite-eazel-login.idl
-
-EXTRA_DIST=			\
-	$(idl_DATA)
diff --git a/components/services/login/idl/trilobite-eazel-login.idl b/components/services/login/idl/trilobite-eazel-login.idl
deleted file mode 100644
index 99a2725c0..000000000
--- a/components/services/login/idl/trilobite-eazel-login.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <Bonobo.idl>
-
-module Trilobite {
-        module Eazel {
-
-                interface Login : Bonobo::Unknown {
-                };
-        };
-};
-
diff --git a/components/services/login/lib/.cvsignore b/components/services/login/lib/.cvsignore
deleted file mode 100644
index 1b99d522b..000000000
--- a/components/services/login/lib/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-trilobite-eazel-login-common.c
-trilobite-eazel-login-skels.c
-trilobite-eazel-login-stubs.c
-trilobite-eazel-login.h
diff --git a/components/services/login/lib/Makefile.am b/components/services/login/lib/Makefile.am
deleted file mode 100644
index 4a1e93a4d..000000000
--- a/components/services/login/lib/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-NULL =
-
-CPPFLAGS = \
-	-DPREFIX=\"$(prefix)\" 					\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-login\"		\
-	-DSTANDALONE						\
-	$(NULL)
-
-INCLUDES = \
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-        -I$(top_srcdir)/components/services/trilobite		\
-	$(GNOME_CFLAGS)						\
-	$(GCONF_CFLAGS)						\
-	$(GHTTP_CFLAGS)						\
-	$(NULL)
-
-noinst_LIBRARIES = liblogin_corba.a
-
-## CORBA magic
-
-CORBA_GENERATED =						\
-	trilobite-eazel-login-common.c					\
-	trilobite-eazel-login-skels.c					\
-	trilobite-eazel-login-stubs.c					\
-	$(NULL)
-
-$(CORBA_GENERATED): trilobite-eazel-login.h
-
-IDLDIR = $(top_srcdir)/components/services/login/idl
-IDL = $(IDLDIR)/trilobite-eazel-login.idl
-
-trilobite-eazel-login.h: $(IDL)
-	$(ORBIT_IDL) $(IDL_CFLAGS) -I$(IDLDIR) $(IDL)
-
-CLEANFILES+=$(CORBA_GENERATED) trilobite-eazel-login.h
-
-liblogin_corba_a_SOURCES = 					\
-	$(CORBA_GENERATED)					\
-	$(NULL)
-
diff --git a/components/services/login/lib/trilobite-eazel-login-public.h b/components/services/login/lib/trilobite-eazel-login-public.h
deleted file mode 100644
index 1793c5e78..000000000
--- a/components/services/login/lib/trilobite-eazel-login-public.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author:
- */
-
-#ifndef TRILOBITE_EAZEL_LOGIN_PUBLIC_H
-#define TRILOBITE_EAZEL_LOGIN_PUBLIC_H
-
-#endif /* TRILOBITE_EAZEL_LOGIN_PUBLIC_H */
diff --git a/components/services/login/nautilus-view/Makefile.am b/components/services/login/nautilus-view/Makefile.am
index 61b722c1d..649520bc0 100644
--- a/components/services/login/nautilus-view/Makefile.am
+++ b/components/services/login/nautilus-view/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-SUBDIR = icons
-
 CPPFLAGS =							\
 	-DPREFIX=\"$(prefix)\"					\
 	 -DG_LOG_DOMAIN=\"trilobite-eazel-login\"		\
@@ -35,7 +33,6 @@ nautilus_login_view_SOURCES =						\
 	$(NULL)
 
 nautilus_login_view_LDADD =						\
-	$(top_builddir)/components/services/login/lib/liblogin_corba.a  \
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
 	$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus/libnautilus.la			\
diff --git a/components/services/login/nautilus-view/icons/.cvsignore b/components/services/login/nautilus-view/icons/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/login/nautilus-view/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/login/nautilus-view/icons/Makefile.am b/components/services/login/nautilus-view/icons/Makefile.am
deleted file mode 100644
index ee0a1f219..000000000
--- a/components/services/login/nautilus-view/icons/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-NULL = 
-
-icondir = $(datadir)/pixmaps/nautilus
-
-icon_DATA =			\
-	$(NULL)
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/components/services/login/service/.cvsignore b/components/services/login/service/.cvsignore
deleted file mode 100644
index 2ddc39b1b..000000000
--- a/components/services/login/service/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-trilobite-eazel-login-service
diff --git a/components/services/login/service/Makefile.am b/components/services/login/service/Makefile.am
deleted file mode 100644
index 8d9a67a87..000000000
--- a/components/services/login/service/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-NULL =
-
-CPPFLAGS = 								\
-	-DPREFIX=\"$(prefix)\"						\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-login\"			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 			\
-	$(NULL)
-
-INCLUDES =								\
-	-I$(top_srcdir) 						\
-	-I$(top_builddir) 						\
-	-I$(top_srcdir)/components/services/trilobite			\
-	-I$(top_srcdir)/components/services/login/lib			\
-	$(GCONF_CFLAGS) 						\
-	$(GNOME_CFLAGS) 						\
-	$(GNOME_INCLUDEDIR) 						\
-	$(OAF_CFLAGS) 							\
-	$(XML_CFLAGS) 							\
-	$(NULL)
-
-LDFLAGS = 								\
-	$(GLIB_LIBS)							\
-	$(OAF_LIBS) 							\
-	$(NULL)
-
-
-oafdir = $(datadir)/oaf
-
-oaf_DATA = trilobite-eazel-login-service.oafinfo
-
-bin_PROGRAMS = trilobite-eazel-login-service
-
-trilobite_eazel_login_service_SOURCES =					\
-	trilobite-eazel-login-impl.c					\
-	main.c								\
-	$(NULL)
-
-trilobite_eazel_login_service_LDADD =					\
-	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
-	$(top_builddir)/components/services/login/lib/liblogin_corba.a	\
-	$(NULL)
-
-EXTRA_DIST = 								\
-	$(oaf_DATA)							\
-	$(NULL)
diff --git a/components/services/login/service/main.c b/components/services/login/service/main.c
deleted file mode 100644
index b90414834..000000000
--- a/components/services/login/service/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
-#include <config.h>
-
-int main (int argc, char *argv[]) {
-
-	return 0;
-};
diff --git a/components/services/login/service/trilobite-eazel-login-impl.c b/components/services/login/service/trilobite-eazel-login-impl.c
deleted file mode 100644
index 1eac73441..000000000
--- a/components/services/login/service/trilobite-eazel-login-impl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
diff --git a/components/services/login/service/trilobite-eazel-login-service.oafinfo b/components/services/login/service/trilobite-eazel-login-service.oafinfo
deleted file mode 100644
index e69de29bb..000000000
--- a/components/services/login/service/trilobite-eazel-login-service.oafinfo
+++ /dev/null
diff --git a/components/services/startup/Makefile.am b/components/services/startup/Makefile.am
index 12a23ef11..e1062addf 100644
--- a/components/services/startup/Makefile.am
+++ b/components/services/startup/Makefile.am
@@ -1,2 +1,2 @@
-SUBDIRS = lib nautilus-view
+SUBDIRS = nautilus-view
 
diff --git a/components/services/startup/lib/.cvsignore b/components/services/startup/lib/.cvsignore
deleted file mode 100644
index 774ac05c2..000000000
--- a/components/services/startup/lib/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile
-Makefile.in
-.deps
-.libs
-eazel-install
\ No newline at end of file
diff --git a/components/services/startup/lib/Makefile.am b/components/services/startup/lib/Makefile.am
deleted file mode 100644
index 171982645..000000000
--- a/components/services/startup/lib/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-CPPFLAGS = \
-	-DPREFIX=\"$(prefix)\" \
-	-DG_LOG_DOMAIN=\"trilobite-eazel-startup\"
-
-INCLUDES = \
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-        -I$(top_srcdir)/components/services/trilobite/libtrilobite	\
-	$(GNOME_CFLAGS)						\
-	$(GCONF_CFLAGS)						\
-	$(XML_CFLAGS)						\
-	$(NULL)
-
-noinst_LIBRARIES = libstartup.a
-
-libstartup_a_SOURCES = dummy.c
diff --git a/components/services/startup/lib/dummy.c b/components/services/startup/lib/dummy.c
deleted file mode 100644
index e69de29bb..000000000
--- a/components/services/startup/lib/dummy.c
+++ /dev/null
diff --git a/components/services/startup/nautilus-view/Makefile.am b/components/services/startup/nautilus-view/Makefile.am
index c5794289c..2c72a4608 100644
--- a/components/services/startup/nautilus-view/Makefile.am
+++ b/components/services/startup/nautilus-view/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-SUBDIRS=icons
-
 CPPFLAGS =							\
 	-DPREFIX=\"$(prefix)\"
 	-DG_LOG_DOMAIN=\"trilobite-eazel-startup\"
diff --git a/components/services/startup/nautilus-view/icons/.cvsignore b/components/services/startup/nautilus-view/icons/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/startup/nautilus-view/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/startup/nautilus-view/icons/Makefile.am b/components/services/startup/nautilus-view/icons/Makefile.am
deleted file mode 100644
index b51dd1b74..000000000
--- a/components/services/startup/nautilus-view/icons/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-NULL =
-
-icondir = $(datadir)/pixmaps/nautilus
-
-icon_DATA =					\
-	$(NULL)
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/components/services/summary/Makefile.am b/components/services/summary/Makefile.am
index 7132bfbdb..c48d17697 100644
--- a/components/services/summary/Makefile.am
+++ b/components/services/summary/Makefile.am
@@ -1 +1 @@
-SUBDIRS = idl lib nautilus-view
+SUBDIRS = nautilus-view
diff --git a/components/services/summary/idl/.cvsignore b/components/services/summary/idl/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/summary/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/summary/idl/Makefile.am b/components/services/summary/idl/Makefile.am
deleted file mode 100644
index cf0737e86..000000000
--- a/components/services/summary/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = ${prefix}/idl
-idl_DATA =			\
-	trilobite-eazel-summary.idl
-
-EXTRA_DIST=			\
-	$(idl_DATA)
diff --git a/components/services/summary/idl/trilobite-eazel-summary.idl b/components/services/summary/idl/trilobite-eazel-summary.idl
deleted file mode 100644
index bb40e98cf..000000000
--- a/components/services/summary/idl/trilobite-eazel-summary.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <Bonobo.idl>
-
-module Trilobite {
-        module Eazel {
-
-                interface Summary : Bonobo::Unknown {
-                };
-        };
-};
-
diff --git a/components/services/summary/lib/.cvsignore b/components/services/summary/lib/.cvsignore
deleted file mode 100644
index ae76d1ef2..000000000
--- a/components/services/summary/lib/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-trilobite-eazel-summary-common.c
-trilobite-eazel-summary-skels.c
-trilobite-eazel-summary-stubs.c
-trilobite-eazel-summary.h
diff --git a/components/services/summary/lib/Makefile.am b/components/services/summary/lib/Makefile.am
deleted file mode 100644
index 52fabfe7e..000000000
--- a/components/services/summary/lib/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-NULL =
-
-CPPFLAGS = \
-	-DPREFIX=\"$(prefix)\" 					\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-summary\"		\
-	-DSTANDALONE						\
-	$(NULL)
-
-INCLUDES = \
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-        -I$(top_srcdir)/components/services/trilobite		\
-	$(GNOME_CFLAGS)						\
-	$(GCONF_CFLAGS)						\
-	$(GHTTP_CFLAGS)						\
-	$(NULL)
-
-noinst_LIBRARIES = libsummary_corba.a
-
-## CORBA magic
-
-CORBA_GENERATED =							\
-	trilobite-eazel-summary-common.c				\
-	trilobite-eazel-summary-skels.c					\
-	trilobite-eazel-summary-stubs.c					\
-	$(NULL)
-
-$(CORBA_GENERATED): trilobite-eazel-summary.h
-
-IDLDIR = $(top_srcdir)/components/services/summary/idl
-IDL = $(IDLDIR)/trilobite-eazel-summary.idl
-
-trilobite-eazel-summary.h: $(IDL)
-	$(ORBIT_IDL) $(IDL_CFLAGS) -I$(IDLDIR) $(IDL)
-
-CLEANFILES+=$(CORBA_GENERATED) trilobite-eazel-summary.h
-
-libsummary_corba_a_SOURCES = 					\
-	$(CORBA_GENERATED)					\
-	$(NULL)
-
diff --git a/components/services/summary/lib/trilobite-eazel-summary-public.h b/components/services/summary/lib/trilobite-eazel-summary-public.h
deleted file mode 100644
index 19ee9e8bb..000000000
--- a/components/services/summary/lib/trilobite-eazel-summary-public.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author:
- */
-
-#ifndef TRILOBITE_EAZEL_SUMMARY_PUBLIC_H
-#define TRILOBITE_EAZEL_SUMMARY_PUBLIC_H
-
-#endif /* TRILOBITE_EAZEL_SUMMARY_PUBLIC_H */
diff --git a/components/services/summary/nautilus-view/Makefile.am b/components/services/summary/nautilus-view/Makefile.am
index 2d519ac4e..51fb151ab 100644
--- a/components/services/summary/nautilus-view/Makefile.am
+++ b/components/services/summary/nautilus-view/Makefile.am
@@ -1,7 +1,5 @@
 NULL =
 
-SUBDIR = icons
-
 CPPFLAGS =							\
 	-DPREFIX=\"$(prefix)\"					\
 	 -DG_LOG_DOMAIN=\"trilobite-eazel-summary\"		\
@@ -35,7 +33,6 @@ nautilus_summary_view_SOURCES =						\
 	$(NULL)
 
 nautilus_summary_view_LDADD =						\
-	$(top_builddir)/components/services/summary/lib/libsummary_corba.a \
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
 	$(top_builddir)/components/services/nautilus-dependant-shared/libnautilusdepshared.a \
 	$(top_builddir)/libnautilus/libnautilus.la			\
diff --git a/components/services/summary/nautilus-view/icons/.cvsignore b/components/services/summary/nautilus-view/icons/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/summary/nautilus-view/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/summary/nautilus-view/icons/Makefile.am b/components/services/summary/nautilus-view/icons/Makefile.am
deleted file mode 100644
index ee0a1f219..000000000
--- a/components/services/summary/nautilus-view/icons/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-NULL = 
-
-icondir = $(datadir)/pixmaps/nautilus
-
-icon_DATA =			\
-	$(NULL)
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/components/services/summary/service/.cvsignore b/components/services/summary/service/.cvsignore
deleted file mode 100644
index 880c41a00..000000000
--- a/components/services/summary/service/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-trilobite-eazel-summary-service
diff --git a/components/services/summary/service/Makefile.am b/components/services/summary/service/Makefile.am
deleted file mode 100644
index c41a46b54..000000000
--- a/components/services/summary/service/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-NULL =
-
-CPPFLAGS = 								\
-	-DPREFIX=\"$(prefix)\"						\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-summary\"			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 			\
-	$(NULL)
-
-INCLUDES =								\
-	-I$(top_srcdir) 						\
-	-I$(top_builddir) 						\
-	-I$(top_srcdir)/components/services/trilobite			\
-	-I$(top_srcdir)/components/services/summary/lib			\
-	$(GCONF_CFLAGS) 						\
-	$(GNOME_CFLAGS) 						\
-	$(GNOME_INCLUDEDIR) 						\
-	$(OAF_CFLAGS) 							\
-	$(XML_CFLAGS) 							\
-	$(NULL)
-
-LDFLAGS = 								\
-	$(GLIB_LIBS)							\
-	$(OAF_LIBS) 							\
-	$(NULL)
-
-
-oafdir = $(datadir)/oaf
-
-oaf_DATA = trilobite-eazel-summary-service.oafinfo
-
-bin_PROGRAMS = trilobite-eazel-summary-service
-
-trilobite_eazel_summary_service_SOURCES =					\
-	trilobite-eazel-summary-impl.c					\
-	main.c								\
-	$(NULL)
-
-trilobite_eazel_summary_service_LDADD =					\
-	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
-	$(top_builddir)/components/services/summary/lib/libsummary_corba.a	\
-	$(NULL)
-
-EXTRA_DIST = 								\
-	$(oaf_DATA)							\
-	$(NULL)
diff --git a/components/services/summary/service/main.c b/components/services/summary/service/main.c
deleted file mode 100644
index b90414834..000000000
--- a/components/services/summary/service/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
-#include <config.h>
-
-int main (int argc, char *argv[]) {
-
-	return 0;
-};
diff --git a/components/services/summary/service/trilobite-eazel-summary-impl.c b/components/services/summary/service/trilobite-eazel-summary-impl.c
deleted file mode 100644
index 1eac73441..000000000
--- a/components/services/summary/service/trilobite-eazel-summary-impl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
diff --git a/components/services/summary/service/trilobite-eazel-summary-service.oafinfo b/components/services/summary/service/trilobite-eazel-summary-service.oafinfo
deleted file mode 100644
index e69de29bb..000000000
--- a/components/services/summary/service/trilobite-eazel-summary-service.oafinfo
+++ /dev/null
diff --git a/components/services/vault/Makefile.am b/components/services/vault/Makefile.am
index ac9315eb5..7d966a946 100644
--- a/components/services/vault/Makefile.am
+++ b/components/services/vault/Makefile.am
@@ -1 +1 @@
-SUBDIRS = idl lib command-line nautilus-view
+SUBDIRS = command-line
diff --git a/components/services/vault/command-line/Makefile.am b/components/services/vault/command-line/Makefile.am
index 4f89c4647..f3231d982 100644
--- a/components/services/vault/command-line/Makefile.am
+++ b/components/services/vault/command-line/Makefile.am
@@ -32,6 +32,5 @@ eazel_vault_LDADD =							\
 	$(VFS_LIBS)							\
 	$(OAF_LIBS)							\
 	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
-	$(top_builddir)/components/services/vault/lib/libvault_corba.a \
 	$(NULL)
 
diff --git a/components/services/vault/idl/.cvsignore b/components/services/vault/idl/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/vault/idl/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/vault/idl/Makefile.am b/components/services/vault/idl/Makefile.am
deleted file mode 100644
index 1dd56c374..000000000
--- a/components/services/vault/idl/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-idldir = ${prefix}/idl
-idl_DATA =			\
-	trilobite-eazel-vault.idl
-
-EXTRA_DIST=			\
-	$(idl_DATA)
diff --git a/components/services/vault/idl/trilobite-eazel-vault.idl b/components/services/vault/idl/trilobite-eazel-vault.idl
deleted file mode 100644
index 538e2d4b0..000000000
--- a/components/services/vault/idl/trilobite-eazel-vault.idl
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <Bonobo.idl>
-
-module Trilobite {
-        module Eazel {
-
-                interface Vault : Bonobo::Unknown {
-                };
-        };
-};
-
diff --git a/components/services/vault/lib/.cvsignore b/components/services/vault/lib/.cvsignore
deleted file mode 100644
index 2d1e556bf..000000000
--- a/components/services/vault/lib/.cvsignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.deps
-Makefile
-Makefile.in
-trilobite-eazel-vault-common.c
-trilobite-eazel-vault-skels.c
-trilobite-eazel-vault-stubs.c
-trilobite-eazel-vault.h
diff --git a/components/services/vault/lib/Makefile.am b/components/services/vault/lib/Makefile.am
deleted file mode 100644
index 1baaa872e..000000000
--- a/components/services/vault/lib/Makefile.am
+++ /dev/null
@@ -1,41 +0,0 @@
-NULL =
-
-CPPFLAGS = \
-	-DPREFIX=\"$(prefix)\" 					\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-vault\"		\
-	-DSTANDALONE						\
-	$(NULL)
-
-INCLUDES = \
-	-I$(top_srcdir)						\
-	-I$(top_builddir)					\
-        -I$(top_srcdir)/components/services/trilobite		\
-	$(GNOME_CFLAGS)						\
-	$(GCONF_CFLAGS)						\
-	$(GHTTP_CFLAGS)						\
-	$(NULL)
-
-noinst_LIBRARIES = libvault_corba.a
-
-## CORBA magic
-
-CORBA_GENERATED =						\
-	trilobite-eazel-vault-common.c					\
-	trilobite-eazel-vault-skels.c					\
-	trilobite-eazel-vault-stubs.c					\
-	$(NULL)
-
-$(CORBA_GENERATED): trilobite-eazel-vault.h
-
-IDLDIR = $(top_srcdir)/components/services/vault/idl
-IDL = $(IDLDIR)/trilobite-eazel-vault.idl
-
-trilobite-eazel-vault.h: $(IDL)
-	$(ORBIT_IDL) $(IDL_CFLAGS) -I$(IDLDIR) $(IDL)
-
-CLEANFILES+=$(CORBA_GENERATED) trilobite-eazel-vault.h
-
-libvault_corba_a_SOURCES = 					\
-	$(CORBA_GENERATED)					\
-	$(NULL)
-
diff --git a/components/services/vault/lib/trilobite-eazel-vault-public.h b/components/services/vault/lib/trilobite-eazel-vault-public.h
deleted file mode 100644
index 541c60698..000000000
--- a/components/services/vault/lib/trilobite-eazel-vault-public.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author:
- */
-
-#ifndef TRILOBITE_EAZEL_VAULT_PUBLIC_H
-#define TRILOBITE_EAZEL_VAULT_PUBLIC_H
-
-#endif /* TRILOBITE_EAZEL_VAULT_PUBLIC_H */
diff --git a/components/services/vault/nautilus-view/.cvsignore b/components/services/vault/nautilus-view/.cvsignore
deleted file mode 100644
index 0797a3d2a..000000000
--- a/components/services/vault/nautilus-view/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-nautilus-vault-view
diff --git a/components/services/vault/nautilus-view/Makefile.am b/components/services/vault/nautilus-view/Makefile.am
deleted file mode 100644
index dddf5972e..000000000
--- a/components/services/vault/nautilus-view/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-NULL =
-
-SUBDIR = icons
-
-CPPFLAGS =							\
-	-DPREFIX=\"$(prefix)\"					\
-	 -DG_LOG_DOMAIN=\"trilobite-eazel-vault\"		\
-	$(NULL)
-
-INCLUDES =								\
-	-I$(top_srcdir)							\
-	-I$(top_srcdir)/components/services/trilobite/libtrilobite	\
-	-I$(top_srcdir)/components/services/vault/lib			\
-	-I$(top_builddir)						\
-	$(GNOMEUI_CFLAGS)                       			\
-	$(GCONF_CFLAGS) 						\
-	$(NULL)
-
-oafdir = $(datadir)/oaf
-
-oaf_DATA =								\
-	nautilus-vault-view.oafinfo
-
-
-bin_PROGRAMS =								\
-	nautilus-vault-view
-
-nautilus_vault_view_SOURCES =				\
-	nautilus-vault-view.h					\
-	nautilus-vault-view.c		    			\
-	main.c								\
-	$(NULL)
-
-nautilus_vault_view_LDADD =				\
-	$(top_builddir)/components/services/vault/lib/libvault_corba.a  \
-	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
-	$(top_builddir)/libnautilus/libnautilus.la			\
-	$(top_builddir)/libnautilus-extensions/libnautilus-extensions.la	\
-	$(BONOBO_LIBS)							\
-	$(GNOMEUI_LIBS)							\
-	$(GCONF_LIBS)							\
-	$(VFS_LIBS)							\
-	$(GHTTP_LIBS)							\
-	$(OAF_LIBS)							\
-	$(NULL)
-
-EXTRA_DIST = $(oaf_DATA)
diff --git a/components/services/vault/nautilus-view/icons/.cvsignore b/components/services/vault/nautilus-view/icons/.cvsignore
deleted file mode 100644
index 282522db0..000000000
--- a/components/services/vault/nautilus-view/icons/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/components/services/vault/nautilus-view/icons/Makefile.am b/components/services/vault/nautilus-view/icons/Makefile.am
deleted file mode 100644
index ee0a1f219..000000000
--- a/components/services/vault/nautilus-view/icons/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-NULL = 
-
-icondir = $(datadir)/pixmaps/nautilus
-
-icon_DATA =			\
-	$(NULL)
-
-EXTRA_DIST = $(icon_DATA)
diff --git a/components/services/vault/nautilus-view/main.c b/components/services/vault/nautilus-view/main.c
deleted file mode 100644
index b90414834..000000000
--- a/components/services/vault/nautilus-view/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
-#include <config.h>
-
-int main (int argc, char *argv[]) {
-
-	return 0;
-};
diff --git a/components/services/vault/nautilus-view/nautilus-vault-view.c b/components/services/vault/nautilus-view/nautilus-vault-view.c
deleted file mode 100644
index 00d62cd15..000000000
--- a/components/services/vault/nautilus-view/nautilus-vault-view.c
+++ /dev/null
@@ -1,22 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- */
-
diff --git a/components/services/vault/nautilus-view/nautilus-vault-view.h b/components/services/vault/nautilus-view/nautilus-vault-view.h
deleted file mode 100644
index 174f889fe..000000000
--- a/components/services/vault/nautilus-view/nautilus-vault-view.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- */
-
-#ifndef NAUTILUS_VAULT_VIEW_H
-#define NAUTILUS_VAULT_VIEW_H
-
-#endif /* NAUTILUS_VAULT_VIEW_H */
-
diff --git a/components/services/vault/nautilus-view/nautilus-vault-view.oafinfo b/components/services/vault/nautilus-view/nautilus-vault-view.oafinfo
deleted file mode 100644
index e69de29bb..000000000
--- a/components/services/vault/nautilus-view/nautilus-vault-view.oafinfo
+++ /dev/null
diff --git a/components/services/vault/service/.cvsignore b/components/services/vault/service/.cvsignore
deleted file mode 100644
index 62cd967f0..000000000
--- a/components/services/vault/service/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-trilobite-eazel-vault-service
diff --git a/components/services/vault/service/Makefile.am b/components/services/vault/service/Makefile.am
deleted file mode 100644
index 7d087835b..000000000
--- a/components/services/vault/service/Makefile.am
+++ /dev/null
@@ -1,45 +0,0 @@
-NULL =
-
-CPPFLAGS = 								\
-	-DPREFIX=\"$(prefix)\"						\
-	-DG_LOG_DOMAIN=\"trilobite-eazel-vault\"			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 			\
-	$(NULL)
-
-INCLUDES =								\
-	-I$(top_srcdir) 						\
-	-I$(top_builddir) 						\
-	-I$(top_srcdir)/components/services/trilobite			\
-	-I$(top_srcdir)/components/services/vault/lib			\
-	$(GCONF_CFLAGS) 						\
-	$(GNOME_CFLAGS) 						\
-	$(GNOME_INCLUDEDIR) 						\
-	$(OAF_CFLAGS) 							\
-	$(XML_CFLAGS) 							\
-	$(NULL)
-
-LDFLAGS = 								\
-	$(GLIB_LIBS)							\
-	$(OAF_LIBS) 							\
-	$(NULL)
-
-
-oafdir = $(datadir)/oaf
-
-oaf_DATA = trilobite-eazel-vault-service.oafinfo
-
-bin_PROGRAMS = trilobite-eazel-vault-service
-
-trilobite_eazel_vault_service_SOURCES =					\
-	trilobite-eazel-vault-impl.c					\
-	main.c								\
-	$(NULL)
-
-trilobite_eazel_vault_service_LDADD =					\
-	$(top_builddir)/components/services/trilobite/libtrilobite/libtrilobite.la \
-	$(top_builddir)/components/services/vault/lib/libvault_corba.a	\
-	$(NULL)
-
-EXTRA_DIST = 								\
-	$(oaf_DATA)							\
-	$(NULL)
diff --git a/components/services/vault/service/main.c b/components/services/vault/service/main.c
deleted file mode 100644
index b90414834..000000000
--- a/components/services/vault/service/main.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
-#include <config.h>
-
-int main (int argc, char *argv[]) {
-
-	return 0;
-};
diff --git a/components/services/vault/service/trilobite-eazel-vault-impl.c b/components/services/vault/service/trilobite-eazel-vault-impl.c
deleted file mode 100644
index 1eac73441..000000000
--- a/components/services/vault/service/trilobite-eazel-vault-impl.c
+++ /dev/null
@@ -1,23 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors:
- *
- */
-
diff --git a/components/services/vault/service/trilobite-eazel-vault-service.oafinfo b/components/services/vault/service/trilobite-eazel-vault-service.oafinfo
deleted file mode 100644
index e69de29bb..000000000
--- a/components/services/vault/service/trilobite-eazel-vault-service.oafinfo
+++ /dev/null
diff --git a/configure.in b/configure.in
index 8a142aa13..e1176f77c 100644
--- a/configure.in
+++ b/configure.in
@@ -454,10 +454,7 @@ components/services/trilobite/helper/Makefile
 components/services/nautilus-dependant-shared/Makefile
 components/services/nautilus-dependant-shared/icons/Makefile
 components/services/startup/Makefile
-components/services/startup/lib/Makefile
-components/services/startup/command-line/Makefile
 components/services/startup/nautilus-view/Makefile
-components/services/startup/nautilus-view/icons/Makefile
 components/services/install/Makefile
 components/services/install/lib/Makefile
 components/services/install/lib/makefile.staticlib
@@ -466,30 +463,14 @@ components/services/install/server/Makefile
 components/services/install/command-line/Makefile
 components/services/install/nautilus-view/Makefile
 components/services/login/Makefile
-components/services/login/idl/Makefile
-components/services/login/lib/Makefile
-components/services/login/service/Makefile
 components/services/login/nautilus-view/Makefile
-components/services/login/nautilus-view/icons/Makefile
 components/services/summary/Makefile
-components/services/summary/idl/Makefile
-components/services/summary/lib/Makefile
-components/services/summary/service/Makefile
 components/services/summary/nautilus-view/Makefile
-components/services/summary/nautilus-view/icons/Makefile
 components/services/inventory/Makefile
-components/services/inventory/idl/Makefile
 components/services/inventory/lib/Makefile
-components/services/inventory/service/Makefile
 components/services/inventory/nautilus-view/Makefile
-components/services/inventory/nautilus-view/icons/Makefile
 components/services/vault/Makefile
-components/services/vault/idl/Makefile
-components/services/vault/lib/Makefile
-components/services/vault/service/Makefile
 components/services/vault/command-line/Makefile
-components/services/vault/nautilus-view/Makefile
-components/services/vault/nautilus-view/icons/Makefile
 components/services/time/Makefile
 components/services/time/service/Makefile
 components/services/time/command-line/Makefile