From c88cbbfdf323c24f7d8a68491bcb1e0354db41d4 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Sun, 19 Oct 2008 13:05:19 +0200
Subject: [PATCH] vlp: Move closer to the code tested.

---
 source3/Makefile.in                           |  2 +-
 .../printing/tests}/README.vlp                | 20 ++-----------------
 .../printing => source3/printing/tests}/vlp.c |  0
 testsuite/printing/Makefile.vlp               | 14 -------------
 4 files changed, 3 insertions(+), 33 deletions(-)
 rename {testsuite/printing => source3/printing/tests}/README.vlp (53%)
 rename {testsuite/printing => source3/printing/tests}/vlp.c (100%)
 delete mode 100644 testsuite/printing/Makefile.vlp

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 12d37ce6b03e..bb81dd2f7051 100644
--- 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 48d2c8c0a2b0..fc0b91ad69fc 100644
--- 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
index 142082ebfe69..000000000000
--- 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)
-- 
2.34.1