vlp: Move closer to the code tested.

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 12d37ce6b03e58e3e1c3f66942f9f9178bacfa6b..bb81dd2f70516b54d9054c35812cd5538a46be14 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1125,7 +1125,7 @@ NTLM_AUTH_OBJ = ${NTLM_AUTH_OBJ1} $(LIBSAMBA_OBJ) $(POPT_LIB_OBJ) \
                $(LIBNDR_GEN_OBJ0) $(LIBNDR_GEN_OBJ1)
 
 
-VLP_OBJ1 = ../testsuite/printing/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
+VLP_OBJ1 = printing/tests/vlp.o $(RPC_CLIENT_OBJ1) $(RPC_PARSE_OBJ2) $(RPC_CLIENT_OBJ) ../librpc/rpc/binding.o
 
 VLP_OBJ = $(VLP_OBJ1) $(PARAM_OBJ) $(LIBSMB_OBJ) \
          $(LIB_NONSMBD_OBJ) $(KRBCLIENT_OBJ) $(LIBMSRPC_GEN_OBJ) \

diff --git a/testsuite/printing/README.vlp b/source3/printing/tests/README.vlp
similarity index 53%
rename from testsuite/printing/README.vlp
rename to source3/printing/tests/README.vlp
index 48d2c8c0a2b05fa304d0bc3f3f363751e999342e..fc0b91ad69fc231c192fc24ba51a1f26b24bf334 100644 (file)
--- a/testsuite/printing/README.vlp
+++ b/source3/printing/tests/README.vlp
@@ -6,22 +6,7 @@ virtual full-function printer.
 
 Setup
 
-1) Configure and build Samba.  
-       For this to work, you need to add:
-               -DDEVELOPER
-       to your CFLAGS, and add:
-               --srcdir=<wherever your source is>
-       when running configure.  Generally      
-               ./configure --srcdir=`pwd` <other configure options>
-       should work. 
-
-2) Build and install vlp.
-       # cd testsuite/printing
-       # make -f Makefile.vlp vlp
-       # su
-       # cp vlp /usr/local/samba/bin
-
-3) Set up Samba to use vlp.
+Set up Samba to use vlp.
        In your smb.conf file under [global], add the following option:
                printing = vlp
        and then add any number of print shares, without needing to make them 
@@ -31,5 +16,4 @@ Setup
                        printable = yes
 
        is all you need for the most basic virtual printer.
-       
-       
+

diff --git a/testsuite/printing/vlp.c b/source3/printing/tests/vlp.c
similarity index 100%
rename from testsuite/printing/vlp.c
rename to source3/printing/tests/vlp.c

diff --git a/testsuite/printing/Makefile.vlp b/testsuite/printing/Makefile.vlp
deleted file mode 100644 (file)
index 142082e..0000000
--- a/testsuite/printing/Makefile.vlp
+++ /dev/null
@@ -1,14 +0,0 @@
-#
-# Makefile for vlp utility
-#
-
-vlp_default: vlp
-
-include ../../source/Makefile
-
-VLP_OBJ1 = $(LIB_OBJ) $(PARAM_OBJ) $(UBIQX_OBJ) 
-
-VLP_OBJS = $(VLP_OBJ1:%=$(srcdir)/%)
-
-vlp: $(VLP_OBJS) vlp.o
-       $(CC) -o $@ vlp.o $(VLP_OBJS) $(LIBS)