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/scripting/ejs/ejsnet | |
| 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/scripting/ejs/ejsnet')
| -rw-r--r-- | source4/scripting/ejs/ejsnet/config.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/ejs/ejsnet/config.mk b/source4/scripting/ejs/ejsnet/config.mk index 85a5b2bf09..710221e37d 100644 --- a/source4/scripting/ejs/ejsnet/config.mk +++ b/source4/scripting/ejs/ejsnet/config.mk @@ -1,13 +1,13 @@ [MODULE::smbcalls_net] SUBSYSTEM = smbcalls INIT_FUNCTION = smb_setup_ejs_net -PRIVATE_PROTO_HEADER = proto.h PRIVATE_DEPENDENCIES = LIBSAMBA-NET LIBCLI_SMB CREDENTIALS -smbcalls_net_OBJ_FILES = $(addprefix scripting/ejs/ejsnet/, \ +smbcalls_net_OBJ_FILES = $(addprefix $(ejsscriptsrcdir)/ejsnet/, \ net_ctx.o \ net_user.o \ mpr_user.o \ net_host.o \ mpr_host.o) +$(eval $(call proto_header_template,$(ejsscriptsrcdir)/ejsnet/proto.h,$(smbcalls_net_OBJ_FILES:.o=.c))) |