svn commit: samba r3740 - in branches/SAMBA_4_0/source:
build/smb_build libcli librpc
jelmer at samba.org
jelmer at samba.org
Sun Nov 14 23:10:05 GMT 2004
Author: jelmer
Date: 2004-11-14 23:10:04 +0000 (Sun, 14 Nov 2004)
New Revision: 3740
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3740
Log:
Convert more files to .mk, fix the build
Modified:
branches/SAMBA_4_0/source/build/smb_build/input.pm
branches/SAMBA_4_0/source/build/smb_build/main.pm
branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm
branches/SAMBA_4_0/source/libcli/config.m4
branches/SAMBA_4_0/source/libcli/config.mk
branches/SAMBA_4_0/source/libcli/libsmb.mk
branches/SAMBA_4_0/source/librpc/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2004-11-14 23:10:04 UTC (rev 3740)
@@ -11,7 +11,7 @@
package input;
my $subsystem_output_type = "OBJLIST";
-our $srcdir = ".";
+my $srcdir = ".";
sub strtrim($)
{
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pm 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pm 2004-11-14 23:10:04 UTC (rev 3740)
@@ -51,7 +51,9 @@
"torture/config.mk",
"librpc/config.mk",
"client/config.mk",
- "libcli/libsmb.mk");
+ "libcli/libsmb.mk",
+ "libcli/config.mk"
+ );
$| = 1;
Modified: branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/build/smb_build/smb_build_h.pm 2004-11-14 23:10:04 UTC (rev 3740)
@@ -103,13 +103,13 @@
$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;
Modified: branches/SAMBA_4_0/source/libcli/config.m4
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.m4 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/libcli/config.m4 2004-11-14 23:10:04 UTC (rev 3740)
@@ -27,23 +27,3 @@
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])
Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/libcli/config.mk 2004-11-14 23:10:04 UTC (rev 3740)
@@ -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
Modified: branches/SAMBA_4_0/source/libcli/libsmb.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/libsmb.mk 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/libcli/libsmb.mk 2004-11-14 23:10:04 UTC (rev 3740)
@@ -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 \
Modified: branches/SAMBA_4_0/source/librpc/config.mk
===================================================================
--- branches/SAMBA_4_0/source/librpc/config.mk 2004-11-14 22:47:39 UTC (rev 3739)
+++ branches/SAMBA_4_0/source/librpc/config.mk 2004-11-14 23:10:04 UTC (rev 3740)
@@ -25,7 +25,7 @@
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 @@
################################################
# 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
################################################
More information about the samba-cvs
mailing list