diff options
| author | Tim Potter <tpot@samba.org> | 2005-05-27 07:38:41 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:17:05 -0500 |
| commit | 9b8c012392b6810786267a2a744540fba3878f05 (patch) | |
| tree | af093d3644fe92ce6a18d3b58604639ac52af366 | |
| parent | 1454d5a4cf2ed11b0c9e084340cf7519e2dd567e (diff) | |
| download | samba-9b8c012392b6810786267a2a744540fba3878f05.tar.gz samba-9b8c012392b6810786267a2a744540fba3878f05.tar.bz2 samba-9b8c012392b6810786267a2a744540fba3878f05.zip | |
r7010: Merge libcli/libsmb.mk into libcli/config.mk
(This used to be commit d7d48adce9628ee7a0d2f8ac3504745aaeb912b9)
| -rw-r--r-- | source4/build/smb_build/main.pm | 1 | ||||
| -rw-r--r-- | source4/libcli/config.mk | 10 | ||||
| -rw-r--r-- | source4/libcli/libsmb.mk | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/source4/build/smb_build/main.pm b/source4/build/smb_build/main.pm index 75e2a62d3c..620812a457 100644 --- 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 617c8184ab..82796f4246 100644 --- 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 index 5f314dfca1..0000000000 --- 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 |