* Makefile.am (noinst_LIBRARIES): Add samba/libsamba.a

if USE_SAMBA_FS is true.
* (libvfs-mc.a): Don't merge object files with libsamba.a.

vfs/ChangeLog

@@ -1,3 +1,9 @@
+2002-05-14  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* Makefile.am (noinst_LIBRARIES): Add samba/libsamba.a
+	if USE_SAMBA_FS is true.
+	* (libvfs-mc.a): Don't merge object files with libsamba.a.
+
 2002-05-13  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* Makefile.am (mcserv_SOURCES): Add $(top_srcdir)/src/mad.c.

vfs/Makefile.am

@@ -75,7 +75,11 @@ distclean-local:
 	else :; fi
 
 if USE_VFS
+if USE_SAMBA_FS
+noinst_LIBRARIES = libvfs-mc.a samba/libsamba.a
+else
 noinst_LIBRARIES = libvfs-mc.a
+endif
 else
 noinst_LIBRARIES =
 endif
@@ -98,15 +102,6 @@ mcserv_SOURCES = mcserv.c tcputil.c $(top_srcdir)/src/mad.c
 
 mcserv_LDFLAGS = $(SHADOWLIB) $(TERMNET) $(PAMLIBS) $(LCRYPT)
 
-if USE_SAMBA_FS
-libvfs-mc.a: $(libvfs_mc_a_OBJECTS) $(libvfs_mc_a_DEPENDENCIES) samba/libsamba.a
-	rm -f $@ libtmp.a
-	cp -f samba/libsamba.a libtmp.a
-	$(libvfs_mc_a_AR) libtmp.a $(libvfs_mc_a_OBJECTS) $(libvfs_mc_a_LIBADD)
-	mv libtmp.a $@
-	$(RANLIB) $@
-endif
-
 samba/libsamba.a:
 	cd samba && $(MAKE) libsamba.a