summaryrefslogtreecommitdiffstats
path: root/source/libcli
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2005-05-27 07:38:41 +0000
committerTim Potter <tpot@samba.org>2005-05-27 07:38:41 +0000
commit079a19a412b3b85e8a96c168c6f5abdad92fba11 (patch)
tree6d9677b82eac29b1137f3668294646bb9b3ad92b /source/libcli
parent795e05a130c55d7f73cedc2e268b891a9085cd0e (diff)
downloadsamba-079a19a412b3b85e8a96c168c6f5abdad92fba11.tar.gz
samba-079a19a412b3b85e8a96c168c6f5abdad92fba11.tar.xz
samba-079a19a412b3b85e8a96c168c6f5abdad92fba11.zip
r7010: Merge libcli/libsmb.mk into libcli/config.mk
Diffstat (limited to 'source/libcli')
-rw-r--r--source/libcli/config.mk10
-rw-r--r--source/libcli/libsmb.mk9
2 files changed, 10 insertions, 9 deletions
diff --git a/source/libcli/config.mk b/source/libcli/config.mk
index 617c8184ab9..82796f4246c 100644
--- a/source/libcli/config.mk
+++ b/source/libcli/config.mk
@@ -71,3 +71,13 @@ REQUIRED_SUBSYSTEMS = LIBCLI_NBT
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
diff --git a/source/libcli/libsmb.mk b/source/libcli/libsmb.mk
deleted file mode 100644
index 5f314dfca16..00000000000
--- a/source/libcli/libsmb.mk
+++ /dev/null
@@ -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