diff options
author | Andrew Bartlett <abartlet@samba.org> | 2011-10-24 10:05:19 +1100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2011-10-25 17:58:33 +0200 |
commit | 50e7a8767fabd24d7ca5490dc326ea24459ec282 (patch) | |
tree | b45bbb33a3d719fdf7e3ef9e813073a99cd28610 /source3/Makefile.in | |
parent | ef87630594d8fcd3305ad0cde8b17f330c7adfff (diff) | |
download | samba-50e7a8767fabd24d7ca5490dc326ea24459ec282.tar.gz samba-50e7a8767fabd24d7ca5490dc326ea24459ec282.tar.bz2 samba-50e7a8767fabd24d7ca5490dc326ea24459ec282.zip |
torture: Remove unused smbiconv
smbiconv is not used in any test script, and has only had changes
since being introduced by Jelmer to keep it building.
It is also not installed on the system. I have also checked with
Jelmer, who approved the removal.
Andrew Bartlett
Signed-off-by: Stefan Metzmacher <metze@samba.org>
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c303fe99a5..502dab7c26 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -231,7 +231,7 @@ BIN_PROGS = @EXTRA_BIN_PROGS@ \ EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \ $(TALLOCTORT) bin/replacetort@EXEEXT@ \ bin/log2pcap@EXEEXT@ \ - bin/vlp@EXEEXT@ bin/smbiconv@EXEEXT@ \ + bin/vlp@EXEEXT@ \ bin/dbwrap_tool@EXEEXT@ \ bin/dbwrap_torture@EXEEXT@ @@ -1299,8 +1299,6 @@ PDBTEST_OBJ = torture/pdbtest.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) \ VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(SMBD_OBJ_BASE) $(READLINE_OBJ) -SMBICONV_OBJ = $(PARAM_OBJ) torture/smbiconv.o $(LIB_NONSMBD_OBJ) $(POPT_LIB_OBJ) $(LIBSMB_ERR_OBJ) - LOG2PCAP_OBJ = utils/log2pcaphex.o LOCKTEST2_OBJ = torture/locktest2.o $(PARAM_OBJ) $(LOCKING_OBJ) $(LIBSMB_OBJ) \ @@ -2031,12 +2029,6 @@ bin/vfstest@EXEEXT@: $(BINARY_PREREQS) $(VFSTEST_OBJ) @BUILD_POPT@ $(LIBTALLOC) @SMBD_LIBS@ $(NSCD_LIBS) $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) \ $(LIBWBCLIENT_LIBS) $(ZLIB_LIBS) -bin/smbiconv@EXEEXT@: $(BINARY_PREREQS) $(SMBICONV_OBJ) @BUILD_POPT@ $(LIBTALLOC) $(LIBTDB) - @echo Linking $@ - @$(CC) -o $@ $(SMBICONV_OBJ) $(LDFLAGS) $(TERMLDFLAGS) \ - $(TERMLIBS) $(DYNEXP) $(LIBS) $(LDAP_LIBS) $(POPT_LIBS) \ - $(LIBTALLOC_LIBS) $(LIBTDB_LIBS) - bin/log2pcap@EXEEXT@: $(BINARY_PREREQS) $(LOG2PCAP_OBJ) @BUILD_POPT@ $(LIBTALLOC) @echo Linking $@ @$(CC) -o $@ $(LOG2PCAP_OBJ) $(LDFLAGS) $(DYNEXP) \ |