r866: convert the rest of the binaries to config.mk files

metze

diff --git a/source/client/config.m4 b/source/client/config.m4
new file mode 100644 (file)
index 0000000..db753be
--- /dev/null
+++ b/source/client/config.m4
@@ -0,0 +1,4 @@
+dnl # client subsystem
+
+
+SMB_BINARY_MK(smbclient, client/config.mk)

diff --git a/source/client/config.mk b/source/client/config.mk
new file mode 100644 (file)
index 0000000..6a26a5d
--- /dev/null
+++ b/source/client/config.mk
@@ -0,0 +1,15 @@
+# client subsystem
+
+#################################
+# Start BINARY smbclient
+[BINARY::smbclient]
+OBJ_FILES = \
+               client/client.o \
+               client/clitar.o
+REQUIRED_SUBSYSTEMS = \
+               CONFIG \
+               LIBCMDLINE \
+               LIBBASIC \
+               LIBSMB
+# End BINARY smbclient
+#################################

diff --git a/source/configure.in b/source/configure.in
index 32b600dc3bcf201dcb76e8cb6f58d119a38dc0d4..7539da429014d1d8b3d18813addd481e58d2527e 100644 (file)
--- a/source/configure.in
+++ b/source/configure.in
@@ -223,6 +223,9 @@ SMB_INCLUDE_M4(rpc_server/config.m4)
 SMB_INCLUDE_M4(lib/registry/config.m4)
 SMB_INCLUDE_M4(torture/config.m4)
 SMB_INCLUDE_M4(scripting/config.m4)
+SMB_INCLUDE_M4(client/config.m4)
+SMB_INCLUDE_M4(utils/config.m4)
+SMB_INCLUDE_M4(smbd/config.m4)
 
 ALLLIBS_LIBS="$LIBS"
 ALLLIBS_CFLAGS="$CFLAGS"
@@ -237,35 +240,6 @@ SMB_EXT_LIB(ALLLIBS,
                [${ALLLIBS_CPPFLAGS}],
                [${ALLLIBS_LDFLAGS}])
 
-SMB_INCLUDE_M4(smbd/config.m4)
-
-SMB_BINARY(smbclient, [ALL], [BIN], 
-       [client/client.o
-       client/clitar.o],
-       [],
-       [LIBSMB CONFIG LIBBASIC LIBCMDLINE])
-
-SMB_BINARY(ndrdump, [ALL], [BIN],
-       [utils/ndrdump.o],
-       [],
-       [LIBSMB CONFIG LIBBASIC LIBCMDLINE])
-
-SMB_BINARY(gentest, [ALL], [BIN],
-       [torture/gentest.o
-       torture/torture_util.o],
-       [],
-       [LIBSMB CONFIG LIBBASIC LIBCMDLINE])
-
-SMB_BINARY(masktest, [ALL], [BIN], 
-       [torture/masktest.o],
-       [],
-       [LIBSMB CONFIG LIBBASIC LIBCMDLINE])
-
-SMB_BINARY(locktest, [ALL], [BIN],
-       [torture/locktest.o],
-       [],
-       [LIBSMB CONFIG LIBBASIC LIBCMDLINE])
-
 AC_DEFINE_UNQUOTED(STRING_STATIC_MODULES, "$string_static_modules", [String list of builtin modules])
 
 #################################################

diff --git a/source/smbd/config.m4 b/source/smbd/config.m4
index 0f2f65a14e7f6234890aacf2962941f9e13a9108..dd7a7077145c0458d4b21e175839ac0be46f74df 100644 (file)
--- a/source/smbd/config.m4
+++ b/source/smbd/config.m4
@@ -1,4 +1,4 @@
-dnl # SMB server subsystem
+dnl # server subsystem
 
 SMB_MODULE_MK(server_smb,SERVER,STATIC,smbd/config.mk)
 SMB_MODULE_MK(server_rpc,SERVER,STATIC,smbd/config.mk)

diff --git a/source/torture/config.m4 b/source/torture/config.m4
index d93aadfee0ab7a3886983bd78225488d15982c14..fb0df317b803d245f9ea83df1a63f32d649350af 100644 (file)
--- a/source/torture/config.m4
+++ b/source/torture/config.m4
@@ -9,3 +9,6 @@ SMB_SUBSYSTEM_MK(TORTURE_RPC,torture/config.mk)
 SMB_SUBSYSTEM_MK(TORTURE_NBENCH,torture/config.mk)
 
 SMB_BINARY_MK(smbtorture,torture/config.mk)
+SMB_BINARY_MK(gentest,torture/config.mk)
+SMB_BINARY_MK(masktest,torture/config.mk)
+SMB_BINARY_MK(locktest,torture/config.mk)

diff --git a/source/torture/config.mk b/source/torture/config.mk
index 61d95a33b60f69221a28c6ad2ea057b234e764d0..05f4df210542563afa1a284a24a455c0940d1d68 100644 (file)
--- a/source/torture/config.mk
+++ b/source/torture/config.mk
@@ -92,3 +92,43 @@ REQUIRED_SUBSYSTEMS = \
                LIBBASIC
 # End BINARY smbtorture
 #################################
+
+#################################
+# Start BINARY gentest
+[BINARY::gentest]
+OBJ_FILES = \
+               torture/gentest.o \
+               torture/torture_util.o
+REQUIRED_SUBSYSTEMS = \
+               LIBSMB \
+               CONFIG \
+               LIBBASIC \
+               LIBCMDLINE
+# End BINARY gentest
+#################################
+
+#################################
+# Start BINARY masktest
+[BINARY::masktest]
+OBJ_FILES = \
+               torture/masktest.o
+REQUIRED_SUBSYSTEMS = \
+               LIBSMB \
+               CONFIG \
+               LIBBASIC \
+               LIBCMDLINE
+# End BINARY masktest
+#################################
+
+#################################
+# Start BINARY locktest
+[BINARY::locktest]
+OBJ_FILES = \
+               torture/locktest.o
+REQUIRED_SUBSYSTEMS = \
+               LIBSMB \
+               CONFIG \
+               LIBBASIC \
+               LIBCMDLINE
+# End BINARY locktest
+#################################

diff --git a/source/utils/config.m4 b/source/utils/config.m4
new file mode 100644 (file)
index 0000000..a4730e4
--- /dev/null
+++ b/source/utils/config.m4
@@ -0,0 +1,3 @@
+dnl # utils subsystem
+
+SMB_BINARY_MK(ndrdump, utils/config.mk)

diff --git a/source/utils/config.mk b/source/utils/config.mk
new file mode 100644 (file)
index 0000000..405640d
--- /dev/null
+++ b/source/utils/config.mk
@@ -0,0 +1,14 @@
+# utils subsystem
+
+#################################
+# Start BINARY ndrdump
+[BINARY::ndrdump]
+OBJ_FILES = \
+               utils/ndrdump.o
+REQUIRED_SUBSYSTEMS = \
+               CONFIG \
+               LIBCMDLINE \
+               LIBBASIC \
+               LIBSMB
+# End BINARY ndrdump
+#################################