diff options
Diffstat (limited to 'source4/lib')
-rw-r--r-- | source4/lib/appweb/config.mk | 4 | ||||
-rw-r--r-- | source4/lib/basic.mk | 2 | ||||
-rw-r--r-- | source4/lib/charset/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/cmdline/config.mk | 4 | ||||
-rw-r--r-- | source4/lib/com/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/events/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/ldb/config.mk | 32 | ||||
-rw-r--r-- | source4/lib/messaging/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/registry/config.mk | 34 | ||||
-rw-r--r-- | source4/lib/replace/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/socket/config.mk | 8 | ||||
-rw-r--r-- | source4/lib/talloc/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/tdb/config.mk | 12 | ||||
-rw-r--r-- | source4/lib/tdr/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/tls/config.mk | 2 | ||||
-rw-r--r-- | source4/lib/util/config.mk | 2 |
16 files changed, 55 insertions, 59 deletions
diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk index 5362043d3d..df0f81dccb 100644 --- a/source4/lib/appweb/config.mk +++ b/source4/lib/appweb/config.mk @@ -16,7 +16,7 @@ OBJ_FILES = \ ejs/ejsLex.o \ ejs/ejsParser.o \ ejs/ejsProcs.o -REQUIRED_SUBSYSTEMS = MPR +PUBLIC_DEPENDENCIES = MPR # End SUBSYSTEM EJS ####################### @@ -26,6 +26,6 @@ REQUIRED_SUBSYSTEMS = MPR OBJ_FILES = \ esp/esp.o \ esp/espProcs.o -REQUIRED_SUBSYSTEMS = EJS +PUBLIC_DEPENDENCIES = EJS # End SUBSYSTEM ESP ####################### diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index d6b355362c..3e4a422c3b 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -59,4 +59,4 @@ PUBLIC_PROTO_HEADER = db_wrap_proto.h PUBLIC_HEADERS = db_wrap.h OBJ_FILES = db_wrap.o \ gendb.o -REQUIRED_SUBSYSTEMS = ldb LIBTDB LDBSAMBA +PUBLIC_DEPENDENCIES = ldb LIBTDB LDBSAMBA diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 5f423b3ba6..023bd5c588 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -6,6 +6,6 @@ OBJ_FILES = \ charcnv.o PUBLIC_HEADERS = charset.h PUBLIC_PROTO_HEADER = charset_proto.h -REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV +PUBLIC_DEPENDENCIES = EXT_LIB_ICONV # End SUBSYSTEM CHARSET ################################################ diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk index cc82ba443e..b97bd75d82 100644 --- a/source4/lib/cmdline/config.mk +++ b/source4/lib/cmdline/config.mk @@ -1,7 +1,7 @@ [SUBSYSTEM::LIBCMDLINE_CREDENTIALS] PRIVATE_PROTO_HEADER = credentials.h OBJ_FILES = credentials.o -REQUIRED_SUBSYSTEMS = CREDENTIALS +PUBLIC_DEPENDENCIES = CREDENTIALS [SUBSYSTEM::POPT_SAMBA] PUBLIC_HEADERS = popt_common.h @@ -10,4 +10,4 @@ OBJ_FILES = popt_common.o [SUBSYSTEM::POPT_CREDENTIALS] PRIVATE_PROTO_HEADER = popt_credentials.h OBJ_FILES = popt_credentials.o -REQUIRED_SUBSYSTEMS = CREDENTIALS LIBCMDLINE_CREDENTIALS +PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index de6d598159..08c459a5f6 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -14,7 +14,7 @@ PRIVATE_PROTO_HEADER = dcom/proto.h OBJ_FILES = \ dcom/main.o \ dcom/tables.o -REQUIRED_SUBSYSTEMS = com DCOM_PROXY_DCOM RPC_NDR_REMACT \ +PUBLIC_DEPENDENCIES = com DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER [MODULE::com_simple] diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk index 607a7da130..5f770b971b 100644 --- a/source4/lib/events/config.mk +++ b/source4/lib/events/config.mk @@ -2,6 +2,6 @@ # Start SUBSYSTEM LIBEVENTS [SUBSYSTEM::LIBEVENTS] OBJ_FILES = events.o events_standard.o -REQUIRED_SUBSYSTEMS = LIBTALLOC +PUBLIC_DEPENDENCIES = LIBTALLOC # End SUBSYSTEM LIBEVENTS ############################## diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 59c316c8c1..60eb9e8984 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -76,7 +76,7 @@ INIT_FUNCTION = ldb_ildap_init ALIASES = ldapi ldaps ldap OBJ_FILES = \ ldb_ildap/ldb_ildap.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBCLI_LDAP # End MODULE ldb_ildap ################################################ @@ -84,7 +84,7 @@ REQUIRED_SUBSYSTEMS = \ ################################################ # Start MODULE ldb_map [SUBSYSTEM::ldb_map] -REQUIRED_SUBSYSTEMS = ldb +PUBLIC_DEPENDENCIES = ldb OBJ_FILES = modules/ldb_map.o # End MODULE ldb_map ################################################ @@ -105,7 +105,7 @@ SUBSYSTEM = ldb INIT_FUNCTION = ldb_sqlite3_init OBJ_FILES = \ ldb_sqlite3/ldb_sqlite3.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ EXT_LIB_SQLITE3 # End MODULE ldb_sqlite3 ################################################ @@ -122,7 +122,7 @@ OBJ_FILES = \ ldb_tdb/ldb_index.o \ ldb_tdb/ldb_cache.o \ ldb_tdb/ldb_tdb_wrap.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBTDB # End MODULE ldb_tdb ################################################ @@ -152,7 +152,7 @@ OBJ_FILES = \ common/ldb_dn.o \ common/ldb_controls.o \ common/qsort.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBREPLACE LIBTALLOC MANPAGE = man/ldb.3 PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h @@ -164,7 +164,7 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h # Start SUBSYSTEM LDBSAMBA [SUBSYSTEM::LDBSAMBA] PRIVATE_PROTO_HEADER = samba/ldif_handlers.h -REQUIRED_SUBSYSTEMS = LIB_SECURITY SAMDB +PUBLIC_DEPENDENCIES = LIB_SECURITY SAMDB OBJ_FILES = \ samba/ldif_handlers.o # End SUBSYSTEM LDBSAMBA @@ -175,7 +175,7 @@ OBJ_FILES = \ [SUBSYSTEM::LIBLDB_CMDLINE] OBJ_FILES= \ tools/cmdline.o -REQUIRED_SUBSYSTEMS = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS +PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS # End SUBSYSTEM LIBLDB_CMDLINE ################################################ @@ -185,7 +185,7 @@ REQUIRED_SUBSYSTEMS = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS INSTALLDIR = BINDIR OBJ_FILES = \ tools/ldbadd.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE MANPAGE = man/ldbadd.1 # End BINARY ldbadd @@ -197,7 +197,7 @@ MANPAGE = man/ldbadd.1 INSTALLDIR = BINDIR OBJ_FILES= \ tools/ldbdel.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE MANPAGE = man/ldbdel.1 # End BINARY ldbdel @@ -209,7 +209,7 @@ MANPAGE = man/ldbdel.1 INSTALLDIR = BINDIR OBJ_FILES= \ tools/ldbmodify.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE MANPAGE = man/ldbmodify.1 # End BINARY ldbmodify @@ -221,7 +221,7 @@ MANPAGE = man/ldbmodify.1 INSTALLDIR = BINDIR OBJ_FILES= \ tools/ldbsearch.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE MANPAGE = man/ldbsearch.1 # End BINARY ldbsearch @@ -233,7 +233,7 @@ MANPAGE = man/ldbsearch.1 INSTALLDIR = BINDIR OBJ_FILES= \ tools/ldbedit.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE MANPAGE = man/ldbedit.1 # End BINARY ldbedit @@ -245,7 +245,7 @@ MANPAGE = man/ldbedit.1 INSTALLDIR = BINDIR OBJ_FILES= \ tools/ldbrename.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE MANPAGE = man/ldbrename.1 # End BINARY ldbrename @@ -256,7 +256,7 @@ MANPAGE = man/ldbrename.1 [BINARY::ldbtest] OBJ_FILES= \ tools/ldbtest.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE # End BINARY ldbtest ################################################ @@ -268,7 +268,7 @@ INSTALLDIR = BINDIR MANPAGE = man/oLschema2ldif.1 OBJ_FILES= \ tools/oLschema2ldif.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBLDB_CMDLINE # End BINARY oLschema2ldif ################################################ @@ -276,7 +276,7 @@ REQUIRED_SUBSYSTEMS = \ ####################### # Start LIBRARY swig_ldb [LIBRARY::swig_ldb] -REQUIRED_SUBSYSTEMS = ldb DYNCONFIG +PUBLIC_DEPENDENCIES = ldb DYNCONFIG LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT) OBJ_FILES = swig/ldb_wrap.o # End LIBRARY swig_ldb diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk index 62a120907f..2e56cda1e6 100644 --- a/source4/lib/messaging/config.mk +++ b/source4/lib/messaging/config.mk @@ -4,7 +4,7 @@ [SUBSYSTEM::MESSAGING] OBJ_FILES = \ messaging.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ NDR_IRPC \ UNIX_PRIVS # End SUBSYSTEM MESSAGING diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 2693f7dde3..6cf2f50268 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -7,12 +7,12 @@ INIT_FUNCTION = registry_nt4_init SUBSYSTEM = registry OBJ_FILES = \ reg_backend_nt4.o -REQUIRED_SUBSYSTEMS = TDR_REGF +PUBLIC_DEPENDENCIES = TDR_REGF # End MODULE registry_nt4 ################################################ [SUBSYSTEM::TDR_REGF] -REQUIRED_SUBSYSTEMS = TDR +PUBLIC_DEPENDENCIES = TDR OBJ_FILES = tdr_regf.o # Special support for external builddirs @@ -44,7 +44,7 @@ INIT_FUNCTION = registry_dir_init SUBSYSTEM = registry OBJ_FILES = \ reg_backend_dir.o -REQUIRED_SUBSYSTEMS = LIBTALLOC +PUBLIC_DEPENDENCIES = LIBTALLOC # End MODULE registry_dir ################################################ @@ -57,7 +57,7 @@ OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = registry OBJ_FILES = \ reg_backend_rpc.o -REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG +PUBLIC_DEPENDENCIES = RPC_NDR_WINREG # End MODULE registry_rpc ################################################ @@ -70,7 +70,7 @@ INIT_FUNCTION = registry_gconf_init SUBSYSTEM = registry OBJ_FILES = \ reg_backend_gconf.o -REQUIRED_SUBSYSTEMS = EXT_LIB_gconf +PUBLIC_DEPENDENCIES = EXT_LIB_gconf # End MODULE registry_gconf ################################################ @@ -81,7 +81,7 @@ INIT_FUNCTION = registry_ldb_init SUBSYSTEM = registry OBJ_FILES = \ reg_backend_ldb.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ ldb # End MODULE registry_ldb ################################################ @@ -97,7 +97,7 @@ OBJ_FILES = \ common/reg_util.o \ reg_samba.o \ patchfile.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBSAMBA-UTIL PRIVATE_PROTO_HEADER = registry_proto.h PUBLIC_HEADERS = registry.h @@ -108,9 +108,8 @@ PUBLIC_HEADERS = registry.h # Start BINARY regdiff [BINARY::regdiff] INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/regdiff.o -REQUIRED_SUBSYSTEMS = \ +OBJ_FILES = tools/regdiff.o +PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regdiff.1 # End BINARY regdiff @@ -120,9 +119,8 @@ MANPAGE = man/regdiff.1 # Start BINARY regpatch [BINARY::regpatch] INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/regpatch.o -REQUIRED_SUBSYSTEMS = \ +OBJ_FILES = tools/regpatch.o +PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regpatch.1 # End BINARY regpatch @@ -132,9 +130,8 @@ MANPAGE = man/regpatch.1 # Start BINARY regshell [BINARY::regshell] INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/regshell.o -REQUIRED_SUBSYSTEMS = \ +OBJ_FILES = tools/regshell.o +PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS LIBREADLINE MANPAGE = man/regshell.1 # End BINARY regshell @@ -144,9 +141,8 @@ MANPAGE = man/regshell.1 # Start BINARY regtree [BINARY::regtree] INSTALLDIR = BINDIR -OBJ_FILES= \ - tools/regtree.o -REQUIRED_SUBSYSTEMS = \ +OBJ_FILES = tools/regtree.o +PRIVATE_DEPENDENCIES = \ LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS MANPAGE = man/regtree.1 # End BINARY regtree diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk index 002fd3b1c4..bc1301984a 100644 --- a/source4/lib/replace/config.mk +++ b/source4/lib/replace/config.mk @@ -13,7 +13,7 @@ OBJ_FILES = replace.o \ snprintf.o \ dlfcn.o \ getpass.o -REQUIRED_SUBSYSTEMS = REPLACE_READDIR +PUBLIC_DEPENDENCIES = REPLACE_READDIR # End SUBSYSTEM LIBREPLACE ############################## diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index d5ae81d837..db60a8bf9f 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -6,7 +6,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv4.o -REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET # End MODULE socket_ipv4 ################################################ @@ -17,7 +17,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_ipv6.o -REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET # End MODULE socket_ipv6 ################################################ @@ -28,7 +28,7 @@ SUBSYSTEM = SOCKET OUTPUT_TYPE = MERGEDOBJ OBJ_FILES = \ socket_unix.o -REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET +PUBLIC_DEPENDENCIES = EXT_LIB_SOCKET # End MODULE socket_unix ################################################ @@ -40,6 +40,6 @@ OBJ_FILES = \ access.o \ connect_multi.o \ connect.o -REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC +PUBLIC_DEPENDENCIES = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC # End SUBSYSTEM SOCKET ################################################ diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 95d3ac359d..8c704520f5 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -4,7 +4,7 @@ VERSION = 0.0.1 SO_VERSION = 0 OBJ_FILES = talloc.o -REQUIRED_SUBSYSTEMS = LIBREPLACE +PUBLIC_DEPENDENCIES = LIBREPLACE MANPAGE = talloc.3 PUBLIC_HEADERS = talloc.h DESCRIPTION = A hierarchical pool based memory system with destructors diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 3cb9b793ad..b1e6e82d74 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -8,7 +8,7 @@ OBJ_FILES = \ common/tdb.o common/dump.o common/io.o common/lock.o \ common/open.o common/traverse.o common/freelist.o \ common/error.o common/transaction.o common/tdbutil.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBREPLACE PUBLIC_HEADERS = include/tdb.h # @@ -22,7 +22,7 @@ INSTALLDIR = BINDIR ENABLE = NO OBJ_FILES= \ tools/tdbtool.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBTDB # End BINARY tdbtool ################################################ @@ -33,7 +33,7 @@ REQUIRED_SUBSYSTEMS = \ INSTALLDIR = BINDIR OBJ_FILES= \ tools/tdbtorture.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBTDB # End BINARY tdbtorture ################################################ @@ -44,7 +44,7 @@ REQUIRED_SUBSYSTEMS = \ INSTALLDIR = BINDIR OBJ_FILES= \ tools/tdbdump.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBTDB # End BINARY tdbdump ################################################ @@ -56,7 +56,7 @@ INSTALLDIR = BINDIR ENABLE = NO OBJ_FILES= \ tools/tdbbackup.o -REQUIRED_SUBSYSTEMS = \ +PRIVATE_DEPENDENCIES = \ LIBTDB # End BINARY tdbbackup ################################################ @@ -66,6 +66,6 @@ REQUIRED_SUBSYSTEMS = \ [LIBRARY::swig_tdb] LIBRARY_REALNAME = swig/_tdb.$(SHLIBEXT) OBJ_FILES = swig/tdb_wrap.o -REQUIRED_SUBSYSTEMS = LIBTDB DYNCONFIG +PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG # End LIBRARY swig_tdb ####################### diff --git a/source4/lib/tdr/config.mk b/source4/lib/tdr/config.mk index 115f8f8726..d4ad50ed1b 100644 --- a/source4/lib/tdr/config.mk +++ b/source4/lib/tdr/config.mk @@ -4,5 +4,5 @@ VERSION = 0.0.1 SO_VERSION = 0 DESCRIPTION = Simple marshall/unmarshall library PUBLIC_PROTO_HEADER = tdr_proto.h -REQUIRED_SUBSYSTEMS = LIBTALLOC LIBSAMBA-UTIL +PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL OBJ_FILES = tdr.o diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 810dc17d2d..e68636e700 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -4,7 +4,7 @@ OBJ_FILES = \ tls.o \ tlscert.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ LIBTALLOC EXT_LIB_GNUTLS LIBSAMBA-CONFIG # # End SUBSYSTEM LIBTLS diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk index c598d703c5..89e2a4c048 100644 --- a/source4/lib/util/config.mk +++ b/source4/lib/util/config.mk @@ -31,7 +31,7 @@ OBJ_FILES = xfile.o \ mutex.o \ idtree.o \ module.o -REQUIRED_SUBSYSTEMS = \ +PUBLIC_DEPENDENCIES = \ CHARSET LIBREPLACE LIBCRYPTO EXT_LIB_DL LIBTALLOC \ SOCKET_WRAPPER \ # for the base64 functions |