5 files changed, 6 insertions, 61 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog
index 2201821725..d0859ac459 100644
--- a/cpukit/libfs/ChangeLog
+++ b/cpukit/libfs/ChangeLog
@@ -1,15 +1,9 @@
-2002-07-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+2002-07-31	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
-	* src/dosfs/Makefile.am: Use .$(OBJEXT) instead of .o.
-	* src/src/imfs/Makefile.am: Ditto.
-
-2002-07-22	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
-
-	* src/dosfs/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES and
-	AM_CFLAGS. Eliminate LIBNAME.
-	* src/imfs/Makefile.am: Use AM_CPPFLAGS instead of INCLUDES and
-	AM_CFLAGS. Eliminate LIBNAME.
-	* wrapup/Makefile.am: Eliminate LIBNAME.
+	* wrapup/Makefile.am: Remove.
+	* wrapup/.cvsignore: Remove.
+	* Makefile.am: Remove wrapup SUBDIR.
+	* configure.ac: Remove wrapup/Makefile.
 
 2002-07-05	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am
index b1682363c5..f53cfbc96f 100644
--- a/cpukit/libfs/Makefile.am
+++ b/cpukit/libfs/Makefile.am
@@ -4,7 +4,7 @@
 
 ACLOCAL_AMFLAGS = -I ../aclocal
 
-SUBDIRS = src wrapup
+SUBDIRS = src
 
 EXTRA_DIST = README
 
diff --git a/cpukit/libfs/configure.ac b/cpukit/libfs/configure.ac
index c22962778a..3400de8b88 100644
--- a/cpukit/libfs/configure.ac
+++ b/cpukit/libfs/configure.ac
@@ -31,6 +31,5 @@ AC_CONFIG_FILES([Makefile
 src/Makefile
 src/imfs/Makefile
 src/dosfs/Makefile
-wrapup/Makefile
 ])
 AC_OUTPUT
diff --git a/cpukit/libfs/wrapup/.cvsignore b/cpukit/libfs/wrapup/.cvsignore
deleted file mode 100644
index 525275c115..0000000000
--- a/cpukit/libfs/wrapup/.cvsignore
+++ /dev/null
@@ -1,13 +0,0 @@
-Makefile
-Makefile.in
-aclocal.m4
-config.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-missing
-mkinstalldirs
diff --git a/cpukit/libfs/wrapup/Makefile.am b/cpukit/libfs/wrapup/Makefile.am
deleted file mode 100644
index 37e922e9b9..0000000000
--- a/cpukit/libfs/wrapup/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-##
-## $Id$
-##
-
-LIB = $(ARCH)/libfs.a
-
-include $(top_srcdir)/../automake/multilib.am
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/lib.am
-
-IMFSLIB = ../src/imfs/$(ARCH)/libimfs.a
-
-if !UNIX
-DOSFSLIB = ../src/dosfs/$(ARCH)/libdosfs.a
-endif
-
-TMP_LIBS = $(IMFSLIB) $(DOSFSLIB)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-$(LIB): $(TMP_LIBS)
-	$(RM) $@
-	$(RM) -r $(ARCH)
-	mkdir $(ARCH)
-	cd $(ARCH); for lib in $^; do $(AR) -xv ../$$lib; done
-	$(AR) ruv $@ $(ARCH)/*
-	$(RANLIB) $@
-
-all-local: $(ARCH) $(LIB)
-
-.PRECIOUS: $(LIB)
-
-include $(top_srcdir)/../automake/local.am