diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-08 03:45:06 +0200 |
| commit | b5d84a74d146cfe0d2e0c336a88bd269ad61cded (patch) | |
| tree | 8acad6b634cfe312144f92f8a0fb6ab44b47cd19 /source4/lib/util/config.mk | |
| parent | 237f1cca028881a57f961884f427673907c1535a (diff) | |
| parent | 1f474f4a545752f7ac0ad402d01d1e768b973dbe (diff) | |
| download | samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.gz samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.tar.bz2 samba-b5d84a74d146cfe0d2e0c336a88bd269ad61cded.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3
Conflicts:
source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk
(This used to be commit 760378e0294dd0cd4523a83448328478632d7e3d)
Diffstat (limited to 'source4/lib/util/config.mk')
| -rw-r--r-- | source4/lib/util/config.mk | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index 3afe398a8f..ab6b23dd6b 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -1,9 +1,8 @@ [SUBSYSTEM::LIBSAMBA-UTIL] PUBLIC_DEPENDENCIES = \ LIBTALLOC LIBCRYPTO \ - SOCKET_WRAPPER EXT_NSL \ - CHARSET EXECINFO DYNCONFIG \ - LIBREPLACE_NETWORK + SOCKET_WRAPPER LIBREPLACE_NETWORK \ + CHARSET EXECINFO LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \ xfile.o \ @@ -23,7 +22,8 @@ LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \ ms_fnmatch.o \ mutex.o \ idtree.o \ - become_daemon.o) + become_daemon.o \ + params.o PUBLIC_HEADERS += $(addprefix lib/util/, util.h \ attr.h \ @@ -33,13 +33,13 @@ PUBLIC_HEADERS += $(addprefix lib/util/, util.h \ mutex.h \ safe_string.h \ time.h \ + util_ldb.h \ xfile.h) [SUBSYSTEM::ASN1_UTIL] PRIVATE_PROTO_HEADER = asn1_proto.h ASN1_UTIL_OBJ_FILES = lib/util/asn1.o -PUBLIC_HEADERS += lib/util/asn1.h [SUBSYSTEM::UNIX_PRIVS] PRIVATE_PROTO_HEADER = unix_privs.h @@ -49,7 +49,6 @@ UNIX_PRIVS_OBJ_FILES = lib/util/unix_privs.o ################################################ # Start SUBSYSTEM WRAP_XATTR [SUBSYSTEM::WRAP_XATTR] -PRIVATE_PROTO_HEADER = wrap_xattr.h PUBLIC_DEPENDENCIES = XATTR # # End SUBSYSTEM WRAP_XATTR @@ -64,7 +63,6 @@ PUBLIC_DEPENDENCIES = LIBTDB UTIL_TDB_OBJ_FILES = lib/util/util_tdb.o [SUBSYSTEM::UTIL_LDB] -PRIVATE_PROTO_HEADER = util_ldb.h PUBLIC_DEPENDENCIES = LIBLDB UTIL_LDB_OBJ_FILES = lib/util/util_ldb.o |