From 4c5a4a7e0288e9ac0b2f795befd5684059e4c429 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 21 Oct 2005 16:29:54 +0000 Subject: r11244: Relative path names in .mk files (This used to be commit 24e10300906c380919d2d631bfb3b8fd6b3f54ba) --- source4/lib/appweb/config.mk | 16 +++---- source4/lib/basic.mk | 88 +++++++++++++++++++++--------------- source4/lib/charset/config.mk | 4 +- source4/lib/cmdline/config.mk | 4 +- source4/lib/com/config.mk | 12 ++--- source4/lib/events/config.mk | 4 +- source4/lib/ldb/config.mk | 80 ++++++++++++++++---------------- source4/lib/messaging/config.mk | 4 +- source4/lib/popt/config.mk | 10 ++-- source4/lib/registry/config.mk | 38 ++++++++-------- source4/lib/replace/config.mk | 8 ++-- source4/lib/samba3/config.mk | 20 ++++---- source4/lib/socket/config.mk | 12 ++--- source4/lib/socket_wrapper/config.mk | 2 +- source4/lib/talloc/config.mk | 4 +- source4/lib/tdb/config.mk | 16 +++---- source4/lib/tls/config.mk | 4 +- 17 files changed, 171 insertions(+), 155 deletions(-) (limited to 'source4/lib') diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk index 1a73d6834a..593404c87b 100644 --- a/source4/lib/appweb/config.mk +++ b/source4/lib/appweb/config.mk @@ -2,8 +2,8 @@ # Start SUBSYSTEM MPR [SUBSYSTEM::MPR] ADD_OBJ_FILES = \ - lib/appweb/mpr/miniMpr.o \ - lib/appweb/mpr/var.o + mpr/miniMpr.o \ + mpr/var.o NOPROTO=YES # End SUBSYSTEM MPR ####################### @@ -13,10 +13,10 @@ NOPROTO=YES # Start SUBSYSTEM EJS [SUBSYSTEM::EJS] ADD_OBJ_FILES = \ - lib/appweb/ejs/ejsLib.o \ - lib/appweb/ejs/ejsLex.o \ - lib/appweb/ejs/ejsParser.o \ - lib/appweb/ejs/ejsProcs.o + ejs/ejsLib.o \ + ejs/ejsLex.o \ + ejs/ejsParser.o \ + ejs/ejsProcs.o REQUIRED_SUBSYSTEMS = MPR NOPROTO=YES # End SUBSYSTEM EJS @@ -26,8 +26,8 @@ NOPROTO=YES # Start SUBSYSTEM ESP [SUBSYSTEM::ESP] ADD_OBJ_FILES = \ - lib/appweb/esp/esp.o \ - lib/appweb/esp/espProcs.o + esp/esp.o \ + esp/espProcs.o REQUIRED_SUBSYSTEMS = EJS NOPROTO=YES # End SUBSYSTEM ESP diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk index 18f6f3aeb9..3ed5381908 100644 --- a/source4/lib/basic.mk +++ b/source4/lib/basic.mk @@ -1,29 +1,45 @@ # LIB BASIC subsystem +include com/config.mk +include samba3/config.mk +include socket/config.mk +include charset/config.mk +include ldb/config.mk +include talloc/config.mk +include tdb/config.mk +include tls/config.mk +include registry/config.mk +include messaging/config.mk +include events/config.mk +include popt/config.mk +include cmdline/config.mk +include socket_wrapper/config.mk +include appweb/config.mk +include replace/config.mk ############################## # Start SUBSYSTEM LIBNETIF [SUBSYSTEM::LIBNETIF] INIT_OBJ_FILES = \ - lib/netif/interface.o + netif/interface.o ADD_OBJ_FILES = \ - lib/netif/netif.o + netif/netif.o # End SUBSYSTEM LIBNETIF ############################## [SUBSYSTEM::TDR] -INIT_OBJ_FILES = lib/tdr/tdr.o +INIT_OBJ_FILES = tdr/tdr.o ############################## # Start SUBSYSTEM LIBCRYPTO [SUBSYSTEM::LIBCRYPTO] NOPROTO = YES INIT_OBJ_FILES = \ - lib/crypto/crc32.o + crypto/crc32.o ADD_OBJ_FILES = \ - lib/crypto/md5.o \ - lib/crypto/hmacmd5.o \ - lib/crypto/md4.o \ - lib/crypto/arcfour.o + crypto/md5.o \ + crypto/hmacmd5.o \ + crypto/md4.o \ + crypto/arcfour.o # End SUBSYSTEM LIBCRYPTO ############################## @@ -31,42 +47,42 @@ ADD_OBJ_FILES = \ # Start SUBSYSTEM LIBCOMPRESSION [SUBSYSTEM::LIBCOMPRESSION] INIT_OBJ_FILES = \ - lib/compression/mszip.o + compression/mszip.o # End SUBSYSTEM LIBCOMPRESION ################################################ [SUBSYSTEM::GENCACHE] OBJ_FILES = \ - lib/gencache.o \ + gencache.o \ ############################## # Start SUBSYSTEM LIBBASIC [SUBSYSTEM::LIBBASIC] -INIT_OBJ_FILES = lib/version.o +INIT_OBJ_FILES = version.o ADD_OBJ_FILES = \ - lib/xfile.o \ - lib/debug.o \ - lib/fault.o \ - lib/signal.o \ - lib/system.o \ - lib/time.o \ - lib/genrand.o \ - lib/dprintf.o \ - lib/util_str.o \ - lib/util_strlist.o \ - lib/util_unistr.o \ - lib/util_file.o \ - lib/data_blob.o \ - lib/util.o \ - lib/util_sock.o \ - lib/substitute.o \ - lib/fsusage.o \ - lib/ms_fnmatch.o \ - lib/select.o \ - lib/mutex.o \ - lib/idtree.o \ - lib/db_wrap.o \ - lib/gendb.o + xfile.o \ + debug.o \ + fault.o \ + signal.o \ + system.o \ + time.o \ + genrand.o \ + dprintf.o \ + util_str.o \ + util_strlist.o \ + util_unistr.o \ + util_file.o \ + data_blob.o \ + util.o \ + util_sock.o \ + substitute.o \ + fsusage.o \ + ms_fnmatch.o \ + select.o \ + mutex.o \ + idtree.o \ + db_wrap.o \ + gendb.o REQUIRED_SUBSYSTEMS = \ LIBLDB CHARSET LIBREPLACE LIBNETIF LIBCRYPTO EXT_LIB_DL LIBTALLOC \ SOCKET_WRAPPER CONFIG @@ -74,7 +90,7 @@ REQUIRED_SUBSYSTEMS = \ ############################## [SUBSYSTEM::PIDFILE] -OBJ_FILES = lib/pidfile.o +OBJ_FILES = pidfile.o [SUBSYSTEM::UNIX_PRIVS] -OBJ_FILES = lib/unix_privs.o +OBJ_FILES = unix_privs.o diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk index 6b0fe02b72..b61f9e7ea2 100644 --- a/source4/lib/charset/config.mk +++ b/source4/lib/charset/config.mk @@ -2,9 +2,9 @@ # Start SUBSYSTEM CHARSET [SUBSYSTEM::CHARSET] INIT_OBJ_FILES = \ - lib/charset/iconv.o + iconv.o ADD_OBJ_FILES = \ - lib/charset/charcnv.o + charcnv.o REQUIRED_SUBSYSTEMS = EXT_LIB_ICONV # End SUBSYSTEM CHARSET ################################################ diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk index 643fa9f1af..badb2f6dcf 100644 --- a/source4/lib/cmdline/config.mk +++ b/source4/lib/cmdline/config.mk @@ -1,8 +1,8 @@ ############################## # Start SUBSYSTEM LIBCMDLINE_CREDENTIALS [SUBSYSTEM::LIBCMDLINE_CREDENTIALS] -ADD_OBJ_FILES = lib/cmdline/getsmbpass.o \ - lib/cmdline/credentials.o +ADD_OBJ_FILES = getsmbpass.o \ + credentials.o REQUIRED_SUBSYSTEMS = CREDENTIALS # End SUBSYSTEM LIBCMDLINE_CREDENTIALS ############################## diff --git a/source4/lib/com/config.mk b/source4/lib/com/config.mk index 4c0377795c..dc4fe644c6 100644 --- a/source4/lib/com/config.mk +++ b/source4/lib/com/config.mk @@ -1,17 +1,17 @@ [SUBSYSTEM::COM] INIT_OBJ_FILES = \ - lib/com/tables.o \ - lib/com/rot.o \ - lib/com/main.o + tables.o \ + rot.o \ + main.o [SUBSYSTEM::DCOM] INIT_OBJ_FILES = \ - lib/com/dcom/main.o \ - lib/com/dcom/tables.o + dcom/main.o \ + dcom/tables.o REQUIRED_SUBSYSTEMS = COM DCOM_PROXY_DCOM RPC_NDR_REMACT \ RPC_NDR_OXIDRESOLVER [MODULE::com_simple] SUBSYSTEM = COM -INIT_OBJ_FILES = lib/com/classes/simple.o +INIT_OBJ_FILES = classes/simple.o INIT_FUNCTION = com_simple_init diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk index 4fe0856f88..60d01b5568 100644 --- a/source4/lib/events/config.mk +++ b/source4/lib/events/config.mk @@ -2,8 +2,8 @@ # Start SUBSYSTEM LIBEVENTS [SUBSYSTEM::LIBEVENTS] NOPROTO = YES -INIT_OBJ_FILES = lib/events/events.o -ADD_OBJ_FILES = lib/events/events_standard.o +INIT_OBJ_FILES = events.o +ADD_OBJ_FILES = events_standard.o REQUIRED_SUBSYSTEMS = LIBTALLOC # End SUBSYSTEM LIBEVENTS ############################## diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 205ddc972c..b30ffc36c8 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -3,7 +3,7 @@ [MODULE::libldb_operational] SUBSYSTEM = LIBLDB INIT_OBJ_FILES = \ - lib/ldb/modules/operational.o + modules/operational.o # End MODULE libldb_operational ################################################ @@ -12,7 +12,7 @@ INIT_OBJ_FILES = \ [MODULE::libldb_rdn_name] SUBSYSTEM = LIBLDB INIT_OBJ_FILES = \ - lib/ldb/modules/rdn_name.o + modules/rdn_name.o # End MODULE libldb_rdn_name ################################################ @@ -21,7 +21,7 @@ INIT_OBJ_FILES = \ [MODULE::libldb_schema] SUBSYSTEM = LIBLDB INIT_OBJ_FILES = \ - lib/ldb/modules/schema.o + modules/schema.o # End MODULE libldb_schema ################################################ @@ -30,7 +30,7 @@ INIT_OBJ_FILES = \ [MODULE::libldb_ildap] SUBSYSTEM = LIBLDB INIT_OBJ_FILES = \ - lib/ldb/ldb_ildap/ldb_ildap.o + ldb_ildap/ldb_ildap.o REQUIRED_SUBSYSTEMS = \ LIBCLI_LDAP NOPROTO = YES @@ -41,7 +41,7 @@ NOPROTO = YES # Start MODULE libldb_map [MODULE::libldb_map] SUBSYSTEM = LIBLDB -INIT_OBJ_FILES = lib/ldb/modules/ldb_map.o +INIT_OBJ_FILES = modules/ldb_map.o # End MODULE libldb_map ################################################ @@ -50,7 +50,7 @@ INIT_OBJ_FILES = lib/ldb/modules/ldb_map.o [MODULE::libldb_sqlite3] SUBSYSTEM = LIBLDB INIT_OBJ_FILES = \ - lib/ldb/ldb_sqlite3/ldb_sqlite3.o + ldb_sqlite3/ldb_sqlite3.o REQUIRED_SUBSYSTEMS = \ EXT_LIB_SQLITE3 NOPROTO = YES @@ -62,13 +62,13 @@ NOPROTO = YES [MODULE::libldb_tdb] SUBSYSTEM = LIBLDB INIT_OBJ_FILES = \ - lib/ldb/ldb_tdb/ldb_tdb.o + ldb_tdb/ldb_tdb.o ADD_OBJ_FILES = \ - lib/ldb/ldb_tdb/ldb_search.o \ - lib/ldb/ldb_tdb/ldb_pack.o \ - lib/ldb/ldb_tdb/ldb_index.o \ - lib/ldb/ldb_tdb/ldb_cache.o \ - lib/ldb/ldb_tdb/ldb_tdb_wrap.o + ldb_tdb/ldb_search.o \ + ldb_tdb/ldb_pack.o \ + ldb_tdb/ldb_index.o \ + ldb_tdb/ldb_cache.o \ + ldb_tdb/ldb_tdb_wrap.o REQUIRED_SUBSYSTEMS = \ LIBTDB NOPROTO = YES @@ -79,22 +79,22 @@ NOPROTO = YES # Start SUBSYSTEM LIBLDB [SUBSYSTEM::LIBLDB] INIT_OBJ_FILES = \ - lib/ldb/common/ldb.o + common/ldb.o ADD_OBJ_FILES = \ - lib/ldb/common/ldb_ldif.o \ - lib/ldb/common/ldb_parse.o \ - lib/ldb/common/ldb_msg.o \ - lib/ldb/common/ldb_utf8.o \ - lib/ldb/common/ldb_debug.o \ - lib/ldb/common/ldb_modules.o \ - lib/ldb/common/ldb_match.o \ - lib/ldb/common/ldb_attributes.o \ - lib/ldb/common/attrib_handlers.o \ - lib/ldb/common/ldb_dn.o + common/ldb_ldif.o \ + common/ldb_parse.o \ + common/ldb_msg.o \ + common/ldb_utf8.o \ + common/ldb_debug.o \ + common/ldb_modules.o \ + common/ldb_match.o \ + common/ldb_attributes.o \ + common/attrib_handlers.o \ + common/ldb_dn.o REQUIRED_SUBSYSTEMS = \ LIBREPLACE LIBTALLOC LDBSAMBA NOPROTO = YES -MANPAGE = lib/ldb/man/ldb.3 +MANPAGE = man/ldb.3 # # End SUBSYSTEM LIBLDB ################################################ @@ -115,7 +115,7 @@ REQUIRED_SUBSYSTEMS = \ # Start SUBSYSTEM LDBSAMBA [SUBSYSTEM::LDBSAMBA] OBJ_FILES = \ - lib/ldb/samba/ldif_handlers.o + samba/ldif_handlers.o # End SUBSYSTEM LDBSAMBA ################################################ @@ -123,7 +123,7 @@ OBJ_FILES = \ # Start SUBSYSTEM LIBLDB_CMDLINE [SUBSYSTEM::LIBLDB_CMDLINE] OBJ_FILES= \ - lib/ldb/tools/cmdline.o + tools/cmdline.o REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC # End SUBSYSTEM LIBLDB_CMDLINE ################################################ @@ -133,10 +133,10 @@ REQUIRED_SUBSYSTEMS = LIBLDB LIBCMDLINE LIBBASIC [BINARY::ldbadd] INSTALLDIR = BINDIR OBJ_FILES = \ - lib/ldb/tools/ldbadd.o + tools/ldbadd.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/ldbadd.1 +MANPAGE = man/ldbadd.1 # End BINARY ldbadd ################################################ @@ -145,10 +145,10 @@ MANPAGE = lib/ldb/man/ldbadd.1 [BINARY::ldbdel] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/ldbdel.o + tools/ldbdel.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/ldbdel.1 +MANPAGE = man/ldbdel.1 # End BINARY ldbdel ################################################ @@ -157,10 +157,10 @@ MANPAGE = lib/ldb/man/ldbdel.1 [BINARY::ldbmodify] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/ldbmodify.o + tools/ldbmodify.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/ldbmodify.1 +MANPAGE = man/ldbmodify.1 # End BINARY ldbmodify ################################################ @@ -169,10 +169,10 @@ MANPAGE = lib/ldb/man/ldbmodify.1 [BINARY::ldbsearch] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/ldbsearch.o + tools/ldbsearch.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/ldbsearch.1 +MANPAGE = man/ldbsearch.1 # End BINARY ldbsearch ################################################ @@ -181,10 +181,10 @@ MANPAGE = lib/ldb/man/ldbsearch.1 [BINARY::ldbedit] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/ldbedit.o + tools/ldbedit.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/ldbedit.1 +MANPAGE = man/ldbedit.1 # End BINARY ldbedit ################################################ @@ -193,10 +193,10 @@ MANPAGE = lib/ldb/man/ldbedit.1 [BINARY::ldbrename] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/ldbrename.o + tools/ldbrename.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE -MANPAGE = lib/ldb/man/ldbrename.1 +MANPAGE = man/ldbrename.1 # End BINARY ldbrename ################################################ @@ -205,7 +205,7 @@ MANPAGE = lib/ldb/man/ldbrename.1 [BINARY::ldbtest] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/ldbtest.o + tools/ldbtest.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE # End BINARY ldbtest @@ -216,7 +216,7 @@ REQUIRED_SUBSYSTEMS = \ [BINARY::oLschema2ldif] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/ldb/tools/oLschema2ldif.o + tools/oLschema2ldif.o REQUIRED_SUBSYSTEMS = \ LIBLDB_CMDLINE # End BINARY oLschema2ldif diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk index 2cba66f0a3..7643ec09ed 100644 --- a/source4/lib/messaging/config.mk +++ b/source4/lib/messaging/config.mk @@ -3,9 +3,9 @@ # Start SUBSYSTEM MESSAGING [SUBSYSTEM::MESSAGING] INIT_OBJ_FILES = \ - lib/messaging/messaging.o + messaging.o # \ -# lib/messaging/msgutil.o +# msgutil.o NOPROTO = YES REQUIRED_SUBSYSTEMS = \ NDR_IRPC \ diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk index fee3ab1e4b..9140716b47 100644 --- a/source4/lib/popt/config.mk +++ b/source4/lib/popt/config.mk @@ -1,11 +1,11 @@ ############################## # Start SUBSYSTEM INT_LIB_POPT [SUBSYSTEM::INT_LIB_POPT] -ADD_OBJ_FILES = lib/popt/findme.o \ - lib/popt/popt.o \ - lib/popt/poptconfig.o \ - lib/popt/popthelp.o \ - lib/popt/poptparse.o +ADD_OBJ_FILES = findme.o \ + popt.o \ + poptconfig.o \ + popthelp.o \ + poptparse.o NOPROTO = YES # End SUBSYSTEM INT_LIB_POPT ############################## diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index 8a579d4564..9461bb2a95 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -6,7 +6,7 @@ INIT_FUNCTION = registry_nt4_init SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ - lib/registry/reg_backend_nt4.o + reg_backend_nt4.o REQUIRED_SUBSYSTEMS = TDR_REGF # End MODULE registry_nt4 ################################################ @@ -14,7 +14,7 @@ REQUIRED_SUBSYSTEMS = TDR_REGF [SUBSYSTEM::TDR_REGF] REQUIRED_SUBSYSTEMS = TDR NOPROTO = YES -INIT_OBJ_FILES = lib/registry/tdr_regf.o +INIT_OBJ_FILES = tdr_regf.o lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c lib/registry/tdr_regf.c: lib/registry/regf.idl @@ -26,7 +26,7 @@ lib/registry/tdr_regf.c: lib/registry/regf.idl INIT_FUNCTION = registry_w95_init SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ - lib/registry/reg_backend_w95.o + reg_backend_w95.o # End MODULE registry_w95 ################################################ @@ -36,7 +36,7 @@ INIT_OBJ_FILES = \ INIT_FUNCTION = registry_dir_init SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ - lib/registry/reg_backend_dir.o + reg_backend_dir.o # End MODULE registry_dir ################################################ @@ -46,7 +46,7 @@ INIT_OBJ_FILES = \ INIT_FUNCTION = registry_rpc_init SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ - lib/registry/reg_backend_rpc.o + reg_backend_rpc.o REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG # End MODULE registry_rpc ################################################ @@ -59,7 +59,7 @@ REQUIRED_SUBSYSTEMS = RPC_NDR_WINREG INIT_FUNCTION = registry_gconf_init SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ - lib/registry/reg_backend_gconf.o + reg_backend_gconf.o REQUIRED_SUBSYSTEMS = EXT_LIB_gconf # End MODULE registry_gconf ################################################ @@ -70,7 +70,7 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_gconf INIT_FUNCTION = registry_ldb_init SUBSYSTEM = REGISTRY INIT_OBJ_FILES = \ - lib/registry/reg_backend_ldb.o + reg_backend_ldb.o REQUIRED_SUBSYSTEMS = \ LIBLDB # End MODULE registry_ldb @@ -80,11 +80,11 @@ REQUIRED_SUBSYSTEMS = \ # Start SUBSYSTEM REGISTRY [SUBSYSTEM::REGISTRY] INIT_OBJ_FILES = \ - lib/registry/common/reg_interface.o + common/reg_interface.o ADD_OBJ_FILES = \ - lib/registry/common/reg_util.o \ - lib/registry/reg_samba.o \ - lib/registry/patchfile.o + common/reg_util.o \ + reg_samba.o \ + patchfile.o REQUIRED_SUBSYSTEMS = \ LIBBASIC # End MODULE registry_ldb @@ -107,10 +107,10 @@ REQUIRED_SUBSYSTEMS = \ [BINARY::regdiff] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/registry/tools/regdiff.o + tools/regdiff.o REQUIRED_SUBSYSTEMS = \ CONFIG LIBCMDLINE REGISTRY -MANPAGE = lib/registry/man/regdiff.1 +MANPAGE = man/regdiff.1 # End BINARY regdiff ################################################ @@ -119,10 +119,10 @@ MANPAGE = lib/registry/man/regdiff.1 [BINARY::regpatch] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/registry/tools/regpatch.o + tools/regpatch.o REQUIRED_SUBSYSTEMS = \ CONFIG LIBCMDLINE REGISTRY -MANPAGE = lib/registry/man/regpatch.1 +MANPAGE = man/regpatch.1 # End BINARY regpatch ################################################ @@ -131,10 +131,10 @@ MANPAGE = lib/registry/man/regpatch.1 [BINARY::regshell] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/registry/tools/regshell.o + tools/regshell.o REQUIRED_SUBSYSTEMS = \ CONFIG LIBCMDLINE REGISTRY -MANPAGE = lib/registry/man/regshell.1 +MANPAGE = man/regshell.1 # End BINARY regshell ################################################ @@ -143,9 +143,9 @@ MANPAGE = lib/registry/man/regshell.1 [BINARY::regtree] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/registry/tools/regtree.o + tools/regtree.o REQUIRED_SUBSYSTEMS = \ CONFIG LIBCMDLINE REGISTRY -MANPAGE = lib/registry/man/regtree.1 +MANPAGE = man/regtree.1 # End BINARY regtree ################################################ diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk index 2658f0e96a..49133651b4 100644 --- a/source4/lib/replace/config.mk +++ b/source4/lib/replace/config.mk @@ -2,7 +2,7 @@ # Start SUBSYSTEM REPLACE_READDIR [SUBSYSTEM::REPLACE_READDIR] ADD_OBJ_FILES = \ - lib/replace/repdir/repdir.o + repdir/repdir.o NOPROTO = YES # End SUBSYSTEM REPLACE_READDIR ############################## @@ -11,10 +11,10 @@ NOPROTO = YES ############################## # Start SUBSYSTEM LIBREPLACE [SUBSYSTEM::LIBREPLACE] -INIT_OBJ_FILES = lib/replace/replace.o +INIT_OBJ_FILES = replace.o ADD_OBJ_FILES = \ - lib/replace/snprintf.o \ - lib/replace/dlfcn.o + snprintf.o \ + dlfcn.o NOPROTO = YES REQUIRED_SUBSYSTEMS = REPLACE_READDIR # End SUBSYSTEM LIBREPLACE diff --git a/source4/lib/samba3/config.mk b/source4/lib/samba3/config.mk index db5d04ddaa..bd135ed7ef 100644 --- a/source4/lib/samba3/config.mk +++ b/source4/lib/samba3/config.mk @@ -2,15 +2,15 @@ # Start SUBSYSTEM LIBSAMBA3 [SUBSYSTEM::LIBSAMBA3] ADD_OBJ_FILES = \ - lib/samba3/smbpasswd.o \ - lib/samba3/tdbsam.o \ - lib/samba3/policy.o \ - lib/samba3/idmap.o \ - lib/samba3/winsdb.o \ - lib/samba3/samba3.o \ - lib/samba3/group.o \ - lib/samba3/registry.o \ - lib/samba3/secrets.o \ - lib/samba3/share_info.o + smbpasswd.o \ + tdbsam.o \ + policy.o \ + idmap.o \ + winsdb.o \ + samba3.o \ + group.o \ + registry.o \ + secrets.o \ + share_info.o # End SUBSYSTEM LIBSAMBA3 ################################################ diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk index 13fe584373..aa40975e4e 100644 --- a/source4/lib/socket/config.mk +++ b/source4/lib/socket/config.mk @@ -4,7 +4,7 @@ [MODULE::socket_ipv4] SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ - lib/socket/socket_ipv4.o + socket_ipv4.o NOPROTO=YES # End MODULE socket_ipv4 ################################################ @@ -14,7 +14,7 @@ NOPROTO=YES [MODULE::socket_ipv6] SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ - lib/socket/socket_ipv6.o + socket_ipv6.o NOPROTO=YES # End MODULE socket_ipv6 ################################################ @@ -24,7 +24,7 @@ NOPROTO=YES [MODULE::socket_unix] SUBSYSTEM = SOCKET INIT_OBJ_FILES = \ - lib/socket/socket_unix.o + socket_unix.o NOPROTO=YES # End MODULE socket_unix ################################################ @@ -33,10 +33,10 @@ NOPROTO=YES # Start SUBSYSTEM SOCKET [SUBSYSTEM::SOCKET] INIT_OBJ_FILES = \ - lib/socket/socket.o + socket.o ADD_OBJ_FILES = \ - lib/socket/access.o \ - lib/socket/connect.o + access.o \ + connect.o NOPROTO=YES # End SUBSYSTEM SOCKET ################################################ diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk index bc9a0951dc..ed9cf3eb1b 100644 --- a/source4/lib/socket_wrapper/config.mk +++ b/source4/lib/socket_wrapper/config.mk @@ -2,6 +2,6 @@ # Start SUBSYSTEM SOCKET_WRAPPER [SUBSYSTEM::SOCKET_WRAPPER] NOPROTO = YES -INIT_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o +INIT_OBJ_FILES = socket_wrapper.o # End SUBSYSTEM SOCKET_WRAPPER ############################## diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 7b47eacaf6..1d5d957e91 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,10 +1,10 @@ ################################################ # Start SUBSYSTEM LIBTALLOC [SUBSYSTEM::LIBTALLOC] -INIT_OBJ_FILES = lib/talloc/talloc.o +INIT_OBJ_FILES = talloc.o REQUIRED_SUBSYSTEMS = LIBREPLACE NOPROTO = YES -MANPAGE = lib/talloc/talloc.3 +MANPAGE = talloc.3 # End SUBSYSTEM LIBTALLOC ################################################ diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index bfc1900299..6c97c01b24 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -2,10 +2,10 @@ # Start SUBSYSTEM LIBTDB [SUBSYSTEM::LIBTDB] INIT_OBJ_FILES = \ - lib/tdb/common/tdb.o -ADD_OBJ_FILES = lib/tdb/common/dump.o lib/tdb/common/io.o lib/tdb/common/lock.o \ - lib/tdb/common/open.o lib/tdb/common/traverse.o lib/tdb/common/freelist.o \ - lib/tdb/common/error.o lib/tdb/common/transaction.o lib/tdb/common/tdbutil.o + common/tdb.o +ADD_OBJ_FILES = 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 NOPROTO=YES REQUIRED_SUBSYSTEMS = \ LIBREPLACE @@ -31,7 +31,7 @@ REQUIRED_SUBSYSTEMS = \ INSTALLDIR = BINDIR ENABLE = NO OBJ_FILES= \ - lib/tdb/tools/tdbtool.o + tools/tdbtool.o REQUIRED_SUBSYSTEMS = \ LIBTDB # End BINARY tdbtool @@ -42,7 +42,7 @@ REQUIRED_SUBSYSTEMS = \ [BINARY::tdbtorture] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/tdb/tools/tdbtorture.o + tools/tdbtorture.o REQUIRED_SUBSYSTEMS = \ LIBTDB # End BINARY tdbtorture @@ -53,7 +53,7 @@ REQUIRED_SUBSYSTEMS = \ [BINARY::tdbdump] INSTALLDIR = BINDIR OBJ_FILES= \ - lib/tdb/tools/tdbdump.o + tools/tdbdump.o REQUIRED_SUBSYSTEMS = \ LIBTDB # End BINARY tdbdump @@ -65,7 +65,7 @@ REQUIRED_SUBSYSTEMS = \ INSTALLDIR = BINDIR ENABLE = NO OBJ_FILES= \ - lib/tdb/tools/tdbbackup.o + tools/tdbbackup.o REQUIRED_SUBSYSTEMS = \ LIBTDB # End BINARY tdbbackup diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk index 0800a69829..29d458acac 100644 --- a/source4/lib/tls/config.mk +++ b/source4/lib/tls/config.mk @@ -2,8 +2,8 @@ # Start SUBSYSTEM LIBTLS [SUBSYSTEM::LIBTLS] ADD_OBJ_FILES = \ - lib/tls/tls.o \ - lib/tls/tlscert.o + tls.o \ + tlscert.o REQUIRED_SUBSYSTEMS = \ LIBTALLOC EXT_LIB_GNUTLS NOPROTO = YES -- cgit