summaryrefslogtreecommitdiff
path: root/source4/libcli
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-05-13 10:20:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:53:36 -0500
commitf236700ef67d4f93ec56ec7808584552e94e0dfe (patch)
tree3572ba5a82860e9dc60661161997b77704867cdc /source4/libcli
parentb2d1f7890765fca5a119d43f4906e885c245005f (diff)
downloadsamba-f236700ef67d4f93ec56ec7808584552e94e0dfe.tar.gz
samba-f236700ef67d4f93ec56ec7808584552e94e0dfe.tar.bz2
samba-f236700ef67d4f93ec56ec7808584552e94e0dfe.zip
r665: merge over the new build system from my tmp branch
to the main SAMBA_4_0 tree. NOTE: that it's not completely ready, but it's functional:-) metze (This used to be commit c78a2ddb28ec50d6570a83b1f66f18a5c3621731)
Diffstat (limited to 'source4/libcli')
-rw-r--r--source4/libcli/config.m476
-rw-r--r--source4/libcli/libsmb.m414
2 files changed, 55 insertions, 35 deletions
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4
index 7fdbe17349..788d7e3a0c 100644
--- a/source4/libcli/config.m4
+++ b/source4/libcli/config.m4
@@ -1,40 +1,56 @@
dnl # LIBCLI subsystem
SMB_SUBSYSTEM(LIBCLI_RAW,[],
- [libcli/raw/rawfile.o libcli/raw/smb_signing.o \
- libcli/raw/clisocket.o libcli/raw/clitransport.o \
- libcli/raw/clisession.o libcli/raw/clitree.o \
- libcli/raw/clikrb5.o libcli/raw/clispnego.o libcli/raw/rawrequest.o \
- libcli/raw/rawreadwrite.o libcli/raw/rawsearch.o \
- libcli/raw/rawsetfileinfo.o libcli/raw/raweas.o \
- libcli/raw/rawtrans.o libcli/raw/clioplock.o \
- libcli/raw/rawnegotiate.o libcli/raw/rawfsinfo.o \
- libcli/raw/rawfileinfo.o libcli/raw/rawnotify.o \
- libcli/raw/rawioctl.o libcli/raw/rawacl.o \
- libcli/raw/rawdate.o ],
- libcli/raw/libcli_raw_public_proto.h)
+ [libcli/raw/rawfile.o
+ libcli/raw/smb_signing.o
+ libcli/raw/clisocket.o
+ libcli/raw/clitransport.o
+ libcli/raw/clisession.o
+ libcli/raw/clitree.o
+ libcli/raw/clikrb5.o
+ libcli/raw/clispnego.o
+ libcli/raw/rawrequest.o
+ libcli/raw/rawreadwrite.o
+ libcli/raw/rawsearch.o
+ libcli/raw/rawsetfileinfo.o
+ libcli/raw/raweas.o
+ libcli/raw/rawtrans.o
+ libcli/raw/clioplock.o
+ libcli/raw/rawnegotiate.o
+ libcli/raw/rawfsinfo.o
+ libcli/raw/rawfileinfo.o
+ libcli/raw/rawnotify.o
+ libcli/raw/rawioctl.o
+ libcli/raw/rawacl.o
+ libcli/raw/rawdate.o])
SMB_SUBSYSTEM(LIBCLI_UTILS,[],
- [libcli/util/asn1.o \
- libcli/util/smberr.o \
- libcli/util/doserr.o libcli/util/errormap.o \
- libcli/util/pwd_cache.o libcli/util/clierror.o libcli/util/cliutil.o \
- libcli/util/nterr.o libcli/util/smbdes.o libcli/util/smbencrypt.o \
- libcli/util/dom_sid.o],
- libcli/util/libcli_utils_public_proto.h)
+ [libcli/util/asn1.o
+ libcli/util/smberr.o
+ libcli/util/doserr.o
+ libcli/util/errormap.o
+ libcli/util/pwd_cache.o
+ libcli/util/clierror.o
+ libcli/util/cliutil.o
+ libcli/util/nterr.o
+ libcli/util/smbdes.o
+ libcli/util/smbencrypt.o
+ libcli/util/dom_sid.o])
SMB_SUBSYSTEM(LIBCLI_AUTH,[],
- [libcli/auth/ntlmssp.o libcli/auth/ntlmssp_parse.o \
- libcli/auth/ntlmssp_sign.o libcli/auth/schannel.o \
- libcli/auth/credentials.o libcli/auth/session.o \
- libcli/auth/ntlm_check.o],
- libcli/auth/libcli_auth_public_proto.h)
+ [libcli/auth/ntlmssp.o
+ libcli/auth/ntlmssp_parse.o
+ libcli/auth/ntlmssp_sign.o
+ libcli/auth/schannel.o
+ libcli/auth/credentials.o
+ libcli/auth/session.o
+ libcli/auth/ntlm_check.o])
SMB_SUBSYSTEM(LIBCLI_NMB,[],
- [libcli/unexpected.o libcli/namecache.o libcli/nmblib.o \
- libcli/namequery.o],
- libcli/libcli_nmb_public_proto.h)
+ [libcli/unexpected.o
+ libcli/namecache.o
+ libcli/nmblib.o
+ libcli/namequery.o])
-SMB_SUBSYSTEM(LIBCLI,[],
- [\$(LIBCLI_RAW_OBJS) \$(LIBCLI_UTILS_OBJS) \$(LIBCLI_AUTH_OBJS) \$(LIBCLI_NMB_OBJS)],
- librpc/libcli_public_proto.h)
+SMB_SUBSYSTEM(LIBCLI,[],[],[],
+ [LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH LIBCLI_NMB])
diff --git a/source4/libcli/libsmb.m4 b/source4/libcli/libsmb.m4
index e34c171e48..fe2a5b17ba 100644
--- a/source4/libcli/libsmb.m4
+++ b/source4/libcli/libsmb.m4
@@ -1,8 +1,12 @@
dnl # LIBSMB subsystem
SMB_SUBSYSTEM(LIBSMB,[],
- [libcli/clireadwrite.o libcli/cliconnect.o \
- libcli/clifile.o libcli/clilist.o libcli/clitrans2.o \
- libcli/climessage.o libcli/clideltree.o \
- \$(LIBCLI_OBJS) \$(LIBRPC_OBJS)],
- libcli/libsmb_public_proto.h)
+ [libcli/clireadwrite.o
+ libcli/cliconnect.o
+ libcli/clifile.o
+ libcli/clilist.o
+ libcli/clitrans2.o
+ libcli/climessage.o
+ libcli/clideltree.o],
+ [],
+ [LIBCLI LIBRPC])