summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2004-11-14 16:22:01 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:47 -0500
commit8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71 (patch)
tree8e8ccaddb94efc6a85ab6c339cab76cea1f44085 /source4/lib
parent7367d23713a34a6c29a492adb365292399adffe8 (diff)
downloadsamba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.gz
samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.tar.bz2
samba-8e16d8a76f8a3b8ccc89eb317c8e5daa6cf43b71.zip
r3733: More build system fixes/features:
- Use .mk files directly (no need for a SMB_*_MK() macro when adding a new SUBSYSTEM, MODULE or BINARY). This allows addition of new modules and subsystems without running configure - Add support for generating .dot files with the Samba4 dependency tree (as used by the graphviz and springgraph utilities) (This used to be commit 64826da834e26ee0488674e27a0eae36491ee179)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/basic.m47
-rw-r--r--source4/lib/basic.mk10
-rw-r--r--source4/lib/dcom/config.m41
-rw-r--r--source4/lib/ldb/config.m422
-rw-r--r--source4/lib/ldb/config.mk2
-rw-r--r--source4/lib/messaging/config.m41
-rw-r--r--source4/lib/registry/config.m416
-rw-r--r--source4/lib/registry/config.mk6
-rw-r--r--source4/lib/socket/config.m46
-rw-r--r--source4/lib/socket/config.mk3
-rw-r--r--source4/lib/tdb/config.m413
-rw-r--r--source4/lib/tdb/config.mk1
12 files changed, 17 insertions, 71 deletions
diff --git a/source4/lib/basic.m4 b/source4/lib/basic.m4
deleted file mode 100644
index b3327b6dcc..0000000000
--- a/source4/lib/basic.m4
+++ /dev/null
@@ -1,7 +0,0 @@
-dnl # LIB BASIC subsystem
-
-SMB_SUBSYSTEM_MK(LIBREPLACE,lib/basic.mk)
-SMB_SUBSYSTEM_MK(LIBNETIF,lib/basic.mk)
-SMB_SUBSYSTEM_NOPROTO(LIBCRYPTO)
-SMB_SUBSYSTEM_MK(LIBCRYPTO,lib/basic.mk)
-SMB_SUBSYSTEM_MK(LIBBASIC,lib/basic.mk)
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 827aa0a57c..68f41db089 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -22,6 +22,7 @@ ADD_OBJ_FILES = \
##############################
# Start SUBSYSTEM LIBCRYPTO
[SUBSYSTEM::LIBCRYPTO]
+NOPROTO = YES
INIT_OBJ_FILES = \
lib/crypto/crc32.o
ADD_OBJ_FILES = \
@@ -31,7 +32,6 @@ ADD_OBJ_FILES = \
# End SUBSYSTEM LIBCRYPTO
##############################
-
##############################
# Start SUBSYSTEM LIBBASIC
[SUBSYSTEM::LIBBASIC]
@@ -66,15 +66,15 @@ ADD_OBJ_FILES = \
lib/select.o \
lib/pam_errors.o \
intl/lang_tdb.o \
- lib/gencache.o \
lib/module.o \
lib/mutex.o \
lib/events.o \
- lib/db_wrap.o \
lib/server_mutex.o \
lib/idtree.o \
- lib/unix_privs.o
+ lib/unix_privs.o \
+ lib/db_wrap.o \
+ lib/gencache.o
REQUIRED_SUBSYSTEMS = \
- LIBTDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO
+ LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL
# End SUBSYSTEM LIBBASIC
##############################
diff --git a/source4/lib/dcom/config.m4 b/source4/lib/dcom/config.m4
deleted file mode 100644
index 206b916fa6..0000000000
--- a/source4/lib/dcom/config.m4
+++ /dev/null
@@ -1 +0,0 @@
-SMB_SUBSYSTEM_MK(LIBDCOM,lib/dcom/config.mk)
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4
index a4e7a0dba9..5701b1b5c3 100644
--- a/source4/lib/ldb/config.m4
+++ b/source4/lib/ldb/config.m4
@@ -2,28 +2,6 @@ if test x"$with_ldap_support" = x"yes"; then
SMB_MODULE_DEFAULT(libldb_ldap,STATIC)
fi
-SMB_SUBSYSTEM_MK(LIBLDB,lib/ldb/config.mk)
-
-SMB_MODULE_MK(libldb_ldap,LIBLDB,NOT,lib/ldb/config.mk)
-
-SMB_MODULE_MK(libldb_tdb,LIBLDB,STATIC,lib/ldb/config.mk)
-
if test x"$experimental" = x"yes"; then
SMB_LIBRARY_ENABLE(libldb,YES)
fi
-
-SMB_LIBRARY_MK(libldb,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbadd,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbdel,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbmodify,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbsearch,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbedit,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbrename,lib/ldb/config.mk)
-
-SMB_BINARY_MK(ldbtest,lib/ldb/config.mk)
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 10b8c76f97..81c6382292 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -1,6 +1,7 @@
################################################
# Start MODULE libldb_ldap
[MODULE::libldb_ldap]
+SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/ldb_ldap/ldb_ldap.o
REQUIRED_SUBSYSTEMS = \
@@ -11,6 +12,7 @@ REQUIRED_SUBSYSTEMS = \
################################################
# Start MODULE libldb_tdb
[MODULE::libldb_tdb]
+SUBSYSTEM = LIBLDB
INIT_OBJ_FILES = \
lib/ldb/ldb_tdb/ldb_tdb.o
ADD_OBJ_FILES = \
diff --git a/source4/lib/messaging/config.m4 b/source4/lib/messaging/config.m4
deleted file mode 100644
index 1797069ff2..0000000000
--- a/source4/lib/messaging/config.m4
+++ /dev/null
@@ -1 +0,0 @@
-SMB_SUBSYSTEM_MK(MESSAGING,lib/messaging/config.mk)
diff --git a/source4/lib/registry/config.m4 b/source4/lib/registry/config.m4
index f3681e7828..abadcbe1a0 100644
--- a/source4/lib/registry/config.m4
+++ b/source4/lib/registry/config.m4
@@ -15,22 +15,6 @@ if test t$SMB_EXT_LIB_ENABLE_gconf = tYES; then
SMB_MODULE_DEFAULT(registry_gconf, STATIC)
fi
-SMB_MODULE_MK(registry_nt4, REGISTRY, STATIC, lib/registry/config.mk)
-SMB_MODULE_MK(registry_w95, REGISTRY, STATIC, lib/registry/config.mk)
-SMB_MODULE_MK(registry_dir, REGISTRY, STATIC, lib/registry/config.mk)
-SMB_MODULE_MK(registry_rpc, REGISTRY, STATIC, lib/registry/config.mk)
-SMB_MODULE_MK(registry_gconf, REGISTRY, STATIC, lib/registry/config.mk)
-SMB_MODULE_MK(registry_ldb, REGISTRY, STATIC, lib/registry/config.mk)
-
-SMB_SUBSYSTEM_MK(REGISTRY,lib/registry/config.mk)
-
-SMB_BINARY_MK(regdiff, lib/registry/config.mk)
-SMB_BINARY_MK(regpatch, lib/registry/config.mk)
-SMB_BINARY_MK(regshell, lib/registry/config.mk)
-SMB_BINARY_MK(regtree, lib/registry/config.mk)
-
if test x"$experimental" = x"yes"; then
SMB_LIBRARY_ENABLE(libwinregistry, YES)
fi
-
-SMB_LIBRARY_MK(libwinregistry, lib/registry/config.mk)
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index bebd8bf1d7..1a12b0ade6 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -4,6 +4,7 @@
# Start MODULE registry_nt4
[MODULE::registry_nt4]
INIT_FUNCTION = registry_nt4_init
+SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
lib/registry/reg_backend_nt4/reg_backend_nt4.o
# End MODULE registry_nt4
@@ -13,6 +14,7 @@ INIT_OBJ_FILES = \
# Start MODULE registry_w95
[MODULE::registry_w95]
INIT_FUNCTION = registry_w95_init
+SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
lib/registry/reg_backend_w95/reg_backend_w95.o
# End MODULE registry_w95
@@ -22,6 +24,7 @@ INIT_OBJ_FILES = \
# Start MODULE registry_dir
[MODULE::registry_dir]
INIT_FUNCTION = registry_dir_init
+SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
lib/registry/reg_backend_dir/reg_backend_dir.o
# End MODULE registry_dir
@@ -31,6 +34,7 @@ INIT_OBJ_FILES = \
# Start MODULE registry_rpc
[MODULE::registry_rpc]
INIT_FUNCTION = registry_rpc_init
+SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
lib/registry/reg_backend_rpc/reg_backend_rpc.o
REQUIRED_SUBSYSTEMS = \
@@ -42,6 +46,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE registry_gconf
[MODULE::registry_gconf]
INIT_FUNCTION = registry_gconf_init
+SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
lib/registry/reg_backend_gconf/reg_backend_gconf.o
REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
@@ -52,6 +57,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf
# Start MODULE registry_ldb
[MODULE::registry_ldb]
INIT_FUNCTION = registry_ldb_init
+SUBSYSTEM = REGISTRY
INIT_OBJ_FILES = \
lib/registry/reg_backend_ldb/reg_backend_ldb.o
REQUIRED_SUBSYSTEMS = \
diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index 37eff7ded1..1140c139cb 100644
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -1,7 +1,4 @@
-SMB_MODULE_MK(socket_ipv4,SOCKET,STATIC,lib/socket/config.mk)
-SMB_MODULE_MK(socket_unix,SOCKET,STATIC,lib/socket/config.mk)
-
dnl test for ipv6 using the gethostbyname2() function. That should be sufficient
dnl for now
AC_CHECK_FUNCS(gethostbyname2, have_ipv6=true, have_ipv6=false)
@@ -12,6 +9,3 @@ fi
dnl don't build ipv6 by default, unless the above test enables it, or
dnl the configure uses --with-static-modules=socket_ipv6
-SMB_MODULE_MK(socket_ipv6,SOCKET,NOT,lib/socket/config.mk)
-
-SMB_SUBSYSTEM_MK(SOCKET,lib/socket/config.mk)
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 76e5895933..6217fbc079 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -2,6 +2,7 @@
################################################
# Start MODULE socket_ipv4
[MODULE::socket_ipv4]
+SUBSYSTEM = SOCKET
INIT_OBJ_FILES = \
lib/socket/socket_ipv4.o
# End MODULE socket_ipv4
@@ -10,6 +11,7 @@ INIT_OBJ_FILES = \
################################################
# Start MODULE socket_ipv6
[MODULE::socket_ipv6]
+SUBSYSTEM = SOCKET
INIT_OBJ_FILES = \
lib/socket/socket_ipv6.o
# End MODULE socket_ipv6
@@ -18,6 +20,7 @@ INIT_OBJ_FILES = \
################################################
# Start MODULE socket_unix
[MODULE::socket_unix]
+SUBSYSTEM = SOCKET
INIT_OBJ_FILES = \
lib/socket/socket_unix.o
# End MODULE socket_unix
diff --git a/source4/lib/tdb/config.m4 b/source4/lib/tdb/config.m4
index d9b44b75a5..414ccfdfed 100644
--- a/source4/lib/tdb/config.m4
+++ b/source4/lib/tdb/config.m4
@@ -1,12 +1,8 @@
-SMB_SUBSYSTEM_MK(LIBTDB,lib/tdb/config.mk)
-
if test x"$experimental" = x"yes"; then
SMB_LIBRARY_ENABLE(libtdb,YES)
fi
-SMB_LIBRARY_MK(libtdb,lib/tdb/config.mk)
-
###############################
# start SMB_EXT_LIB_GDBM
# check for gdbm.h and -lgdbm
@@ -23,12 +19,3 @@ SMB_BINARY_ENABLE(tdbtest, NO)
if test x"$SMB_EXT_LIB_ENABLE_GDBM" = x"YES"; then
SMB_BINARY_ENABLE(tdbtest, YES)
fi
-SMB_BINARY_MK(tdbtest,lib/tdb/config.mk)
-
-SMB_BINARY_MK(tdbtorture,lib/tdb/config.mk)
-
-SMB_BINARY_MK(tdbdump,lib/tdb/config.mk)
-
-# these are broken
-#SMB_BINARY_MK(tdbtool,lib/tdb/config.mk)
-#SMB_BINARY_MK(tdbbackup,lib/tdb/config.mk)
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 1801e30e0a..bfcd462453 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -67,6 +67,7 @@ REQUIRED_SUBSYSTEMS = \
################################################
# Start BINARY tdbbackup
[BINARY::tdbbackup]
+ENABLE = NO
OBJ_FILES= \
lib/tdb/tools/tdbbackup.o
REQUIRED_SUBSYSTEMS = \
generated by cgit (git 2.34.1) at 2024-11-24 20:09:07 +0000