svn commit: samba r7010 - in branches/SAMBA_4_0/source: build/smb_build libcli

[tpot at samba.org]

Author: tpot
Date: 2005-05-27 07:38:41 +0000 (Fri, 27 May 2005)
New Revision: 7010

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7010

Log:
Merge libcli/libsmb.mk into libcli/config.mk

Removed:
   branches/SAMBA_4_0/source/libcli/libsmb.mk
Modified:
   branches/SAMBA_4_0/source/build/smb_build/main.pm
   branches/SAMBA_4_0/source/libcli/config.mk


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pm	2005-05-27 07:30:24 UTC (rev 7009)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pm	2005-05-27 07:38:41 UTC (rev 7010)
@@ -59,7 +59,6 @@
 		"torture/config.mk",
 		"librpc/config.mk",
 		"client/config.mk",
-		"libcli/libsmb.mk",
 		"libcli/config.mk",
 		"libcli/security/config.mk",
 		"lib/com/config.mk",

Modified: branches/SAMBA_4_0/source/libcli/config.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/config.mk	2005-05-27 07:30:24 UTC (rev 7009)
+++ branches/SAMBA_4_0/source/libcli/config.mk	2005-05-27 07:38:41 UTC (rev 7010)
@@ -71,3 +71,13 @@
 REQUIRED_SUBSYSTEMS = LIBCLI_RAW LIBCLI_UTILS LIBCLI_AUTH \
 	LIBCLI_COMPOSITE LIBCLI_NBT LIB_SECURITY LIBCLI_RESOLVE \
 	LIBCLI_DGRAM
+
+[SUBSYSTEM::LIBSMB]
+REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
+ADD_OBJ_FILES = libcli/clireadwrite.o \
+		libcli/cliconnect.o \
+		libcli/clifile.o \
+		libcli/clilist.o \
+		libcli/clitrans2.o \
+		libcli/climessage.o \
+		libcli/clideltree.o

Deleted: branches/SAMBA_4_0/source/libcli/libsmb.mk
===================================================================
--- branches/SAMBA_4_0/source/libcli/libsmb.mk	2005-05-27 07:30:24 UTC (rev 7009)
+++ branches/SAMBA_4_0/source/libcli/libsmb.mk	2005-05-27 07:38:41 UTC (rev 7010)
@@ -1,9 +0,0 @@
-[SUBSYSTEM::LIBSMB]
-REQUIRED_SUBSYSTEMS = LIBCLI SOCKET
-ADD_OBJ_FILES = libcli/clireadwrite.o \
-		libcli/cliconnect.o \
-		libcli/clifile.o \
-		libcli/clilist.o \
-		libcli/clitrans2.o \
-		libcli/climessage.o \
-		libcli/clideltree.o