diff options
| author | Andrew Tridgell <tridge@samba.org> | 2011-02-24 13:01:27 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2011-02-24 05:53:52 +0100 |
| commit | 11a97d60d931c4a7c431647353e2c423a729c6ea (patch) | |
| tree | 571b4979f84c90de6fb6c8f0ae0b1b76df42a606 | |
| parent | 74947964d915890adc524ca279ca95d96c4e8e34 (diff) | |
| download | samba-11a97d60d931c4a7c431647353e2c423a729c6ea.tar.gz samba-11a97d60d931c4a7c431647353e2c423a729c6ea.tar.bz2 samba-11a97d60d931c4a7c431647353e2c423a729c6ea.zip | |
build: moved util_reg.c into a common subsystem
Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Thu Feb 24 05:53:52 CET 2011 on sn-devel-104
| -rw-r--r-- | libcli/registry/wscript_build | 4 | ||||
| -rw-r--r-- | source3/wscript_build | 6 | ||||
| -rw-r--r-- | source4/lib/registry/wscript_build | 4 | ||||
| -rw-r--r-- | wscript_build | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/libcli/registry/wscript_build b/libcli/registry/wscript_build new file mode 100644 index 0000000000..b9c73aad60 --- /dev/null +++ b/libcli/registry/wscript_build @@ -0,0 +1,4 @@ + +bld.SAMBA_SUBSYSTEM('util_reg', + source='util_reg.c', + deps='ndr') diff --git a/source3/wscript_build b/source3/wscript_build index 1347574331..a5c5337137 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -64,7 +64,7 @@ LIB_SRC = ''' lib/system.c lib/sendfile.c lib/recvfile.c lib/time.c lib/username.c lib/access.c lib/smbrun.c - lib/bitmap.c lib/dprintf.c ${UTIL_REG_SRC} + lib/bitmap.c lib/dprintf.c lib/wins_srv.c lib/clobber.c lib/util_sid.c lib/util_file.c @@ -154,7 +154,6 @@ LIBMSRPC_SRC = ''' # # registry-related objects # -UTIL_REG_SRC = '''../libcli/registry/util_reg.c''' REG_INIT_BASIC_SRC = '''registry/reg_init_basic.c''' REG_INIT_SMBCONF_SRC = '''registry/reg_init_smbconf.c''' @@ -757,7 +756,7 @@ bld.SAMBA3_SUBSYSTEM('KRBCLIENT', bld.SAMBA3_LIBRARY('samba3core', source=LIB_SRC, - deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB SAMBA_VERSION krb5 flag_mapping', + deps='LIBCRYPTO ndr ndr-util security NDR_SECURITY charset NDR_MESSAGING LIBASYNC_REQ tdb-wrap3 samba-util3 CHARSET3 UTIL_TDB SAMBA_VERSION krb5 flag_mapping util_reg', private_library=True, vars=locals()) @@ -1336,6 +1335,7 @@ bld.RECURSE('../libcli/security') bld.RECURSE('../libcli/smb') bld.RECURSE('../libcli/smbreadline') bld.RECURSE('../libcli/nbt') +bld.RECURSE('../libcli/registry') bld.RECURSE('../lib/crypto') bld.RECURSE('../lib/iniparser/src') bld.RECURSE('../lib/nss_wrapper') diff --git a/source4/lib/registry/wscript_build b/source4/lib/registry/wscript_build index f7f167f8f9..2f0372a933 100644 --- a/source4/lib/registry/wscript_build +++ b/source4/lib/registry/wscript_build @@ -11,9 +11,9 @@ bld.SAMBA_SUBSYSTEM('TDR_REGF', bld.SAMBA_LIBRARY('registry', - source='interface.c ../../../libcli/registry/util_reg.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c', + source='interface.c util.c samba.c patchfile_dotreg.c patchfile_preg.c patchfile.c regf.c hive.c local.c ldb.c dir.c rpc.c', pc_files='registry.pc', - public_deps='samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba', + public_deps='samba-util TDR_REGF ldb RPC_NDR_WINREG ldbsamba util_reg', public_headers='registry.h', vnum='0.0.1' ) diff --git a/wscript_build b/wscript_build index a35ac9b496..318020c1ea 100644 --- a/wscript_build +++ b/wscript_build @@ -96,6 +96,7 @@ bld.RECURSE('libcli/auth') bld.RECURSE('libcli/drsuapi') bld.RECURSE('libcli/echo') bld.RECURSE('libcli/samsync') +bld.RECURSE('libcli/registry') bld.RECURSE('source4/lib/policy') bld.RECURSE('libcli/named_pipe_auth') bld.RECURSE('source4/heimdal_build') |