summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-14 23:10:04 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:48 -0500
commit1824d52ff2c5492b091502c9fcf70aa073b51b37 (patch)
tree731b0db2b13a6a082bb00930d9f733870bc8f940
parent3757bf5c5bd1e218ea8153964d69c00a164a17e5 (diff)
downloadsamba-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)
-rw-r--r--source4/build/smb_build/input.pm2
-rw-r--r--source4/build/smb_build/main.pm4
-rw-r--r--source4/build/smb_build/smb_build_h.pm4
-rw-r--r--source4/libcli/config.m420
-rw-r--r--source4/libcli/config.mk19
-rw-r--r--source4/libcli/libsmb.mk4
-rw-r--r--source4/librpc/config.mk4
7 files changed, 28 insertions, 29 deletions
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index f50f8baaaf..ddeddc6ec1 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -11,7 +11,7 @@ use strict;
package input;
my $subsystem_output_type = "OBJLIST";
-our $srcdir = ".";
+my $srcdir = ".";
sub strtrim($)
{
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 928921f8fd..4329038221 100644
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -51,7 +51,9 @@ sub smb_build_main($)
"torture/config.mk",
"librpc/config.mk",
"client/config.mk",
- "libcli/libsmb.mk");
+ "libcli/libsmb.mk",
+ "libcli/config.mk"
+ );
$| = 1;
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index f074f92199..6d67eedf60 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -103,13 +103,13 @@ sub create_smb_build_h($)
$output .= _prepare_smb_build_h($CTX);
- open(SMB_BUILD_H,"> $input::srcdir/include/smb_build.h") || die ("Can't open include/smb_build.h\n");
+ open(SMB_BUILD_H,"> include/smb_build.h") || die ("Can't open include/smb_build.h\n");
print SMB_BUILD_H $output;
close(SMB_BUILD_H);
- print "config.smb_build.pl: creating $input::srcdir/include/smb_build.h\n";
+ print "config.smb_build.pl: creating include/smb_build.h\n";
return;
}
1;
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 \
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 39c4e9c12b..8a845a186a 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -25,7 +25,7 @@ ADD_OBJ_FILES = \
librpc/rpc/dcerpc_spnego.o \
librpc/rpc/dcerpc_smb.o \
librpc/rpc/dcerpc_sock.o
-REQUIRED_SUBSYSTEMS = LIBSMB SOCKET
+REQUIRED_SUBSYSTEMS = SOCKET
# End SUBSYSTEM LIBRPC_RAW
################################################
@@ -84,6 +84,6 @@ ADD_OBJ_FILES = \
################################################
# Start SUBSYSTEM LIBRPC
[SUBSYSTEM::LIBRPC]
-REQUIRED_SUBSYSTEMS = LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW LIBDCOM
+REQUIRED_SUBSYSTEMS = LIBNDR_RAW LIBNDR_GEN LIBRPC_RAW LIBSMB LIBDCOM
# End SUBSYSTEM LIBRPC
################################################