diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-05-20 08:03:35 +1000 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-05-20 08:03:35 +1000 |
commit | 343fea32ccd205c68b23ee894a8ab4f9413af746 (patch) | |
tree | 692412a9e06c8947a84aef39d3def68d74774c13 /source4/libnet | |
parent | 38c68f1d5bf972f2473a41bf15c4a54efdc38b7e (diff) | |
parent | d817b435342956295f0a31b91203d1a63ae12063 (diff) | |
download | samba-343fea32ccd205c68b23ee894a8ab4f9413af746.tar.gz samba-343fea32ccd205c68b23ee894a8ab4f9413af746.tar.bz2 samba-343fea32ccd205c68b23ee894a8ab4f9413af746.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
Fix config.mk due to changing syntax.
Conflicts:
source/libcli/config.mk
source/nbt_server/config.mk
(This used to be commit 6a1c76f29f78183f44dfac6f468c5e728d2cb2cf)
Diffstat (limited to 'source4/libnet')
-rw-r--r-- | source4/libnet/config.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source4/libnet/config.mk b/source4/libnet/config.mk index 243fc1813a..f60ca6d94d 100644 --- a/source4/libnet/config.mk +++ b/source4/libnet/config.mk @@ -1,8 +1,7 @@ [SUBSYSTEM::LIBSAMBA-NET] -PRIVATE_PROTO_HEADER = libnet_proto.h PUBLIC_DEPENDENCIES = CREDENTIALS dcerpc dcerpc_samr RPC_NDR_LSA RPC_NDR_SRVSVC RPC_NDR_DRSUAPI LIBCLI_COMPOSITE LIBCLI_RESOLVE LIBCLI_FINDDCS LIBCLI_CLDAP LIBCLI_FINDDCS gensec_schannel LIBCLI_AUTH LIBNDR SMBPASSWD PROVISION -LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \ +LIBSAMBA-NET_OBJ_FILES = $(addprefix $(libnetsrcdir)/, \ libnet.o libnet_passwd.o libnet_time.o libnet_rpc.o \ libnet_join.o libnet_site.o libnet_become_dc.o libnet_unbecome_dc.o \ libnet_vampire.o libnet_samdump.o libnet_samdump_keytab.o \ @@ -10,7 +9,9 @@ LIBSAMBA-NET_OBJ_FILES = $(addprefix libnet/, \ libnet_lookup.o libnet_domain.o userinfo.o groupinfo.o userman.o \ groupman.o prereq_domain.o libnet_samsync.o) +$(eval $(call proto_header_template,$(libnetsrcdir)/libnet_proto.h,$(LIBSAMBA-NET_OBJ_FILES:.o=.c))) + [PYTHON::python_net] PRIVATE_DEPENDENCIES = LIBSAMBA-NET -python_net_OBJ_FILES = libnet/py_net.o +python_net_OBJ_FILES = $(libnetsrcdir)/py_net.o |