mirror of
https://github.com/samba-team/samba.git
synced 2024-12-28 07:21:54 +03:00
r3740: Convert more files to .mk, fix the build
This commit is contained in:
parent
2a38b77a1d
commit
a7c3c8cb62
@ -11,7 +11,7 @@ use strict;
|
||||
package input;
|
||||
|
||||
my $subsystem_output_type = "OBJLIST";
|
||||
our $srcdir = ".";
|
||||
my $srcdir = ".";
|
||||
|
||||
sub strtrim($)
|
||||
{
|
||||
|
@ -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;
|
||||
|
||||
|
@ -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;
|
||||
|
@ -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])
|
||||
|
@ -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
|
@ -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 \
|
||||
|
@ -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
|
||||
################################################
|
||||
|
Loading…
Reference in New Issue
Block a user