3 files changed, 20 insertions, 23 deletions
diff --git a/source4/libcli/config.m4 b/source4/libcli/config.m4
index 32a62dbb20..d0d8f3015b 100644
--- a/source4/libcli/config.m4
+++ b/source4/libcli/config.m4
@@ -27,23 +27,3 @@ SMB_SUBSYSTEM(LIBCLI_RAW,[],
 		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])
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index e69de29bb2..c931d061fb 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -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
diff --git a/source4/libcli/libsmb.mk b/source4/libcli/libsmb.mk
index 8d70888d5e..ddc4eac35a 100644
--- a/source4/libcli/libsmb.mk
+++ b/source4/libcli/libsmb.mk
@@ -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 \