* 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.
This commit is contained in:
Pavel Roskin 2001-12-31 06:48:47 +00:00
parent 5fd1defe8f
commit 974cd6ddc0
3 changed files with 8 additions and 19 deletions

View File

@ -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

View File

@ -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