diff options
| author | Michael Adam <obnox@samba.org> | 2013-09-23 01:58:47 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2013-09-23 20:21:21 +0200 |
| commit | f8db64ecdbe50a2a828463334493ac51a6753f90 (patch) | |
| tree | 681f71dabefe714bba49e7c6a00dc759a866854f | |
| parent | 4da00f560f66808a5900c6216a32fdcf28ff6581 (diff) | |
| download | samba-f8db64ecdbe50a2a828463334493ac51a6753f90.tar.gz samba-f8db64ecdbe50a2a828463334493ac51a6753f90.tar.bz2 samba-f8db64ecdbe50a2a828463334493ac51a6753f90.zip | |
build: list sources directly in the netapi library and remove vars=locals()
Signed-off-by: Michael Adam <obnox@samba.org>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
| -rwxr-xr-x | source3/wscript_build | 37 |
1 files changed, 16 insertions, 21 deletions
diff --git a/source3/wscript_build b/source3/wscript_build index d80391c4ba..4982b3b878 100755 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -461,24 +461,6 @@ LIBSMBSHAREMODES_SRC0 = 'libsmb/smb_share_modes.c' LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}' -LIBNETAPI_SRC0 = '''lib/netapi/netapi.c - lib/netapi/cm.c - lib/netapi/libnetapi.c - lib/netapi/joindomain.c - lib/netapi/serverinfo.c - lib/netapi/getdc.c - lib/netapi/user.c - lib/netapi/group.c - lib/netapi/localgroup.c - lib/netapi/samr.c - lib/netapi/sid.c - lib/netapi/share.c - lib/netapi/file.c - lib/netapi/shutdown.c - lib/netapi/netlogon.c''' - -LIBNETAPI_SRC = '''${LIBNETAPI_SRC0}''' - CLIENT_SRC = ''' client/client.c client/clitar.c @@ -626,7 +608,21 @@ bld.SETUP_BUILD_GROUPS() ######################## SUBSYSTEMS ################################# bld.SAMBA3_LIBRARY('netapi', - source=LIBNETAPI_SRC, + source='''lib/netapi/netapi.c + lib/netapi/cm.c + lib/netapi/libnetapi.c + lib/netapi/joindomain.c + lib/netapi/serverinfo.c + lib/netapi/getdc.c + lib/netapi/user.c + lib/netapi/group.c + lib/netapi/localgroup.c + lib/netapi/samr.c + lib/netapi/sid.c + lib/netapi/share.c + lib/netapi/file.c + lib/netapi/shutdown.c + lib/netapi/netlogon.c''', public_deps=''' talloc util_cmdline @@ -642,8 +638,7 @@ bld.SAMBA3_LIBRARY('netapi', ''', public_headers='../source3/lib/netapi/netapi.h', pc_files='libnet/netapi.pc', - vnum='0', - vars=locals()) + vnum='0') bld.SAMBA3_LIBRARY('smbsharemodes', source=LIBSMBSHAREMODES_SRC, |