diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-01 22:25:57 +0100 |
commit | 9551ab8f7b0e69349dc0c1ffb70a6f67163b242c (patch) | |
tree | 075bfaec7798dc54db47398ab6ebfe68c85b1573 /source3/Makefile.in | |
parent | 7ab8f373c84c328b197f923287163e83371e7ccb (diff) | |
parent | 8568b4fa9ff8f6f1a24547ec2ed5e2942b213d9e (diff) | |
download | samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.gz samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.tar.bz2 samba-9551ab8f7b0e69349dc0c1ffb70a6f67163b242c.zip |
Merge branch 'master' of git://git.samba.org/samba into convenience
Diffstat (limited to 'source3/Makefile.in')
-rw-r--r-- | source3/Makefile.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index 8723b4f63f..abf6cfb5f7 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -370,7 +370,8 @@ LIB_OBJ = $(LIBSAMBAUTIL_OBJ) $(UTIL_OBJ) $(CRYPTO_OBJ) \ lib/conn_tdb.o lib/adt_tree.o lib/gencache.o \ lib/module.o lib/events.o @LIBTEVENT_OBJ0@ \ lib/ldap_escape.o @CHARSET_STATIC@ \ - lib/secdesc.o lib/util_seaccess.o lib/secace.o lib/secacl.o \ + lib/secdesc.o lib/util_seaccess.o ../libcli/security/secace.o \ + ../libcli/security/secacl.o \ libads/krb5_errs.o lib/system_smbd.o lib/audit.o $(LIBNDR_OBJ) \ lib/file_id.o lib/idmap_cache.o \ ../libcli/security/dom_sid.o |