diff options
| -rw-r--r-- | source4/Makefile.in | 6 | ||||
| -rw-r--r-- | source4/torture/smbiconv.c | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source4/Makefile.in b/source4/Makefile.in index bf97e9f6b4..059e4b955f 100644 --- a/source4/Makefile.in +++ b/source4/Makefile.in @@ -555,6 +555,8 @@ GENTEST_OBJ = torture/gentest.o torture/torture_util.o $(LOCKING_OBJ) $(LIBSMB_O NSSTEST_OBJ = torture/nsstest.o $(LIBSMB_OBJ) $(KRBCLIENT_OBJ) $(PARAM_OBJ) \ $(LIB_OBJ) +SMBICONV_OBJ = torture/smbiconv.o $(LIB_OBJ) $(PARAM_OBJ) utils/rewrite.o $(LIB_POPT_OBJ) + VFSTEST_OBJ = torture/cmd_vfs.o torture/vfstest.o $(READLINE_OBJ) VFS_AUDIT_OBJ = modules/vfs_audit.o @@ -901,6 +903,10 @@ bin/nsstest@EXEEXT@: $(NSSTEST_OBJ) bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(NSSTEST_OBJ) $(LDFLAGS) $(LIBS) +bin/smbiconv@EXEEXT@: $(SMBICONV_OBJ) @BUILD_POPT@ bin/.dummy + @echo Linking $@ + @$(CC) $(FLAGS) -o $@ $(SMBICONV_OBJ) $(DYNEXP) $(LDFLAGS) $(LIBS) @BUILD_POPT@ + bin/vfstest@EXEEXT@: $(VFSTEST_OBJ) @BUILD_POPT@ bin/.dummy @echo Linking $@ @$(CC) $(FLAGS) -o $@ $(VFSTEST_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(DYNEXP) $(PRINTLIBS) $(AUTHLIBS) $(ACLLIBS) $(LIBS) @BUILD_POPT@ diff --git a/source4/torture/smbiconv.c b/source4/torture/smbiconv.c index a7869504f2..8e68d252d6 100644 --- a/source4/torture/smbiconv.c +++ b/source4/torture/smbiconv.c @@ -183,7 +183,6 @@ int main(int argc, char *argv[]) { "to-code", 't', POPT_ARG_STRING, &to, 0, "Encoding for output" }, { "output", 'o', POPT_ARG_STRING, &output, 0, "Write output to this file" }, { "preload-modules", 'p', POPT_ARG_STRING, &preload_modules[0], 0, "Modules to load" }, - POPT_COMMON_SAMBA POPT_TABLEEND }; |