diff options
| -rw-r--r-- | source4/client/config.m4 | 4 | ||||
| -rw-r--r-- | source4/client/config.mk | 15 | ||||
| -rw-r--r-- | source4/configure.in | 32 | ||||
| -rw-r--r-- | source4/smbd/config.m4 | 2 | ||||
| -rw-r--r-- | source4/torture/config.m4 | 3 | ||||
| -rw-r--r-- | source4/torture/config.mk | 40 | ||||
| -rw-r--r-- | source4/utils/config.m4 | 3 | ||||
| -rw-r--r-- | source4/utils/config.mk | 14 |
8 files changed, 83 insertions, 30 deletions
diff --git a/source4/client/config.m4 b/source4/client/config.m4 new file mode 100644 index 0000000000..db753bec45 --- /dev/null +++ b/source4/client/config.m4 @@ -0,0 +1,4 @@ +dnl # client subsystem + + +SMB_BINARY_MK(smbclient, client/config.mk) diff --git a/source4/client/config.mk b/source4/client/config.mk new file mode 100644 index 0000000000..6a26a5d324 --- /dev/null +++ b/source4/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/source4/configure.in b/source4/configure.in index 32b600dc3b..7539da4290 100644 --- a/source4/configure.in +++ b/source4/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/source4/smbd/config.m4 b/source4/smbd/config.m4 index 0f2f65a14e..dd7a707714 100644 --- a/source4/smbd/config.m4 +++ b/source4/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/source4/torture/config.m4 b/source4/torture/config.m4 index d93aadfee0..fb0df317b8 100644 --- a/source4/torture/config.m4 +++ b/source4/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/source4/torture/config.mk b/source4/torture/config.mk index 61d95a33b6..05f4df2105 100644 --- a/source4/torture/config.mk +++ b/source4/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/source4/utils/config.m4 b/source4/utils/config.m4 new file mode 100644 index 0000000000..a4730e42b9 --- /dev/null +++ b/source4/utils/config.m4 @@ -0,0 +1,3 @@ +dnl # utils subsystem + +SMB_BINARY_MK(ndrdump, utils/config.mk) diff --git a/source4/utils/config.mk b/source4/utils/config.mk new file mode 100644 index 0000000000..405640deb7 --- /dev/null +++ b/source4/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 +################################# |