diff options
| author | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2001-04-13 19:12:06 +0000 |
| commit | 2ef68c7e92d4661664f0410509f7cb551e74a198 (patch) | |
| tree | 7a3ea392bf8664e28ad46b2edb1afd750335ccc9 /source3/Makefile.in | |
| parent | 14748b0bf56239695cadb6aa40d9095259ebb6e2 (diff) | |
| download | samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.gz samba-2ef68c7e92d4661664f0410509f7cb551e74a198.tar.bz2 samba-2ef68c7e92d4661664f0410509f7cb551e74a198.zip | |
Merge of Andrew's changes in 2.2.
Jeremy.
(This used to be commit fc76681812b1469208ad6c8847afdfc68bc6db49)
Diffstat (limited to 'source3/Makefile.in')
| -rw-r--r-- | source3/Makefile.in | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index d6a2cfed1f..5c9e817776 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -14,6 +14,9 @@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ AWK=@AWK@ +TERMLDFLAGS=@TERMLDFLAGS@ +TERMLIBS=@TERMLIBS@ + LIBTOOL=@LIBTOOL@ --quiet LIBTOOL_DEPS=@LIBTOOL_DEPS@ LINK=$(LIBTOOL) --mode=link $(CC) $(FLAGS) $(LDFLAGS) @@ -108,8 +111,9 @@ LIB_OBJ = lib/charcnv.o lib/charset.o lib/debug.o lib/fault.o \ lib/util.o lib/util_sock.o lib/util_sec.o smbd/ssl.o \ lib/talloc.o lib/hash.o lib/substitute.o lib/fsusage.o \ lib/ms_fnmatch.o lib/select.o lib/error.o lib/messages.o \ - nsswitch/wb_client.o nsswitch/wb_common.o lib/readline.o \ - $(TDB_OBJ) + nsswitch/wb_client.o nsswitch/wb_common.o $(TDB_OBJ) + +READLINE_OBJ = lib/readline.o UBIQX_OBJ = ubiqx/ubi_BinTree.o ubiqx/ubi_Cache.o ubiqx/ubi_SplayTree.o \ ubiqx/ubi_dLinkList.o ubiqx/ubi_sLinkList.o ubiqx/debugparse.o @@ -268,7 +272,8 @@ RPCCLIENT_OBJ1 = rpcclient/rpcclient.o rpcclient/cmd_lsarpc.o \ RPCCLIENT_OBJ = $(RPCCLIENT_OBJ1) \ $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \ - $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_OBJ) + $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(LIBMSRPC_OBJ) \ + $(READLINE_OBJ) PAM_WINBIND_OBJ = nsswitch/pam_winbind.po nsswitch/wb_common.po @@ -284,7 +289,8 @@ SMBWRAPPER_OBJ = $(SMBW_OBJ) smbwrapper/wrapped.o LIBSMBCLIENT_OBJ = libsmb/libsmbclient.o $(LIB_OBJ) $(LIBSMB_OBJ) $(PARAM_OBJ) $(UBIQX_OBJ) CLIENT_OBJ = client/client.o client/clitar.o \ - $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) + $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) \ + $(READLINE_OBJ) CUPS_OBJ = client/smbspool.o $(PARAM_OBJ) $(LIBSMB_OBJ) $(UBIQX_OBJ) $(LIB_OBJ) @@ -473,11 +479,11 @@ bin/smbrun: $(SMBRUN_OBJ) bin/.dummy bin/rpcclient: $(RPCCLIENT_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(RPCCLIENT_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) bin/smbclient: $(CLIENT_OBJ) bin/.dummy @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(LIBS) + @$(CC) $(FLAGS) -o $@ $(CLIENT_OBJ) $(LDFLAGS) $(TERMLDFLAGS) $(TERMLIBS) $(LIBS) bin/smbspool: $(CUPS_OBJ) bin/.dummy @echo Linking $@ |