diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2004-11-14 23:10:04 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:05:48 -0500 |
| commit | 1824d52ff2c5492b091502c9fcf70aa073b51b37 (patch) | |
| tree | 731b0db2b13a6a082bb00930d9f733870bc8f940 /source4/libcli | |
| parent | 3757bf5c5bd1e218ea8153964d69c00a164a17e5 (diff) | |
| download | samba-1824d52ff2c5492b091502c9fcf70aa073b51b37.tar.gz samba-1824d52ff2c5492b091502c9fcf70aa073b51b37.tar.bz2 samba-1824d52ff2c5492b091502c9fcf70aa073b51b37.zip | |
r3740: Convert more files to .mk, fix the build
(This used to be commit a7c3c8cb6256acf672996fc6bf6128865a9ba0a9)
Diffstat (limited to 'source4/libcli')
| -rw-r--r-- | source4/libcli/config.m4 | 20 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 19 | ||||
| -rw-r--r-- | source4/libcli/libsmb.mk | 4 |
3 files changed, 20 insertions, 23 deletions
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4 index 32a62dbb20..d0d8f3015b 100644 --- a/source4/libcli/config.m4 +++ b/source4/libcli/config.m4 @@ -27,23 +27,3 @@ SMB_SUBSYSTEM(LIBCLI_RAW,[], libcli/raw/rawacl.o libcli/raw/rawdate.o], [${LIBCLI_RAW_LIBS}]) - -SMB_SUBSYSTEM(LIBCLI_UTILS,[], - [libcli/util/asn1.o - libcli/util/smberr.o - libcli/util/doserr.o - libcli/util/errormap.o - libcli/util/clierror.o - libcli/util/nterr.o - libcli/util/smbdes.o - libcli/util/smbencrypt.o - libcli/util/dom_sid.o]) - -SMB_SUBSYSTEM(LIBCLI_NMB,[], - [libcli/unexpected.o - libcli/namecache.o - libcli/nmblib.o - libcli/namequery.o]) - -SMB_SUBSYSTEM(LIBCLI,[],[],[], - [LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH LIBCLI_NMB]) diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk index e69de29bb2..c931d061fb 100644 --- a/source4/libcli/config.mk +++ b/source4/libcli/config.mk @@ -0,0 +1,19 @@ +[SUBSYSTEM::LIBCLI_UTILS] +ADD_OBJ_FILES = libcli/util/asn1.o \ + libcli/util/smberr.o \ + libcli/util/doserr.o \ + libcli/util/errormap.o \ + libcli/util/clierror.o \ + libcli/util/nterr.o \ + libcli/util/smbdes.o \ + libcli/util/smbencrypt.o \ + libcli/util/dom_sid.o + +[SUBSYSTEM::LIBCLI_NMB] +ADD_OBJ_FILES = libcli/unexpected.o \ + libcli/namecache.o \ + libcli/nmblib.o \ + libcli/namequery.o + +[SUBSYSTEM::LIBCLI] +REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH LIBCLI_NMB diff --git a/source4/libcli/libsmb.mk b/source4/libcli/libsmb.mk index 8d70888d5e..ddc4eac35a 100644 --- a/source4/libcli/libsmb.mk +++ b/source4/libcli/libsmb.mk @@ -1,8 +1,6 @@ -dnl # LIBSMB subsystem - [SUBSYSTEM::LIBSMB] REQUIRED_SUBSYSTEMS = LIBCLI LIBRPC SOCKET -ADD_OBJ_LIST = libcli/clireadwrite.o \ +ADD_OBJ_FILES = libcli/clireadwrite.o \ libcli/cliconnect.o \ libcli/clifile.o \ libcli/clilist.o \ |