diff options
| -rw-r--r-- | source3/Makefile.in | 2 | ||||
| -rw-r--r-- | source3/printing/tests/README.vlp (renamed from testsuite/printing/README.vlp) | 20 | ||||
| -rw-r--r-- | source3/printing/tests/vlp.c (renamed from testsuite/printing/vlp.c) | 0 | ||||
| -rw-r--r-- | testsuite/printing/Makefile.vlp | 14 |
4 files changed, 3 insertions, 33 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 12d37ce6b0..bb81dd2f70 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 index 48d2c8c0a2..fc0b91ad69 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 index 15459889e9..15459889e9 100644 --- a/testsuite/printing/vlp.c +++ b/source3/printing/tests/vlp.c diff --git a/testsuite/printing/Makefile.vlp b/testsuite/printing/Makefile.vlp deleted file mode 100644 index 142082ebfe..0000000000 --- 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) |