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

(This used to be commit d7d48adce9628ee7a0d2f8ac3504745aaeb912b9)

diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm
index 75e2a62d3ce7b79758e991477e6db6d8ade49c1a..620812a457d8aca34933da7033fa27011c06a7c6 100644 (file)
--- a/source4/build/smb_build/main.pm
+++ b/source4/build/smb_build/main.pm
@@ -59,7 +59,6 @@ sub smb_build_main($)
                "torture/config.mk",
                "librpc/config.mk",
                "client/config.mk",
-               "libcli/libsmb.mk",
                "libcli/config.mk",
                "libcli/security/config.mk",
                "lib/com/config.mk",

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 617c8184ab9a80cee6dda76d27bdcb2404166312..82796f4246c5c0cf016a79ab6105e0b99289d08a 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/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/source4/libcli/libsmb.mk b/source4/libcli/libsmb.mk
deleted file mode 100644 (file)
index 5f314df..0000000
--- a/source4/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