Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4

[ira/wip.git] / source3 / Makefile.in

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 1ce0ce9067918c02028336448a3d970fc28564ca..b8ce0523dd43422dc6759eb4425f050b6f96b365 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -315,12 +315,12 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
          lib/async_sock.o \
          $(TDB_LIB_OBJ) \
          $(VERSION_OBJ) lib/charcnv.o lib/debug.o lib/fault.o \
-         lib/interface.o lib/md4.o \
+         lib/interface.o ../lib/crypto/md4.o \
          lib/pidfile.o \
          lib/signal.o lib/system.o lib/sendfile.o lib/recvfile.o lib/time.o \
          lib/ufc.o lib/genrand.o lib/username.o \
          lib/util_pw.o lib/access.o lib/smbrun.o \
-         lib/bitmap.o lib/crc32.o lib/dprintf.o \
+         lib/bitmap.o ../lib/crypto/crc32.o lib/dprintf.o \
          lib/xfile.o lib/wins_srv.o $(UTIL_REG_OBJ) \
          lib/util_str.o lib/clobber.o lib/util_sid.o lib/util_uuid.o \
          lib/util_unistr.o lib/util_file.o lib/data_blob.o \
@@ -328,8 +328,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) \
          lib/substitute.o lib/fsusage.o lib/dbwrap_util.o \
          lib/ms_fnmatch.o lib/select.o lib/errmap_unix.o \
          lib/tallocmsg.o lib/dmallocmsg.o libsmb/smb_signing.o \
-         lib/md5.o lib/hmacmd5.o lib/arc4.o lib/iconv.o \
-         lib/pam_errors.o intl/lang_tdb.o lib/conn_tdb.o \
+         ../lib/crypto/md5.o ../lib/crypto/hmacmd5.o ../lib/crypto/arcfour.o \
+         lib/iconv.o lib/pam_errors.o intl/lang_tdb.o lib/conn_tdb.o \
          lib/adt_tree.o lib/gencache.o \
          lib/module.o lib/events.o lib/ldap_escape.o @CHARSET_STATIC@ \
          lib/secdesc.o lib/util_seaccess.o lib/secace.o lib/secacl.o \
@@ -376,7 +376,9 @@ LIBADS_SERVER_OBJ = libads/kerberos_verify.o libads/authdata.o \
 
 SECRETS_OBJ = passdb/secrets.o passdb/machine_sid.o
 
-LIBNBT_OBJ = libcli/nbt/nbtname.o \
+LIBNBT_OBJ = ../libcli/nbt/nbtname.o \
+            ../libcli/netlogon.o \
+            ../libcli/ndr_netlogon.o \
             librpc/gen_ndr/ndr_nbt.o \
             librpc/gen_ndr/ndr_svcctl.o
 
@@ -2649,10 +2651,10 @@ include/build_env.h: script/build_env.sh
 proto::
 
 etags::
-       etags `find $(srcdir) -name "*.[ch]"`
+       etags `find $(srcdir)/.. -name "*.[ch]"`
 
 ctags::
-       ctags `find $(srcdir) -name "*.[ch]"`
+       ctags `find $(srcdir)/.. -name "*.[ch]"`
 
 realclean:: clean
        -rm -f config.log bin/.dummy script/findsmb script/gen-8bit-gap.sh