move everything to flat VFS/ directory

(This used to be commit d383c309d4a259fb28d7541777a8b3b53cca23bf)

diff --git a/examples/VFS/Makefile.in b/examples/VFS/Makefile.in
index 6ae4f49434d2715440b4bb54776aa1bb7e12381a..2ffd23b853877ae523bb694d98565375425d98f2 100644 (file)
--- a/examples/VFS/Makefile.in
+++ b/examples/VFS/Makefile.in
@@ -6,7 +6,7 @@ LDSHFLAGS       = -shared
 srcdir         = @builddir@
 FLAGS          =  $(CFLAGS) -Iinclude -I$(srcdir)/include -I$(srcdir)/ubiqx -I$(srcdir)/smbwrapper  -I. $(CPPFLAGS) -I$(srcdir)
 
-VFS_OBJS       = audit.so recycle.so
+VFS_OBJS       = audit.so recycle.so netatalk.so
 
 # Default target
 

diff --git a/examples/VFS/netatalk/README b/examples/VFS/README.netatalk
similarity index 100%
rename from examples/VFS/netatalk/README
rename to examples/VFS/README.netatalk

diff --git a/examples/VFS/netatalk/netatalk.c b/examples/VFS/netatalk.c
similarity index 100%
rename from examples/VFS/netatalk/netatalk.c
rename to examples/VFS/netatalk.c

diff --git a/examples/VFS/netatalk/Makefile.in b/examples/VFS/netatalk/Makefile.in
deleted file mode 100644 (file)
index a9a5d69..0000000
--- a/examples/VFS/netatalk/Makefile.in
+++ /dev/null
@@ -1,28 +0,0 @@
-CC             = @CC@
-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)
-
-VFS_OBJS       = netatalk.so
-
-# Default target
-
-default: $(VFS_OBJS)
-
-# Pattern rules
-
-%.so: %.o
-       $(CC) $(LDSHFLAGS) $(LDFLAGS) -o $@ $<
-
-%.o: %.c
-       $(CC) $(FLAGS) -c $<
-
-# Misc targets
-
-clean:
-       rm -rf .libs
-       rm -f core *~ *% *.bak \
-       $(VFS_OBJ) $(VFS_OBJS)