From 974cd6ddc03b368da72861a9783216133cd5d569 Mon Sep 17 00:00:00 2001
From: Pavel Roskin <proski@gnu.org>
Date: Mon, 31 Dec 2001 06:48:47 +0000
Subject: [PATCH] * Makefile.am: rename to ... * Make-alone.am: ... this. 
 Automake 1.5b doesn't allow Makefile and Makefile.am to coexist peacefully
 unless the former is generated from the later. * Make-mc.in: Remove all
 references to the standalone VFS.

---
 vfs/ChangeLog                      |  8 ++++++++
 vfs/{Makefile.am => Make-alone.am} |  0
 vfs/Make-mc.in                     | 19 -------------------
 3 files changed, 8 insertions(+), 19 deletions(-)
 rename vfs/{Makefile.am => Make-alone.am} (100%)

diff --git a/vfs/ChangeLog b/vfs/ChangeLog
index b46a15ae0..45f0965b8 100644
--- a/vfs/ChangeLog
+++ b/vfs/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-31  Pavel Roskin  <proski@gnu.org>
+
+	* Makefile.am: rename to ...
+	* Make-alone.am: ... this.  Automake 1.5b doesn't allow Makefile
+	and Makefile.am to coexist peacefully unless the former is
+	generated from the later.
+	* Make-mc.in: Remove all references to the standalone VFS.
+
 2001-12-18  Pavel Roskin  <proski@gnu.org>
 
 	* extfs/ulha.in: Support for "[unknown]" and other permissions
diff --git a/vfs/Makefile.am b/vfs/Make-alone.am
similarity index 100%
rename from vfs/Makefile.am
rename to vfs/Make-alone.am
diff --git a/vfs/Make-mc.in b/vfs/Make-mc.in
index d9a29012f..fb7f2f810 100644
--- a/vfs/Make-mc.in
+++ b/vfs/Make-mc.in
@@ -165,7 +165,6 @@ VFSSRCS = \
 	tcputil.c		\
 	undelfs.c 		\
 	utilvfs.c		\
-	util-alone.c		\
 	vfs.c
 
 VFSHDRS = 			\
@@ -180,7 +179,6 @@ VFSHDRS = 			\
 	tcputil.h 		\
 	utilvfs.h		\
 	vfs.h			\
-	util-alone.h		\
 	xdirentry.h
 
 VFSOBJS = $(NONETFILES) @NETFILES@
@@ -231,23 +229,6 @@ mcserv: mcserv.o tcputil.o mad.o
 @USE_SAMBA_FS_FALSE@	$(AR) cr $@ $(VFSOBJS)
 	$(RANLIB) $@
 
-#
-# Commands to build standalone version (.so)
-#
-
-VFSSOOBJS = tcputil.so ftpfs.so mcfs.so utilvfs.so local.so vfs.so \
-	tar.so names.so container.so extfs.so util-alone.so util.sor \
-	utilunix.sor sfs.so fish.so direntry.so cpio.so
-
-%.sor:	../src/%.c
-	$(CC) -c -fpic $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@
-
-%.so:	%.c
-	$(CC) -c -fpic $(CPPFLAGS) $(DEFS) $(CFLAGS) -DVFS_STANDALONE $< -o $@
-
-libvfs.so: $(VFSSOOBJS)
-	gcc $(VFSSOOBJS) -shared -o libvfs.so
-
 samba/libsamba.a:
 	cd samba && $(MAKE) libsamba.a