diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /testsuite/printing/Makefile.vlp | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'testsuite/printing/Makefile.vlp')
-rw-r--r-- | testsuite/printing/Makefile.vlp | 14 |
1 files changed, 0 insertions, 14 deletions
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) |