r3740: Convert more files to .mk, fix the build

(This used to be commit a7c3c8cb6256acf672996fc6bf6128865a9ba0a9)

diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index f50f8baaafe801b95dece3e440ddf4d182b6cc10..ddeddc6ec1b61757dcc168f8440c664b9f982c69 100644 (file)
--- 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 928921f8fd1debd72cb43ea546d1f475f8d8c718..432903822147f721202a42bc68e02195309ea9a4 100644 (file)
--- 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 f074f92199f46507889aabcd81c758551b11ed37..6d67eedf60c9a91940f3fcdd2e67b07ae2af65b5 100644 (file)
--- 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 32a62dbb2012955974c08e19be860242c80eebfa..d0d8f3015bbe0de919223cb21f4cf30a5dd9563a 100644 (file)
--- 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 e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..c931d061fbe9971cc1bfa6e98bc3c62ea9f10f55 100644 (file)
--- 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 8d70888d5ed19ed07f3e7b77824ac8c835ed95d7..ddc4eac35aea39bd4c20368ca36ec34a8fa68640 100644 (file)
--- 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 39c4e9c12b8229195b83157dff17e3f94b8409e7..8a845a186a40d06db6af7c830a7bb589639a3659 100644 (file)
--- 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
 ################################################