sync'ing up for 3.0alpha20 release

(This used to be commit 803715d96016767c55202362b17096fc80786c59)

1 files changed, 10 insertions, 28 deletions

diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in
index 3126dfa3b8..46e1a90263 100644
--- a/examples/VFS/Makefile.in
+++ b/examples/VFS/Makefile.in
@@ -1,42 +1,24 @@
-MAKEFILE	= Makefile.vfs
-
-include	$(MAKEFILE)
-
 CC		= @CC@
-LIBTOOL		= libtool
-CFLAGS		= @CFLAGS@ $(VFS_CFLAGS)
-CPPFLAGS	= @CPPFLAGS@ $(VFS_CPPFLAGS)
-LDFLAGS		= @LDFLAGS@ $(VFS_LDFLAGS)
+CFLAGS		= @CFLAGS@
+CPPFLAGS	= @CPPFLAGS@
+LDFLAGS		= @LDFLAGS@
 LDSHFLAGS	= -shared
 srcdir		= @builddir@
 FLAGS		=  $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
 
-# Default target
-
-default: $(VFS_OBJS)
-
-# if file doesn't exist try to create one; 
-# it is possible that some variables will be 
-# defined correctly
-Makefile.vfs:
-	@echo -ne "VFS_OBJS\t= " > $(MAKEFILE); \
-	for i in *.c; do \
-	echo -n $$i" " | sed -e 's/\(.*\)\.c\(.*\)/\1\.so\2/g' >> $(MAKEFILE); \
-	done; \
-	echo -ne "\nVFS_CFLAGS\t= \nVFS_CPPFLAGS\t= \nVFS_LDFLAGS\t= \n" >> $(MAKEFILE)
-	make
+# Auto target
+default: $(patsubst %.c,%.so,$(wildcard *.c))
 
 # Pattern rules
 
-%.so: %.lo
-	$(LIBTOOL) $(CC) $(LDSHFLAGS) $(LDFLAGS) -o $@ $< 
+%.so: %.o
+	$(CC) $(LDSHFLAGS) $(LDFLAGS) -o $@ $<
 
-%.lo: %.c
-	$(LIBTOOL) $(CC) $(FLAGS) -c $<
+%.o: %.c
+	$(CC) $(FLAGS) -c $<
 
 # Misc targets
 
 clean:
 	rm -rf .libs
-	rm -f core *~ *% *.bak \
-	$(VFS_OBJS) $(VFS_OBJS:.so=.o) $(VFS_OBJS:.so=.lo) 
+	rm -f core *~ *% *.bak *.o *.so