Move object files lists to makefile rather than smb_build.

(This used to be commit 5628d58990144463fd87f8c847c9384ac2193681)
author: Jelmer Vernooij <jelmer@samba.org> 2008-04-14 16:53:00 +0200
committer: Jelmer Vernooij <jelmer@samba.org> 2008-04-14 16:53:00 +0200
commit: ffc5cbfe803326a1c3bf55684717af910d091c5a (patch)
tree: 46e3b9f4a60971176b43f0a4c5cfc4ccc001dd14 /source4
parent: f800cf250f079ab1e1bc1051c34d1d1061187447 (diff)
download: samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.tar.gz
samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.tar.bz2
samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.zip
35 files changed, 692 insertions, 676 deletions
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 63aec09847..de8926d2af 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -5,27 +5,31 @@ mkinclude ntlmssp/config.mk
 mkinclude credentials/config.mk
 
 [SUBSYSTEM::auth_session]
-OBJ_FILES = session.o
 PRIVATE_PROTO_HEADER = session_proto.h
 PUBLIC_DEPENDENCIES = CREDENTIALS
 
 # PUBLIC_HEADERS += auth/session.h
 
+auth_session_OBJ_FILES = $(addprefix auth/, session.o)
+
 [SUBSYSTEM::auth_system_session]
-OBJ_FILES = system_session.o
 PRIVATE_PROTO_HEADER = system_session_proto.h
 PUBLIC_DEPENDENCIES = CREDENTIALS
 PRIVATE_DEPENDENCIES = auth_session LIBSAMBA-UTIL LIBSECURITY 
 
+auth_system_session_OBJ_FILES = $(addprefix auth/, system_session.o)
+
 [SUBSYSTEM::auth_sam]
 PRIVATE_PROTO_HEADER = auth_sam.h
-OBJ_FILES = sam.o ntlm_check.o 
 PUBLIC_DEPENDENCIES = SAMDB UTIL_LDB LIBSECURITY
 PRIVATE_DEPENDENCIES = LDAP_ENCODE
 
+auth_sam_OBJ_FILES = $(addprefix auth/, sam.o ntlm_check.o)
+
 [SUBSYSTEM::auth_sam_reply]
 PRIVATE_PROTO_HEADER = auth_sam_reply.h
-OBJ_FILES = auth_sam_reply.o
+
+auth_sam_reply_OBJ_FILES = $(addprefix auth/, auth_sam_reply.o)
 
 #######################
 # Start MODULE auth_sam
@@ -33,64 +37,65 @@ OBJ_FILES = auth_sam_reply.o
 # gensec_krb5 and gensec_gssapi depend on it
 INIT_FUNCTION = auth_sam_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_sam.o
 PRIVATE_DEPENDENCIES = \
 		SAMDB auth_sam
 # End MODULE auth_sam
 #######################
 
+auth_sam_module_OBJ_FILES = $(addprefix auth/, auth_sam.o)
+
 #######################
 # Start MODULE auth_anonymous
 [MODULE::auth_anonymous]
 INIT_FUNCTION = auth_anonymous_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_anonymous.o
 # End MODULE auth_anonymous
 #######################
 
+auth_anonymous_OBJ_FILES = $(addprefix auth/, auth_anonymous.o)
+
 #######################
 # Start MODULE auth_winbind
 [MODULE::auth_winbind]
 INIT_FUNCTION = auth_winbind_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_winbind.o
 PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT
 # End MODULE auth_winbind
 #######################
 
+auth_winbind_OBJ_FILES = $(addprefix auth/, auth_winbind.o)
+
 #######################
 # Start MODULE auth_developer
 [MODULE::auth_developer]
 INIT_FUNCTION = auth_developer_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_developer.o
 # End MODULE auth_developer
 #######################
 
+auth_developer_OBJ_FILES = $(addprefix auth/, auth_developer.o)
+
 [MODULE::auth_unix]
 INIT_FUNCTION = auth_unix_init
 SUBSYSTEM = auth
-OBJ_FILES = auth_unix.o
 PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
 
+auth_unix_OBJ_FILES = $(addprefix auth/, auth_unix.o)
+
 [SUBSYSTEM::PAM_ERRORS]
 PRIVATE_PROTO_HEADER = pam_errors.h
-OBJ_FILES = pam_errors.o
 
-#######################
-# Start SUBSYSTEM auth
-[SUBSYSTEM::auth]
 #VERSION = 0.0.1
 #SO_VERSION = 0
+PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
+
+[MODULE::service_auth]
+INIT_FUNCTION = server_service_auth_init
+SUBSYSTEM = smbd
 PRIVATE_PROTO_HEADER = auth_proto.h
-OBJ_FILES = \
-		auth.o \
-		auth_util.o \
-		auth_simple.o
-PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-# End SUBSYSTEM auth
-#######################
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
+
+service_auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
 
 # PUBLIC_HEADERS += auth/auth.h
 
@@ -98,3 +103,5 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
 PUBLIC_DEPENDENCIES = auth_system_session
 PRIVATE_DEPENDENCIES = SAMDB 
 SWIG_FILE = auth.i
+
+swig_auth_OBJ_FILES = auth/auth_wrap.o
diff --git a/source4/auth/credentials/config.mk b/source4/auth/credentials/config.mk
index 83f2f0db93..6f3ec3997c 100644
--- a/source4/auth/credentials/config.mk
+++ b/source4/auth/credentials/config.mk
@@ -2,18 +2,17 @@
 # Start SUBSYSTEM CREDENTIALS
 [SUBSYSTEM::CREDENTIALS]
 PRIVATE_PROTO_HEADER = credentials_proto.h
-OBJ_FILES = credentials.o \
-		credentials_files.o \
-		credentials_ntlm.o \
-		credentials_krb5.o \
-		../kerberos/kerberos_util.o
 PUBLIC_DEPENDENCIES = \
 		LIBCLI_AUTH SECRETS LIBCRYPTO KERBEROS UTIL_LDB HEIMDAL_GSSAPI 
 PRIVATE_DEPENDENCIES = \
 		SECRETS
 
+CREDENTIALS_OBJ_FILES = $(addprefix auth/credentials/, credentials.o credentials_files.o credentials_ntlm.o credentials_krb5.o ../kerberos/kerberos_util.o)
+
 PUBLIC_HEADERS += auth/credentials/credentials.h
 
 [PYTHON::swig_credentials]
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS
 SWIG_FILE = credentials.i
+
+swig_credentials_OBJ_FILES = auth/credentials/credentials_wrap.o
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 14864f7e4c..e5fb2ef201 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -5,12 +5,13 @@ PC_FILE = gensec.pc
 VERSION = 0.0.1
 SO_VERSION = 0
 PRIVATE_PROTO_HEADER = gensec_proto.h
-OBJ_FILES = gensec.o socket.o
 PUBLIC_DEPENDENCIES = \
 		CREDENTIALS LIBSAMBA-UTIL LIBCRYPTO ASN1_UTIL samba-socket LIBPACKET
 # End SUBSYSTEM gensec
 #################################
 
+gnesec_OBJ_FILES = $(addprefix auth/gensec/, gensec.o socket.o)
+
 PUBLIC_HEADERS += auth/gensec/gensec.h
 
 ################################################
@@ -18,31 +19,34 @@ PUBLIC_HEADERS += auth/gensec/gensec.h
 [MODULE::gensec_krb5]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_krb5_init
-OBJ_FILES = gensec_krb5.o 
 PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
+gensec_krb5_OBJ_FILES = gensec_krb5.o 
+
 ################################################
 # Start MODULE gensec_gssapi
 [MODULE::gensec_gssapi]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_gssapi_init
-OBJ_FILES = gensec_gssapi.o 
 PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS 
 # End MODULE gensec_gssapi
 ################################################
 
+gensec_gssapi_OBJ_FILES = gensec_gssapi.o 
+
 ################################################
 # Start MODULE cyrus_sasl
 [MODULE::cyrus_sasl]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_sasl_init
-OBJ_FILES = cyrus_sasl.o 
 PRIVATE_DEPENDENCIES = CREDENTIALS SASL 
 # End MODULE cyrus_sasl
 ################################################
 
+cyrus_sasl_OBJ_FILES = auth/gensec/cyrus_sasl.o 
+
 ################################################
 # Start MODULE gensec_spnego
 [MODULE::gensec_spnego]
@@ -50,31 +54,32 @@ SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_spnego_init
 PRIVATE_PROTO_HEADER = spnego_proto.h
 PRIVATE_DEPENDENCIES = ASN1_UTIL CREDENTIALS
-OBJ_FILES = spnego.o spnego_parse.o
 # End MODULE gensec_spnego
 ################################################
 
+gensec_spnego_OBJ_FILES = $(addprefix auth/gensec/, spnego.o spnego_parse.o)
+
 ################################################
 # Start MODULE gensec_schannel
 [MODULE::gensec_schannel]
 SUBSYSTEM = gensec
 PRIVATE_PROTO_HEADER = schannel_proto.h
 INIT_FUNCTION = gensec_schannel_init
-OBJ_FILES = schannel.o \
-			schannel_sign.o
 PRIVATE_DEPENDENCIES = SCHANNELDB NDR_SCHANNEL CREDENTIALS LIBNDR
 OUTPUT_TYPE = MERGED_OBJ
 # End MODULE gensec_schannel
 ################################################
 
+gensec_schannel_OBJ_FILES = $(addprefix auth/gensec/, schannel.o schannel_sign.o)
+
 ################################################
 # Start SUBSYSTEM SCHANNELDB
 [SUBSYSTEM::SCHANNELDB]
 PRIVATE_PROTO_HEADER = schannel_state.h
-OBJ_FILES = \
-		schannel_state.o
 PRIVATE_DEPENDENCIES = LDB_WRAP SAMDB
 #
 # End SUBSYSTEM SCHANNELDB
 ################################################
 
+SCHANNELDB_OBJ_FILES = auth/gensec/schannel_state.o
+
diff --git a/source4/auth/kerberos/config.mk b/source4/auth/kerberos/config.mk
index 7493a6d06d..762d6f8c49 100644
--- a/source4/auth/kerberos/config.mk
+++ b/source4/auth/kerberos/config.mk
@@ -2,13 +2,16 @@
 # Start SUBSYSTEM KERBEROS
 [SUBSYSTEM::KERBEROS]
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = kerberos.o \
-			clikrb5.o \
-			kerberos_heimdal.o \
-			kerberos_pac.o \
-			gssapi_parse.o \
-			krb5_init_context.o
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5 NDR_KRB5PAC samba-socket LIBCLI_RESOLVE
 PRIVATE_DEPENDENCIES = ASN1_UTIL auth_sam_reply LIBPACKET LIBNDR
 # End SUBSYSTEM KERBEROS
 #################################
+
+KERBEROS_OBJ_FILES = $(addprefix auth/kerberos/, \
+	kerberos.o \
+	clikrb5.o \
+	kerberos_heimdal.o \
+	kerberos_pac.o \
+	gssapi_parse.o \
+	krb5_init_context.o)
+
diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 9033384b1f..f8e711feda 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -1,6 +1,7 @@
 [SUBSYSTEM::MSRPC_PARSE]
 PRIVATE_PROTO_HEADER = msrpc_parse.h
-OBJ_FILES = ntlmssp_parse.o
+
+MSRPC_PARSE_OBJ_FILES = $(addprefix auth/ntlmssp/, ntlmssp_parse.o)
 
 ################################################
 # Start MODULE gensec_ntlmssp
@@ -8,11 +9,9 @@ OBJ_FILES = ntlmssp_parse.o
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_ntlmssp_init
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = ntlmssp.o \
-		ntlmssp_sign.o \
-		ntlmssp_client.o \
-		ntlmssp_server.o
 PRIVATE_DEPENDENCIES = MSRPC_PARSE CREDENTIALS
 OUTPUT_TYPE = MERGED_OBJ
 # End MODULE gensec_ntlmssp
 ################################################
+
+gensec_ntlmssp_OBJ_FILES = $(addprefix auth/ntlmssp/, ntlmssp.o ntlmssp_sign.o ntlmssp_client.o ntlmssp_server.o) 
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index eb673446c7..76a11f0a38 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -4,7 +4,7 @@ dnl Copyright (C) 2004 Stefan Metzmacher
 dnl Copyright (C) 2004-2005 Jelmer Vernooij
 dnl Published under the GPL
 dnl
-dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
+dnl SMB_SUBSYSTEM(name,required_subsystems)
 dnl
 dnl SMB_EXT_LIB_FROM_PKGCONFIG(name,pkg-config name,[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
 dnl
@@ -18,11 +18,10 @@ dnl #######################################################
 dnl ### And now the implementation			###
 dnl #######################################################
 
-dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags)
+dnl SMB_SUBSYSTEM(name,required_subsystems,cflags)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
 MAKE_SETTINGS="$MAKE_SETTINGS
-$1_OBJ_FILES = $2
 $1_CFLAGS = $4
 $1_ENABLE = YES
 "
@@ -31,7 +30,6 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 ###################################
 # Start Subsystem $1
 @<:@SUBSYSTEM::$1@:>@
-OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
 CFLAGS = \$($1_CFLAGS)
 ENABLE = YES
@@ -40,11 +38,10 @@ ENABLE = YES
 "
 ])
 
-dnl SMB_LIBRARY(name,obj_files,required_subsystems,version,so_version,cflags,ldflags)
+dnl SMB_LIBRARY(name,required_subsystems,version,so_version,cflags,ldflags)
 AC_DEFUN([SMB_LIBRARY],
 [
 MAKE_SETTINGS="$MAKE_SETTINGS
-$1_OBJ_FILES = $2
 $1_CFLAGS = $6
 $1_LDFLAGS = $7
 $1_ENABLE = YES
@@ -54,7 +51,6 @@ SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
 ###################################
 # Start Library $1
 @<:@LIBRARY::$1@:>@
-OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
 VERSION = $4
 SO_VERSION = $5 
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index d8ec646910..de786ddbe5 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -23,14 +23,11 @@ my $section_types = {
 		SWIG_FILE => "string",
 		"PRIVATE_DEPENDENCIES"	=> "list",
 		"PUBLIC_DEPENDENCIES"	=> "list",
-		"OBJ_FILES" => "list",
 		"ENABLE"		=> "bool",
 		"LDFLAGS"		=> "list",
 		"CFLAGS"		=> "list",
 	},
 	"SUBSYSTEM" => {
-		"OBJ_FILES"		=> "list",
-
 		"PRIVATE_DEPENDENCIES"	=> "list",
 		"PUBLIC_DEPENDENCIES"	=> "list",
 
@@ -47,7 +44,6 @@ my $section_types = {
 		"SUBSYSTEM"		=> "string",
 
 		"INIT_FUNCTION"		=> "string",
-		"OBJ_FILES"		=> "list",
 
 		"PRIVATE_DEPENDENCIES"	=> "list",
 
@@ -62,7 +58,6 @@ my $section_types = {
 		"CFLAGS"		=> "list"
 		},
 	"BINARY" => {
-		"OBJ_FILES"		=> "list",
 
 		"PRIVATE_DEPENDENCIES"	=> "list",
 
@@ -88,8 +83,6 @@ my $section_types = {
 		"INIT_FUNCTION_SENTINEL" => "string",
 		"OUTPUT_TYPE"		=> "list",
 
-		"OBJ_FILES"		=> "list",
-
 		"PRIVATE_DEPENDENCIES"	=> "list",
 		"PUBLIC_DEPENDENCIES"	=> "list",
 
@@ -223,6 +216,9 @@ sub run_config_mk($$$$)
 		{
 			$section = $1;
 			$infragment = 0;
+
+			$result->{$section}{EXISTS}{KEY} = "EXISTS";
+			$result->{$section}{EXISTS}{VAL} = 1;
 			next;
 		}
 
@@ -233,6 +229,7 @@ sub run_config_mk($$$$)
 			$subdir =~ s/^\.$//g;
 			$subdir =~ s/^\.\///g;
 			$subdir .= "/" if ($subdir ne "");
+			$makefile .= "basedir := $subdir\n";
 			$makefile .= run_config_mk($input, $srcdir, $builddir, $subdir.$subfile);
 			next;
 		}
@@ -280,6 +277,7 @@ sub run_config_mk($$$$)
 		$input->{$name}{BASEDIR} = $basedir;
 
 		foreach my $key (values %{$result->{$section}}) {
+			next if ($key->{KEY} eq "EXISTS");
 			$key->{VAL} = smb_build::input::strtrim($key->{VAL});
 			my $vartype = $sectype->{$key->{KEY}};
 			if (not defined($vartype)) {
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 948f2657b4..9949836675 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -91,6 +91,9 @@ sub check_module($$$)
 	}
 
 	if (not defined($mod->{OUTPUT_TYPE})) {
+		if (not defined($INPUT->{$mod->{SUBSYSTEM}}->{TYPE})) {
+			die("Invalid type for subsystem $mod->{SUBSYSTEM}");
+		}
 		if ($INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "EXT_LIB") {
 			$mod->{OUTPUT_TYPE} = undef;
 		} else {
@@ -107,7 +110,7 @@ sub check_module($$$)
 	} 
 	if (grep(/MERGED_OBJ/, @{$mod->{OUTPUT_TYPE}})) {
 		push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
-		unshift (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
+		push (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
 	}
 }
 
@@ -151,7 +154,6 @@ sub check_python($$$)
 		$dirname .= "/" unless $dirname =~ /\/$/;
 		$dirname = "" if $dirname eq "./";
 
-		$python->{OBJ_FILES} = ["$dirname$basename\_wrap.o"];
 		$python->{LIBRARY_REALNAME} = "_$basename.\$(SHLIBEXT)";
 		$python->{PYTHON_FILES} = ["$dirname$basename.py"];
 		push (@{$python->{CFLAGS}}, "\$(CFLAG_NO_UNUSED_MACROS)");
@@ -189,7 +191,6 @@ sub add_implicit($$)
 	$INPUT->{$n} = {
 		TYPE => "MAKE_RULE",
 		NAME => $n,
-		TARGET => "",
 		OUTPUT_TYPE => undef,
 		LIBS => ["\$(".uc($n)."_LIBS)"],
 		LDFLAGS => ["\$(".uc($n)."_LDFLAGS)"],
@@ -249,7 +250,7 @@ sub check($$$$$)
 
 	foreach my $part (values %$INPUT) {
 		$part->{LINK_FLAGS} = [];
-		$part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_LIST)"];
+		$part->{FULL_OBJ_LIST} = ["\$($part->{NAME}_OBJ_FILES)"];
 
 		if ($part->{TYPE} eq "SUBSYSTEM") { 
 			check_subsystem($INPUT, $part, $subsys_ot);
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
index 9dd3758e7a..c10cf57b5b 100644
--- a/source4/cldap_server/config.mk
+++ b/source4/cldap_server/config.mk
@@ -6,11 +6,13 @@
 INIT_FUNCTION = server_service_cldapd_init
 SUBSYSTEM = service
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = \
-		cldap_server.o \
-		netlogon.o \
-		rootdse.o
 PRIVATE_DEPENDENCIES = \
 		LIBCLI_CLDAP LIBNETIF process_model
 # End SUBSYSTEM CLDAPD
 #######################
+
+CLDAPD_OBJ_FILES = $(addprefix cldap_server/, \
+		cldap_server.o \
+		netlogon.o \
+		rootdse.o)
+
diff --git a/source4/client/config.mk b/source4/client/config.mk
index 2085faf61e..5cfa542fba 100644
--- a/source4/client/config.mk
+++ b/source4/client/config.mk
@@ -4,8 +4,6 @@
 # Start BINARY smbclient
 [BINARY::smbclient]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-		client.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-HOSTCONFIG \
 		SMBREADLINE \
@@ -20,13 +18,12 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY smbclient
 #################################
 
+smbclient_OBJ_FILES = client/client.o
+
 #################################
 # Start BINARY cifsdd
 [BINARY::cifsdd]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-		cifsdd.o \
-		cifsddio.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-HOSTCONFIG \
 		LIBCLI_SMB \
@@ -36,3 +33,4 @@ PRIVATE_DEPENDENCIES = \
 # End BINARY sdd
 #################################
 
+cifsdd_OBJ_FILES = client/cifsdd.o client/cifsddio.o
diff --git a/source4/cluster/config.mk b/source4/cluster/config.mk
index 8b225202fb..00ac597f94 100644
--- a/source4/cluster/config.mk
+++ b/source4/cluster/config.mk
@@ -1,7 +1,6 @@
 mkinclude ctdb/config.mk
 
-####################
 [SUBSYSTEM::CLUSTER]
-OBJ_FILES = cluster.o \
-		local.o
 PRIVATE_DEPENDENCIES = ctdb
+
+CLUSTER_OBJ_FILES = cluster/cluster.o cluster/local.o
diff --git a/source4/cluster/ctdb/config.mk b/source4/cluster/ctdb/config.mk
index b8199cafe4..01c639d142 100644
--- a/source4/cluster/ctdb/config.mk
+++ b/source4/cluster/ctdb/config.mk
@@ -1,20 +1,24 @@
 ##################
 [SUBSYSTEM::brlock_ctdb]
-OBJ_FILES = brlock_ctdb.o
 PUBLIC_DEPENDENCIES = ctdb
 
+brlock_ctdb_OBJ_FILES = cluster/ctdb/brlock_ctdb.o
+
 ##################
 [SUBSYSTEM::opendb_ctdb]
-OBJ_FILES = opendb_ctdb.o
 PUBLIC_DEPENDENCIES = ctdb
 
+opendb_ctdb_OBJ_FILES = cluster/ctdb/opendb_ctdb.o
+
 ##################
 [SUBSYSTEM::ctdb]
-OBJ_FILES = \
+PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC
+
+ctdb_OBJ_FILES = $(addprefix cluster/ctdb/, \
 		ctdb_cluster.o \
 		client/ctdb_client.o \
 		common/ctdb_io.o \
 		common/ctdb_ltdb.o \
 		common/ctdb_message.o \
-		common/ctdb_util.o
-PUBLIC_DEPENDENCIES = TDB_WRAP LIBTALLOC
+		common/ctdb_util.o)
+
diff --git a/source4/dsdb/config.mk b/source4/dsdb/config.mk
index 1a20add91c..e334e4c6e3 100644
--- a/source4/dsdb/config.mk
+++ b/source4/dsdb/config.mk
@@ -10,31 +10,33 @@ PUBLIC_DEPENDENCIES = HEIMDAL_KRB5
 PRIVATE_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI NDR_DRSBLOBS NSS_WRAPPER \
 					   auth_system_session LDAP_ENCODE LIBCLI_AUTH LIBNDR \
 					   SAMDB_SCHEMA LDB_WRAP SAMDB_COMMON
-OBJ_FILES = \
+
+
+SAMDB_OBJ_FILES = $(addprefix dsdb/, \
 		samdb/samdb.o \
 		samdb/samdb_privilege.o \
 		samdb/cracknames.o \
-		repl/replicated_objects.o
-
+		repl/replicated_objects.o)
 
 # PUBLIC_HEADERS += dsdb/samdb/samdb.h
 
 [SUBSYSTEM::SAMDB_COMMON]
 PRIVATE_PROTO_HEADER = common/proto.h
 PRIVATE_DEPENDENCIES = LIBLDB
-OBJ_FILES = \
-		common/sidmap.o \
-		common/flag_mapping.o \
-		common/util.o
+
+SAMDB_COMMON_OBJ_FILES = $(addprefix dsdb/common/, \
+		sidmap.o \
+		flag_mapping.o \
+		util.o)
 
 [SUBSYSTEM::SAMDB_SCHEMA]
 PRIVATE_PROTO_HEADER = schema/proto.h
 PRIVATE_DEPENDENCIES = SAMDB_COMMON NDR_DRSUAPI NDR_DRSBLOBS
-OBJ_FILES = \
-		schema/schema_init.o \
-		schema/schema_syntax.o \
-		schema/schema_constructed.o \
 
+SAMDB_SCHEMA_OBJ_FILES = $(addprefix dsdb/schema/, \
+		schema_init.o \
+		schema_syntax.o \
+		schema_constructed.o)
 
 # PUBLIC_HEADERS += dsdb/schema/schema.h
 
@@ -43,15 +45,17 @@ OBJ_FILES = \
 [MODULE::DREPL_SRV]
 INIT_FUNCTION = server_service_drepl_init
 SUBSYSTEM = service
-OBJ_FILES = \
-		repl/drepl_service.o \
-		repl/drepl_periodic.o \
-		repl/drepl_partitions.o \
-		repl/drepl_out_pull.o \
-		repl/drepl_out_helpers.o
 PRIVATE_PROTO_HEADER = repl/drepl_service_proto.h
 PRIVATE_DEPENDENCIES = \
 		SAMDB \
 		process_model 
 # End SUBSYSTEM DREPL_SRV
 #######################
+
+DREPL_SRV_OBJ_FILES = $(addprefix dsdb/repl/, \
+		drepl_service.o \
+		drepl_periodic.o \
+		drepl_partitions.o \
+		drepl_out_pull.o \
+		drepl_out_helpers.o)
+
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index de93b5638d..dd1c8b10db 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -5,11 +5,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC
 INIT_FUNCTION = objectguid_module_module_ops
-OBJ_FILES = \
-		objectguid.o
 # End MODULE ldb_objectguid
 ################################################
 
+ldb_objectguid_OBJ_FILES = dsdb/samdb/ldb_modules/objectguid.o
+
 ################################################
 # Start MODULE ldb_repl_meta_data
 [MODULE::ldb_repl_meta_data]
@@ -18,11 +18,12 @@ OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC LIBNDR NDR_MISC NDR_DRSUAPI \
 					   NDR_DRSBLOBS LIBNDR
 INIT_FUNCTION = repl_meta_data_module_module_ops
-OBJ_FILES = \
-		repl_meta_data.o
 # End MODULE ldb_repl_meta_data
 ################################################
 
+ldb_repl_meta_data_OBJ_FILES = \
+		repl_meta_data.o
+
 ################################################
 # Start MODULE ldb_dsdb_cache
 [MODULE::ldb_dsdb_cache]
@@ -30,11 +31,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = dsdb_cache_module_module_ops
-OBJ_FILES = \
-		dsdb_cache.o
 # End MODULE ldb_dsdb_cache
 ################################################
 
+ldb_dsdb_cache_OBJ_FILES = \
+		dsdb_cache.o
+
 ################################################
 # Start MODULE ldb_schema_fsmo
 [MODULE::ldb_schema_fsmo]
@@ -42,11 +44,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = schema_fsmo_module_module_ops
-OBJ_FILES = \
-		schema_fsmo.o
 # End MODULE ldb_schema_fsmo
 ################################################
 
+ldb_schema_fsmo_OBJ_FILES = \
+		schema_fsmo.o
+
 ################################################
 # Start MODULE ldb_naming_fsmo
 [MODULE::ldb_naming_fsmo]
@@ -54,11 +57,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = naming_fsmo_module_module_ops
-OBJ_FILES = \
-		naming_fsmo.o
 # End MODULE ldb_naming_fsmo
 ################################################
 
+ldb_naming_fsmo_OBJ_FILES = \
+		naming_fsmo.o
+
 ################################################
 # Start MODULE ldb_pdc_fsmo
 [MODULE::ldb_pdc_fsmo]
@@ -66,11 +70,12 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = SAMDB LIBTALLOC
 INIT_FUNCTION = pdc_fsmo_module_module_ops
-OBJ_FILES = \
-		pdc_fsmo.o
 # End MODULE ldb_pdc_fsmo
 ################################################
 
+ldb_pdc_fsmo_OBJ_FILES = \
+		pdc_fsmo.o
+
 ################################################
 # Start MODULE ldb_samldb
 [MODULE::ldb_samldb]
@@ -78,12 +83,13 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LDAP_ENCODE NDR_MISC SAMDB
 INIT_FUNCTION = samldb_module_module_ops
-OBJ_FILES = \
-		samldb.o
 #
 # End MODULE ldb_samldb
 ################################################
 
+ldb_samldb_OBJ_FILES = \
+		samldb.o
+
 ################################################
 # Start MODULE ldb_samba3sam
 [MODULE::ldb_samba3sam]
@@ -92,12 +98,13 @@ OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = &ldb_samba3sam_module_module_ops
 PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER LIBSECURITY \
 					   NDR_SECURITY
-OBJ_FILES = \
-		samba3sam.o
 #
 # End MODULE ldb_samldb
 ################################################
 
+ldb_samba3sam_OBJ_FILES = \
+		samba3sam.o
+
 ################################################
 # Start MODULE ldb_simple_ldap_map
 [MODULE::ldb_simple_ldap_map]
@@ -107,12 +114,13 @@ INIT_FUNCTION = &ldb_simple_ldap_map_module_module_ops
 PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map LIBNDR NDR_MISC
 ENABLE = YES
 ALIASES = entryuuid nsuniqueid
-OBJ_FILES = \
-		simple_ldap_map.o
 #
 # End MODULE ldb_entryuuid
 ################################################
 
+ldb_simple_ldap_map_OBJ_FILES = \
+		simple_ldap_map.o
+
 # ################################################
 # # Start MODULE ldb_proxy
 # [MODULE::ldb_proxy]
@@ -132,25 +140,24 @@ SUBSYSTEM = LIBLDB
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = rootdse_module_module_ops
-OBJ_FILES = \
-		rootdse.o
-#
 # End MODULE ldb_rootdse
 ################################################
 
+ldb_rootdse_OBJ_FILES = dsdb/samdb/ldb_modules/rootdse.o
+
 ################################################
 # Start MODULE ldb_password_hash
 [MODULE::ldb_password_hash]
 SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 INIT_FUNCTION = password_hash_module_module_ops
-OBJ_FILES = password_hash.o
 PRIVATE_DEPENDENCIES = HEIMDAL_HDB_KEYS LIBTALLOC HEIMDAL_KRB5 LDAP_ENCODE \
 					   LIBCLI_AUTH NDR_DRSBLOBS KERBEROS SAMDB
-#
 # End MODULE ldb_password_hash
 ################################################
 
+ldb_password_hash_OBJ_FILES = dsdb/samdb/ldb_modules/password_hash.o
+
 ################################################
 # Start MODULE ldb_local_password
 [MODULE::ldb_local_password]
@@ -158,11 +165,11 @@ PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR SAMDB
 OUTPUT_TYPE = SHARED_LIBRARY
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = local_password_module_module_ops
-OBJ_FILES = local_password.o
-#
 # End MODULE ldb_local_password
 ################################################
 
+ldb_local_password_OBJ_FILES = dsdb/samdb/ldb_modules/local_password.o
+
 ################################################
 # Start MODULE ldb_kludge_acl
 [MODULE::ldb_kludge_acl]
@@ -170,12 +177,12 @@ PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY SAMDB
 OUTPUT_TYPE = SHARED_LIBRARY
 SUBSYSTEM = LIBLDB
 INIT_FUNCTION = &ldb_kludge_acl_module_ops
-OBJ_FILES = \
-		kludge_acl.o
-#
+
 # End MODULE ldb_kludge_acl
 ################################################
 
+ldb_kludge_acl_OBJ_FILES = dsdb/samdb/ldb_modules/kludge_acl.o
+
 ################################################
 # Start MODULE ldb_extended_dn
 [MODULE::ldb_extended_dn]
@@ -183,12 +190,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR LIBSECURITY SAMDB
 INIT_FUNCTION = &ldb_extended_dn_module_ops
-OBJ_FILES = \
-		extended_dn.o
-#
 # End MODULE ldb_extended_dn
 ################################################
 
+ldb_extended_dn_OBJ_FILES = dsdb/samdb/ldb_modules/extended_dn.o
+
 ################################################
 # Start MODULE ldb_show_deleted
 [MODULE::ldb_show_deleted]
@@ -196,12 +202,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC
 INIT_FUNCTION = &ldb_show_deleted_module_ops
-OBJ_FILES = \
-		show_deleted.o
-#
 # End MODULE ldb_show_deleted
 ################################################
 
+ldb_show_deleted_OBJ_FILES = dsdb/samdb/ldb_modules/show_deleted.o
+
 ################################################
 # Start MODULE ldb_partition
 [MODULE::ldb_partition]
@@ -209,12 +214,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 INIT_FUNCTION = &ldb_partition_module_ops
-OBJ_FILES = \
-		partition.o
-#
 # End MODULE ldb_partition
 ################################################
 
+ldb_partition_OBJ_FILES = dsdb/samdb/ldb_modules/partition.o
+
 ################################################
 # Start MODULE ldb_schema
 [MODULE::ldb_schema]
@@ -222,12 +226,11 @@ SUBSYSTEM = LIBLDB
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBLDB
 INIT_FUNCTION = &ldb_schema_module_ops
-OBJ_FILES = \
-		schema.o schema_syntax.o
-#
 # End MODULE ldb_schema
 ################################################
 
+ldb_schema_OBJ_FILES = $(addprefix dsdb/samdb/ldb_modules/, schema.o schema_syntax.o)
+
 ################################################
 # Start MODULE ldb_update_kt
 [MODULE::ldb_update_keytab]
@@ -236,12 +239,11 @@ OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC CREDENTIALS
 #Also depends on credentials, but that would loop
 INIT_FUNCTION = &ldb_update_kt_module_ops
-OBJ_FILES = \
-		update_keytab.o 
-#
 # End MODULE ldb_update_kt
 ################################################
 
+ldb_update_keytab_OBJ_FILES = dsdb/samdb/ldb_modules/update_keytab.o 
+
 ################################################
 # Start MODULE ldb_objectclass
 [MODULE::ldb_objectclass]
@@ -250,11 +252,11 @@ OUTPUT_TYPE = SHARED_LIBRARY
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSECURITY NDR_SECURITY SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		objectclass.o
 # End MODULE ldb_objectclass
 ################################################
 
+ldb_objectclass_OBJ_FILES = dsdb/samdb/ldb_modules/objectclass.o
+
 ################################################
 # Start MODULE ldb_subtree_rename
 [MODULE::ldb_subtree_rename]
@@ -262,11 +264,11 @@ INIT_FUNCTION = &ldb_subtree_rename_module_ops
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		subtree_rename.o
 # End MODULE ldb_subtree_rename
 ################################################
 
+ldb_subtree_rename_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_rename.o
+
 ################################################
 # Start MODULE ldb_subtree_rename
 [MODULE::ldb_subtree_delete]
@@ -274,11 +276,11 @@ INIT_FUNCTION = &ldb_subtree_delete_module_ops
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		subtree_delete.o
 # End MODULE ldb_subtree_rename
 ################################################
 
+ldb_subtree_delete_OBJ_FILES = dsdb/samdb/ldb_modules/subtree_delete.o
+
 ################################################
 # Start MODULE ldb_linked_attributes
 [MODULE::ldb_linked_attributes]
@@ -287,11 +289,11 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		linked_attributes.o
 # End MODULE ldb_linked_attributes
 ################################################
 
+ldb_linked_attributes_OBJ_FILES = dsdb/samdb/ldb_modules/linked_attributes.o
+
 ################################################
 # Start MODULE ldb_ranged_results
 [MODULE::ldb_ranged_results]
@@ -299,11 +301,11 @@ INIT_FUNCTION = &ldb_ranged_results_module_ops
 CFLAGS = -Ilib/ldb/include
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		ranged_results.o
 # End MODULE ldb_ranged_results
 ################################################
 
+ldb_ranged_results_OBJ_FILES = dsdb/samdb/ldb_modules/ranged_results.o
+
 ################################################
 # Start MODULE ldb_anr
 [MODULE::ldb_anr]
@@ -312,11 +314,11 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		anr.o
 # End MODULE ldb_anr
 ################################################
 
+ldb_anr_OBJ_FILES = dsdb/samdb/ldb_modules/anr.o
+
 ################################################
 # Start MODULE ldb_normalise
 [MODULE::ldb_normalise]
@@ -325,11 +327,11 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL SAMDB
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		normalise.o
 # End MODULE ldb_normalise
 ################################################
 
+ldb_normalise_OBJ_FILES = dsdb/samdb/ldb_modules/normalise.o
+
 ################################################
 # Start MODULE ldb_instancetype
 [MODULE::ldb_instancetype]
@@ -338,8 +340,8 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC
 SUBSYSTEM = LIBLDB
-OBJ_FILES = \
-		instancetype.o
 # End MODULE ldb_instancetype
 ################################################
 
+ldb_instancetype_OBJ_FILES = dsdb/samdb/ldb_modules/instancetype.o
+
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index ba9c5467ba..487d924036 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -1,5 +1,6 @@
 [SUBSYSTEM::DYNCONFIG]
-OBJ_FILES = dynconfig.o
+
+DYNCONFIG_OBJ_FILES = dynconfig.o
 
 # set these to where to find various files
 # These can be overridden by command line switches (see smbd(8))
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index b80e00d444..a2fbb5e3d0 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -87,11 +87,14 @@ my $depstr = join(' ', @deps);
 
 print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'."\n";
 print "CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n";
-print "OBJ_FILES = ";
+print "PUBLIC_DEPENDENCIES = $depstr\n\n";
+
+print "HEIMDAL_".uc($prefix)."_OBJ_FILES = ";
 foreach $o_file (@o_files) {
     print "\\\n\t$o_file";
 }
-print "\nPUBLIC_DEPENDENCIES = $depstr\n\n";
+
+print "\n\n";
 
 print "clean:: \n";
 print "\t\@echo \"Deleting ASN1 output files generated from $file\"\n";
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 24d50acb05..33d2edb67b 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -2,334 +2,343 @@
 # Start SUBSYSTEM HEIMDAL_KDC
 [SUBSYSTEM::HEIMDAL_KDC]
 CFLAGS = -Iheimdal_build -Iheimdal/kdc
-OBJ_FILES = \
-	../heimdal/kdc/default_config.o \
-	../heimdal/kdc/kerberos5.o \
-	../heimdal/kdc/krb5tgs.o \
-	../heimdal/kdc/pkinit.o \
-	../heimdal/kdc/log.o \
-	../heimdal/kdc/misc.o \
-	../heimdal/kdc/524.o \
-	../heimdal/kdc/kerberos4.o \
-	../heimdal/kdc/kaserver.o \
-	../heimdal/kdc/digest.o \
-	../heimdal/kdc/process.o \
-	../heimdal/kdc/windc.o \
-	../heimdal/kdc/kx509.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1
 PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO
 # End SUBSYSTEM HEIMDAL_KDC
 #######################
 
+HEIMDAL_KDC_OBJ_FILES = \
+	./heimdal/kdc/default_config.o \
+	./heimdal/kdc/kerberos5.o \
+	./heimdal/kdc/krb5tgs.o \
+	./heimdal/kdc/pkinit.o \
+	./heimdal/kdc/log.o \
+	./heimdal/kdc/misc.o \
+	./heimdal/kdc/524.o \
+	./heimdal/kdc/kerberos4.o \
+	./heimdal/kdc/kaserver.o \
+	./heimdal/kdc/digest.o \
+	./heimdal/kdc/process.o \
+	./heimdal/kdc/windc.o \
+	./heimdal/kdc/kx509.o
+
 [SUBSYSTEM::HEIMDAL_NTLM]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/ntlm
-OBJ_FILES = \
-	../heimdal/lib/ntlm/ntlm.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5
 
+HEIMDAL_NTLM_OBJ_FILES = \
+	./heimdal/lib/ntlm/ntlm.o
+
 [SUBSYSTEM::HEIMDAL_HDB_KEYS]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb
-OBJ_FILES = \
-	../heimdal/lib/hdb/keys.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \
 					   HEIMDAL_HDB_ASN1
 
+HEIMDAL_HDB_KEYS_OBJ_FILES = ./heimdal/lib/hdb/keys.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_HDB
 [SUBSYSTEM::HEIMDAL_HDB]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb
-OBJ_FILES = \
-	../heimdal/lib/hdb/db.o \
-	../heimdal/lib/hdb/dbinfo.o \
-	../heimdal/lib/hdb/hdb.o \
-	../heimdal/lib/hdb/ext.o \
-	../heimdal/lib/hdb/keytab.o \
-	../heimdal/lib/hdb/mkey.o \
-	../heimdal/lib/hdb/ndbm.o \
-	../heimdal/lib/hdb/hdb_err.o
 PRIVATE_DEPENDENCIES = HDB_LDB HEIMDAL_KRB5 HEIMDAL_HDB_KEYS HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_COM_ERR HEIMDAL_HDB_ASN1
 # End SUBSYSTEM HEIMDAL_HDB
 #######################
 
+HEIMDAL_HDB_OBJ_FILES = \
+	./heimdal/lib/hdb/db.o \
+	./heimdal/lib/hdb/dbinfo.o \
+	./heimdal/lib/hdb/hdb.o \
+	./heimdal/lib/hdb/ext.o \
+	./heimdal/lib/hdb/keytab.o \
+	./heimdal/lib/hdb/mkey.o \
+	./heimdal/lib/hdb/ndbm.o \
+	./heimdal/lib/hdb/hdb_err.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_GSSAPI
 [SUBSYSTEM::HEIMDAL_GSSAPI]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/gssapi -Iheimdal/lib/gssapi/gssapi -Iheimdal/lib/gssapi/spnego -Iheimdal/lib/gssapi/krb5 -Iheimdal/lib/gssapi/mech
-OBJ_FILES = \
-	../heimdal/lib/gssapi/mech/context.o \
-	../heimdal/lib/gssapi/mech/gss_krb5.o \
-	../heimdal/lib/gssapi/mech/gss_mech_switch.o \
-	../heimdal/lib/gssapi/mech/gss_process_context_token.o \
-	../heimdal/lib/gssapi/mech/gss_buffer_set.o \
-	../heimdal/lib/gssapi/mech/gss_add_cred.o \
-	../heimdal/lib/gssapi/mech/gss_add_oid_set_member.o \
-	../heimdal/lib/gssapi/mech/gss_compare_name.o \
-	../heimdal/lib/gssapi/mech/gss_release_oid_set.o \
-	../heimdal/lib/gssapi/mech/gss_create_empty_oid_set.o \
-	../heimdal/lib/gssapi/mech/gss_decapsulate_token.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_cred_by_oid.o \
-	../heimdal/lib/gssapi/mech/gss_canonicalize_name.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_sec_context_by_oid.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_names_for_mech.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_mechs_for_name.o \
-	../heimdal/lib/gssapi/mech/gss_wrap_size_limit.o \
-	../heimdal/lib/gssapi/mech/gss_names.o \
-	../heimdal/lib/gssapi/mech/gss_verify.o \
-	../heimdal/lib/gssapi/mech/gss_display_name.o \
-	../heimdal/lib/gssapi/mech/gss_duplicate_oid.o \
-	../heimdal/lib/gssapi/mech/gss_display_status.o \
-	../heimdal/lib/gssapi/mech/gss_release_buffer.o \
-	../heimdal/lib/gssapi/mech/gss_release_oid.o \
-	../heimdal/lib/gssapi/mech/gss_test_oid_set_member.o \
-	../heimdal/lib/gssapi/mech/gss_release_cred.o \
-	../heimdal/lib/gssapi/mech/gss_set_sec_context_option.o \
-	../heimdal/lib/gssapi/mech/gss_export_name.o \
-	../heimdal/lib/gssapi/mech/gss_seal.o \
-	../heimdal/lib/gssapi/mech/gss_acquire_cred.o \
-	../heimdal/lib/gssapi/mech/gss_unseal.o \
-	../heimdal/lib/gssapi/mech/gss_verify_mic.o \
-	../heimdal/lib/gssapi/mech/gss_accept_sec_context.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_cred_by_mech.o \
-	../heimdal/lib/gssapi/mech/gss_indicate_mechs.o \
-	../heimdal/lib/gssapi/mech/gss_delete_sec_context.o \
-	../heimdal/lib/gssapi/mech/gss_sign.o \
-	../heimdal/lib/gssapi/mech/gss_utils.o \
-	../heimdal/lib/gssapi/mech/gss_init_sec_context.o \
-	../heimdal/lib/gssapi/mech/gss_oid_equal.o \
-	../heimdal/lib/gssapi/mech/gss_oid_to_str.o \
-	../heimdal/lib/gssapi/mech/gss_context_time.o \
-	../heimdal/lib/gssapi/mech/gss_encapsulate_token.o \
-	../heimdal/lib/gssapi/mech/gss_get_mic.o \
-	../heimdal/lib/gssapi/mech/gss_import_sec_context.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_cred.o \
-	../heimdal/lib/gssapi/mech/gss_wrap.o \
-	../heimdal/lib/gssapi/mech/gss_import_name.o \
-	../heimdal/lib/gssapi/mech/gss_duplicate_name.o \
-	../heimdal/lib/gssapi/mech/gss_unwrap.o \
-	../heimdal/lib/gssapi/mech/gss_export_sec_context.o \
-	../heimdal/lib/gssapi/mech/gss_inquire_context.o \
-	../heimdal/lib/gssapi/mech/gss_release_name.o \
-	../heimdal/lib/gssapi/mech/gss_set_cred_option.o \
-	../heimdal/lib/gssapi/asn1_GSSAPIContextToken.o \
-	../heimdal/lib/gssapi/spnego/init_sec_context.o \
-	../heimdal/lib/gssapi/spnego/external.o \
-	../heimdal/lib/gssapi/spnego/compat.o \
-	../heimdal/lib/gssapi/spnego/context_stubs.o \
-	../heimdal/lib/gssapi/spnego/cred_stubs.o \
-	../heimdal/lib/gssapi/spnego/accept_sec_context.o \
-	../heimdal/lib/gssapi/krb5/copy_ccache.o \
-	../heimdal/lib/gssapi/krb5/delete_sec_context.o \
-	../heimdal/lib/gssapi/krb5/init_sec_context.o \
-	../heimdal/lib/gssapi/krb5/context_time.o \
-	../heimdal/lib/gssapi/krb5/init.o \
-	../heimdal/lib/gssapi/krb5/address_to_krb5addr.o \
-	../heimdal/lib/gssapi/krb5/get_mic.o \
-	../heimdal/lib/gssapi/krb5/inquire_context.o \
-	../heimdal/lib/gssapi/krb5/add_cred.o \
-	../heimdal/lib/gssapi/krb5/inquire_cred.o \
-	../heimdal/lib/gssapi/krb5/inquire_cred_by_oid.o \
-	../heimdal/lib/gssapi/krb5/inquire_cred_by_mech.o \
-	../heimdal/lib/gssapi/krb5/inquire_mechs_for_name.o \
-	../heimdal/lib/gssapi/krb5/inquire_names_for_mech.o \
-	../heimdal/lib/gssapi/krb5/indicate_mechs.o \
-	../heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.o \
-	../heimdal/lib/gssapi/krb5/export_sec_context.o \
-	../heimdal/lib/gssapi/krb5/import_sec_context.o \
-	../heimdal/lib/gssapi/krb5/duplicate_name.o \
-	../heimdal/lib/gssapi/krb5/import_name.o \
-	../heimdal/lib/gssapi/krb5/compare_name.o \
-	../heimdal/lib/gssapi/krb5/export_name.o \
-	../heimdal/lib/gssapi/krb5/canonicalize_name.o \
-	../heimdal/lib/gssapi/krb5/unwrap.o \
-	../heimdal/lib/gssapi/krb5/wrap.o \
-	../heimdal/lib/gssapi/krb5/release_name.o \
-	../heimdal/lib/gssapi/krb5/cfx.o \
-	../heimdal/lib/gssapi/krb5/8003.o \
-	../heimdal/lib/gssapi/krb5/arcfour.o \
-	../heimdal/lib/gssapi/krb5/encapsulate.o \
-	../heimdal/lib/gssapi/krb5/display_name.o \
-	../heimdal/lib/gssapi/krb5/sequence.o \
-	../heimdal/lib/gssapi/krb5/display_status.o \
-	../heimdal/lib/gssapi/krb5/release_buffer.o \
-	../heimdal/lib/gssapi/krb5/external.o \
-	../heimdal/lib/gssapi/krb5/compat.o \
-	../heimdal/lib/gssapi/krb5/acquire_cred.o \
-	../heimdal/lib/gssapi/krb5/release_cred.o \
-	../heimdal/lib/gssapi/krb5/set_cred_option.o \
-	../heimdal/lib/gssapi/krb5/decapsulate.o \
-	../heimdal/lib/gssapi/krb5/verify_mic.o \
-	../heimdal/lib/gssapi/krb5/accept_sec_context.o \
-	../heimdal/lib/gssapi/krb5/set_sec_context_option.o \
-	../heimdal/lib/gssapi/krb5/process_context_token.o \
-	../heimdal/lib/gssapi/krb5/prf.o
 PRIVATE_DEPENDENCIES = HEIMDAL_HCRYPTO HEIMDAL_HEIM_ASN1 HEIMDAL_SPNEGO_ASN1
 PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5
 # End SUBSYSTEM HEIMDAL_GSSAPI
 #######################
 
+HEIMDAL_GSSAPI_OBJ_FILES = \
+	./heimdal/lib/gssapi/mech/context.o \
+	./heimdal/lib/gssapi/mech/gss_krb5.o \
+	./heimdal/lib/gssapi/mech/gss_mech_switch.o \
+	./heimdal/lib/gssapi/mech/gss_process_context_token.o \
+	./heimdal/lib/gssapi/mech/gss_buffer_set.o \
+	./heimdal/lib/gssapi/mech/gss_add_cred.o \
+	./heimdal/lib/gssapi/mech/gss_add_oid_set_member.o \
+	./heimdal/lib/gssapi/mech/gss_compare_name.o \
+	./heimdal/lib/gssapi/mech/gss_release_oid_set.o \
+	./heimdal/lib/gssapi/mech/gss_create_empty_oid_set.o \
+	./heimdal/lib/gssapi/mech/gss_decapsulate_token.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_cred_by_oid.o \
+	./heimdal/lib/gssapi/mech/gss_canonicalize_name.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_sec_context_by_oid.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_names_for_mech.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_mechs_for_name.o \
+	./heimdal/lib/gssapi/mech/gss_wrap_size_limit.o \
+	./heimdal/lib/gssapi/mech/gss_names.o \
+	./heimdal/lib/gssapi/mech/gss_verify.o \
+	./heimdal/lib/gssapi/mech/gss_display_name.o \
+	./heimdal/lib/gssapi/mech/gss_duplicate_oid.o \
+	./heimdal/lib/gssapi/mech/gss_display_status.o \
+	./heimdal/lib/gssapi/mech/gss_release_buffer.o \
+	./heimdal/lib/gssapi/mech/gss_release_oid.o \
+	./heimdal/lib/gssapi/mech/gss_test_oid_set_member.o \
+	./heimdal/lib/gssapi/mech/gss_release_cred.o \
+	./heimdal/lib/gssapi/mech/gss_set_sec_context_option.o \
+	./heimdal/lib/gssapi/mech/gss_export_name.o \
+	./heimdal/lib/gssapi/mech/gss_seal.o \
+	./heimdal/lib/gssapi/mech/gss_acquire_cred.o \
+	./heimdal/lib/gssapi/mech/gss_unseal.o \
+	./heimdal/lib/gssapi/mech/gss_verify_mic.o \
+	./heimdal/lib/gssapi/mech/gss_accept_sec_context.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_cred_by_mech.o \
+	./heimdal/lib/gssapi/mech/gss_indicate_mechs.o \
+	./heimdal/lib/gssapi/mech/gss_delete_sec_context.o \
+	./heimdal/lib/gssapi/mech/gss_sign.o \
+	./heimdal/lib/gssapi/mech/gss_utils.o \
+	./heimdal/lib/gssapi/mech/gss_init_sec_context.o \
+	./heimdal/lib/gssapi/mech/gss_oid_equal.o \
+	./heimdal/lib/gssapi/mech/gss_oid_to_str.o \
+	./heimdal/lib/gssapi/mech/gss_context_time.o \
+	./heimdal/lib/gssapi/mech/gss_encapsulate_token.o \
+	./heimdal/lib/gssapi/mech/gss_get_mic.o \
+	./heimdal/lib/gssapi/mech/gss_import_sec_context.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_cred.o \
+	./heimdal/lib/gssapi/mech/gss_wrap.o \
+	./heimdal/lib/gssapi/mech/gss_import_name.o \
+	./heimdal/lib/gssapi/mech/gss_duplicate_name.o \
+	./heimdal/lib/gssapi/mech/gss_unwrap.o \
+	./heimdal/lib/gssapi/mech/gss_export_sec_context.o \
+	./heimdal/lib/gssapi/mech/gss_inquire_context.o \
+	./heimdal/lib/gssapi/mech/gss_release_name.o \
+	./heimdal/lib/gssapi/mech/gss_set_cred_option.o \
+	./heimdal/lib/gssapi/asn1_GSSAPIContextToken.o \
+	./heimdal/lib/gssapi/spnego/init_sec_context.o \
+	./heimdal/lib/gssapi/spnego/external.o \
+	./heimdal/lib/gssapi/spnego/compat.o \
+	./heimdal/lib/gssapi/spnego/context_stubs.o \
+	./heimdal/lib/gssapi/spnego/cred_stubs.o \
+	./heimdal/lib/gssapi/spnego/accept_sec_context.o \
+	./heimdal/lib/gssapi/krb5/copy_ccache.o \
+	./heimdal/lib/gssapi/krb5/delete_sec_context.o \
+	./heimdal/lib/gssapi/krb5/init_sec_context.o \
+	./heimdal/lib/gssapi/krb5/context_time.o \
+	./heimdal/lib/gssapi/krb5/init.o \
+	./heimdal/lib/gssapi/krb5/address_to_krb5addr.o \
+	./heimdal/lib/gssapi/krb5/get_mic.o \
+	./heimdal/lib/gssapi/krb5/inquire_context.o \
+	./heimdal/lib/gssapi/krb5/add_cred.o \
+	./heimdal/lib/gssapi/krb5/inquire_cred.o \
+	./heimdal/lib/gssapi/krb5/inquire_cred_by_oid.o \
+	./heimdal/lib/gssapi/krb5/inquire_cred_by_mech.o \
+	./heimdal/lib/gssapi/krb5/inquire_mechs_for_name.o \
+	./heimdal/lib/gssapi/krb5/inquire_names_for_mech.o \
+	./heimdal/lib/gssapi/krb5/indicate_mechs.o \
+	./heimdal/lib/gssapi/krb5/inquire_sec_context_by_oid.o \
+	./heimdal/lib/gssapi/krb5/export_sec_context.o \
+	./heimdal/lib/gssapi/krb5/import_sec_context.o \
+	./heimdal/lib/gssapi/krb5/duplicate_name.o \
+	./heimdal/lib/gssapi/krb5/import_name.o \
+	./heimdal/lib/gssapi/krb5/compare_name.o \
+	./heimdal/lib/gssapi/krb5/export_name.o \
+	./heimdal/lib/gssapi/krb5/canonicalize_name.o \
+	./heimdal/lib/gssapi/krb5/unwrap.o \
+	./heimdal/lib/gssapi/krb5/wrap.o \
+	./heimdal/lib/gssapi/krb5/release_name.o \
+	./heimdal/lib/gssapi/krb5/cfx.o \
+	./heimdal/lib/gssapi/krb5/8003.o \
+	./heimdal/lib/gssapi/krb5/arcfour.o \
+	./heimdal/lib/gssapi/krb5/encapsulate.o \
+	./heimdal/lib/gssapi/krb5/display_name.o \
+	./heimdal/lib/gssapi/krb5/sequence.o \
+	./heimdal/lib/gssapi/krb5/display_status.o \
+	./heimdal/lib/gssapi/krb5/release_buffer.o \
+	./heimdal/lib/gssapi/krb5/external.o \
+	./heimdal/lib/gssapi/krb5/compat.o \
+	./heimdal/lib/gssapi/krb5/acquire_cred.o \
+	./heimdal/lib/gssapi/krb5/release_cred.o \
+	./heimdal/lib/gssapi/krb5/set_cred_option.o \
+	./heimdal/lib/gssapi/krb5/decapsulate.o \
+	./heimdal/lib/gssapi/krb5/verify_mic.o \
+	./heimdal/lib/gssapi/krb5/accept_sec_context.o \
+	./heimdal/lib/gssapi/krb5/set_sec_context_option.o \
+	./heimdal/lib/gssapi/krb5/process_context_token.o \
+	./heimdal/lib/gssapi/krb5/prf.o
+
+
 #######################
 # Start SUBSYSTEM HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_KRB5]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND
 PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO
-OBJ_FILES = \
-	../heimdal/lib/krb5/acache.o \
-	../heimdal/lib/krb5/add_et_list.o \
-	../heimdal/lib/krb5/addr_families.o \
-	../heimdal/lib/krb5/appdefault.o \
-	../heimdal/lib/krb5/asn1_glue.o \
-	../heimdal/lib/krb5/auth_context.o \
-	../heimdal/lib/krb5/build_ap_req.o \
-	../heimdal/lib/krb5/build_auth.o \
-	../heimdal/lib/krb5/cache.o \
-	../heimdal/lib/krb5/changepw.o \
-	../heimdal/lib/krb5/codec.o \
-	../heimdal/lib/krb5/config_file.o \
-	../heimdal/lib/krb5/config_file_netinfo.o \
-	../heimdal/lib/krb5/constants.o \
-	../heimdal/lib/krb5/context.o \
-	../heimdal/lib/krb5/convert_creds.o \
-	../heimdal/lib/krb5/copy_host_realm.o \
-	../heimdal/lib/krb5/crc.o \
-	../heimdal/lib/krb5/creds.o \
-	../heimdal/lib/krb5/crypto.o \
-	../heimdal/lib/krb5/data.o \
-	../heimdal/lib/krb5/eai_to_heim_errno.o \
-	../heimdal/lib/krb5/error_string.o \
-	../heimdal/lib/krb5/expand_hostname.o \
-	../heimdal/lib/krb5/fcache.o \
-	../heimdal/lib/krb5/free.o \
-	../heimdal/lib/krb5/free_host_realm.o \
-	../heimdal/lib/krb5/generate_seq_number.o \
-	../heimdal/lib/krb5/generate_subkey.o \
-	../heimdal/lib/krb5/get_cred.o \
-	../heimdal/lib/krb5/get_default_principal.o \
-	../heimdal/lib/krb5/get_default_realm.o \
-	../heimdal/lib/krb5/get_for_creds.o \
-	../heimdal/lib/krb5/get_host_realm.o \
-	../heimdal/lib/krb5/get_in_tkt.o \
-	../heimdal/lib/krb5/get_in_tkt_with_keytab.o \
-	../heimdal/lib/krb5/get_port.o \
-	../heimdal/lib/krb5/init_creds.o \
-	../heimdal/lib/krb5/init_creds_pw.o \
-	../heimdal/lib/krb5/kcm.o \
-	../heimdal/lib/krb5/keyblock.o \
-	../heimdal/lib/krb5/keytab.o \
-	../heimdal/lib/krb5/keytab_any.o \
-	../heimdal/lib/krb5/keytab_file.o \
-	../heimdal/lib/krb5/keytab_memory.o \
-	../heimdal/lib/krb5/keytab_keyfile.o \
-	../heimdal/lib/krb5/keytab_krb4.o \
-	../heimdal/lib/krb5/krbhst.o \
-	../heimdal/lib/krb5/log.o \
-	../heimdal/lib/krb5/mcache.o \
-	../heimdal/lib/krb5/misc.o \
-	../heimdal/lib/krb5/mk_error.o \
-	../heimdal/lib/krb5/mk_priv.o \
-	../heimdal/lib/krb5/mk_rep.o \
-	../heimdal/lib/krb5/mk_req.o \
-	../heimdal/lib/krb5/mk_req_ext.o \
-	../heimdal/lib/krb5/mit_glue.o \
-	../heimdal/lib/krb5/n-fold.o \
-	../heimdal/lib/krb5/padata.o \
-	../heimdal/lib/krb5/pkinit.o \
-	../heimdal/lib/krb5/plugin.o \
-	../heimdal/lib/krb5/principal.o \
-	../heimdal/lib/krb5/pac.o \
-	../heimdal/lib/krb5/prompter_posix.o \
-	../heimdal/lib/krb5/rd_cred.o \
-	../heimdal/lib/krb5/rd_error.o \
-	../heimdal/lib/krb5/rd_priv.o \
-	../heimdal/lib/krb5/rd_rep.o \
-	../heimdal/lib/krb5/rd_req.o \
-	../heimdal/lib/krb5/replay.o \
-	../heimdal/lib/krb5/send_to_kdc.o \
-	../heimdal/lib/krb5/set_default_realm.o \
-	../heimdal/lib/krb5/store.o \
-	../heimdal/lib/krb5/store_emem.o \
-	../heimdal/lib/krb5/store_fd.o \
-	../heimdal/lib/krb5/store_mem.o \
-	../heimdal/lib/krb5/ticket.o \
-	../heimdal/lib/krb5/time.o \
-	../heimdal/lib/krb5/transited.o \
-	../heimdal/lib/krb5/v4_glue.o \
-	../heimdal/lib/krb5/version.o \
-	../heimdal/lib/krb5/warn.o \
-	../heimdal/lib/krb5/krb5_err.o \
-	../heimdal/lib/krb5/heim_err.o \
-	../heimdal/lib/krb5/k524_err.o \
-	../heimdal/lib/krb5/krb_err.o
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
 
+HEIMDAL_KRB5_OBJ_FILES = \
+	./heimdal/lib/krb5/acache.o \
+	./heimdal/lib/krb5/add_et_list.o \
+	./heimdal/lib/krb5/addr_families.o \
+	./heimdal/lib/krb5/appdefault.o \
+	./heimdal/lib/krb5/asn1_glue.o \
+	./heimdal/lib/krb5/auth_context.o \
+	./heimdal/lib/krb5/build_ap_req.o \
+	./heimdal/lib/krb5/build_auth.o \
+	./heimdal/lib/krb5/cache.o \
+	./heimdal/lib/krb5/changepw.o \
+	./heimdal/lib/krb5/codec.o \
+	./heimdal/lib/krb5/config_file.o \
+	./heimdal/lib/krb5/config_file_netinfo.o \
+	./heimdal/lib/krb5/constants.o \
+	./heimdal/lib/krb5/context.o \
+	./heimdal/lib/krb5/convert_creds.o \
+	./heimdal/lib/krb5/copy_host_realm.o \
+	./heimdal/lib/krb5/crc.o \
+	./heimdal/lib/krb5/creds.o \
+	./heimdal/lib/krb5/crypto.o \
+	./heimdal/lib/krb5/data.o \
+	./heimdal/lib/krb5/eai_to_heim_errno.o \
+	./heimdal/lib/krb5/error_string.o \
+	./heimdal/lib/krb5/expand_hostname.o \
+	./heimdal/lib/krb5/fcache.o \
+	./heimdal/lib/krb5/free.o \
+	./heimdal/lib/krb5/free_host_realm.o \
+	./heimdal/lib/krb5/generate_seq_number.o \
+	./heimdal/lib/krb5/generate_subkey.o \
+	./heimdal/lib/krb5/get_cred.o \
+	./heimdal/lib/krb5/get_default_principal.o \
+	./heimdal/lib/krb5/get_default_realm.o \
+	./heimdal/lib/krb5/get_for_creds.o \
+	./heimdal/lib/krb5/get_host_realm.o \
+	./heimdal/lib/krb5/get_in_tkt.o \
+	./heimdal/lib/krb5/get_in_tkt_with_keytab.o \
+	./heimdal/lib/krb5/get_port.o \
+	./heimdal/lib/krb5/init_creds.o \
+	./heimdal/lib/krb5/init_creds_pw.o \
+	./heimdal/lib/krb5/kcm.o \
+	./heimdal/lib/krb5/keyblock.o \
+	./heimdal/lib/krb5/keytab.o \
+	./heimdal/lib/krb5/keytab_any.o \
+	./heimdal/lib/krb5/keytab_file.o \
+	./heimdal/lib/krb5/keytab_memory.o \
+	./heimdal/lib/krb5/keytab_keyfile.o \
+	./heimdal/lib/krb5/keytab_krb4.o \
+	./heimdal/lib/krb5/krbhst.o \
+	./heimdal/lib/krb5/log.o \
+	./heimdal/lib/krb5/mcache.o \
+	./heimdal/lib/krb5/misc.o \
+	./heimdal/lib/krb5/mk_error.o \
+	./heimdal/lib/krb5/mk_priv.o \
+	./heimdal/lib/krb5/mk_rep.o \
+	./heimdal/lib/krb5/mk_req.o \
+	./heimdal/lib/krb5/mk_req_ext.o \
+	./heimdal/lib/krb5/mit_glue.o \
+	./heimdal/lib/krb5/n-fold.o \
+	./heimdal/lib/krb5/padata.o \
+	./heimdal/lib/krb5/pkinit.o \
+	./heimdal/lib/krb5/plugin.o \
+	./heimdal/lib/krb5/principal.o \
+	./heimdal/lib/krb5/pac.o \
+	./heimdal/lib/krb5/prompter_posix.o \
+	./heimdal/lib/krb5/rd_cred.o \
+	./heimdal/lib/krb5/rd_error.o \
+	./heimdal/lib/krb5/rd_priv.o \
+	./heimdal/lib/krb5/rd_rep.o \
+	./heimdal/lib/krb5/rd_req.o \
+	./heimdal/lib/krb5/replay.o \
+	./heimdal/lib/krb5/send_to_kdc.o \
+	./heimdal/lib/krb5/set_default_realm.o \
+	./heimdal/lib/krb5/store.o \
+	./heimdal/lib/krb5/store_emem.o \
+	./heimdal/lib/krb5/store_fd.o \
+	./heimdal/lib/krb5/store_mem.o \
+	./heimdal/lib/krb5/ticket.o \
+	./heimdal/lib/krb5/time.o \
+	./heimdal/lib/krb5/transited.o \
+	./heimdal/lib/krb5/v4_glue.o \
+	./heimdal/lib/krb5/version.o \
+	./heimdal/lib/krb5/warn.o \
+	./heimdal/lib/krb5/krb5_err.o \
+	./heimdal/lib/krb5/heim_err.o \
+	./heimdal/lib/krb5/k524_err.o \
+	./heimdal/lib/krb5/krb_err.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_HEIM_ASN1
 [SUBSYSTEM::HEIMDAL_HEIM_ASN1]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1
-OBJ_FILES = \
-	../heimdal/lib/asn1/der_get.o \
-	../heimdal/lib/asn1/der_put.o \
-	../heimdal/lib/asn1/der_free.o \
-	../heimdal/lib/asn1/der_format.o \
-	../heimdal/lib/asn1/der_length.o \
-	../heimdal/lib/asn1/der_copy.o \
-	../heimdal/lib/asn1/der_cmp.o \
-	../heimdal/lib/asn1/extra.o \
-	../heimdal/lib/asn1/timegm.o \
-	../heimdal/lib/asn1/asn1_err.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
 
+HEIMDAL_HEIM_ASN1_OBJ_FILES = \
+	./heimdal/lib/asn1/der_get.o \
+	./heimdal/lib/asn1/der_put.o \
+	./heimdal/lib/asn1/der_free.o \
+	./heimdal/lib/asn1/der_format.o \
+	./heimdal/lib/asn1/der_length.o \
+	./heimdal/lib/asn1/der_copy.o \
+	./heimdal/lib/asn1/der_cmp.o \
+	./heimdal/lib/asn1/extra.o \
+	./heimdal/lib/asn1/timegm.o \
+	./heimdal/lib/asn1/asn1_err.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_HCRYPTO_IMATH
 [SUBSYSTEM::HEIMDAL_HCRYPTO_IMATH]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/hcrypto/imath 
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN 
-OBJ_FILES = \
-	../heimdal/lib/hcrypto/imath/imath.o \
-	../heimdal/lib/hcrypto/imath/iprime.o
 # End SUBSYSTEM HEIMDAL_HCRYPTO_IMATH
 #######################
 
+HEIMDAL_HCRYPTO_IMATH_OBJ_FILES = \
+	./heimdal/lib/hcrypto/imath/imath.o \
+	./heimdal/lib/hcrypto/imath/iprime.o
+
 [SUBSYSTEM::HEIMDAL_HCRYPTO]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/hcrypto -Iheimdal/lib
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HEIM_ASN1 HEIMDAL_HCRYPTO_IMATH HEIMDAL_RFC2459_ASN1
-OBJ_FILES = \
-	../heimdal/lib/hcrypto/aes.o \
-	../heimdal/lib/hcrypto/bn.o \
-	../heimdal/lib/hcrypto/dh.o \
-	../heimdal/lib/hcrypto/dh-imath.o \
-	../heimdal/lib/hcrypto/des.o \
-	../heimdal/lib/hcrypto/dsa.o \
-	../heimdal/lib/hcrypto/engine.o \
-	../heimdal/lib/hcrypto/md2.o \
-	../heimdal/lib/hcrypto/md4.o \
-	../heimdal/lib/hcrypto/md5.o \
-	../heimdal/lib/hcrypto/rsa.o \
-	../heimdal/lib/hcrypto/rsa-imath.o \
-	../heimdal/lib/hcrypto/rc2.o \
-	../heimdal/lib/hcrypto/rc4.o \
-	../heimdal/lib/hcrypto/rijndael-alg-fst.o \
-	../heimdal/lib/hcrypto/rnd_keys.o \
-	../heimdal/lib/hcrypto/sha.o \
-	../heimdal/lib/hcrypto/sha256.o \
-	../heimdal/lib/hcrypto/ui.o \
-	../heimdal/lib/hcrypto/evp.o \
-	../heimdal/lib/hcrypto/pkcs5.o \
-	../heimdal/lib/hcrypto/pkcs12.o \
-	../heimdal/lib/hcrypto/rand.o \
-	../heimdal/lib/hcrypto/rand-egd.o \
-	../heimdal/lib/hcrypto/rand-unix.o \
-	../heimdal/lib/hcrypto/rand-fortuna.o \
-	../heimdal/lib/hcrypto/rand-timer.o \
-	../heimdal/lib/hcrypto/hmac.o \
-	../heimdal/lib/hcrypto/camellia.o \
-	../heimdal/lib/hcrypto/camellia-ntt.o
 # End SUBSYSTEM HEIMDAL_HCRYPTO
 #######################
 
+HEIMDAL_HCRYPTO_OBJ_FILES = \
+	./heimdal/lib/hcrypto/aes.o \
+	./heimdal/lib/hcrypto/bn.o \
+	./heimdal/lib/hcrypto/dh.o \
+	./heimdal/lib/hcrypto/dh-imath.o \
+	./heimdal/lib/hcrypto/des.o \
+	./heimdal/lib/hcrypto/dsa.o \
+	./heimdal/lib/hcrypto/engine.o \
+	./heimdal/lib/hcrypto/md2.o \
+	./heimdal/lib/hcrypto/md4.o \
+	./heimdal/lib/hcrypto/md5.o \
+	./heimdal/lib/hcrypto/rsa.o \
+	./heimdal/lib/hcrypto/rsa-imath.o \
+	./heimdal/lib/hcrypto/rc2.o \
+	./heimdal/lib/hcrypto/rc4.o \
+	./heimdal/lib/hcrypto/rijndael-alg-fst.o \
+	./heimdal/lib/hcrypto/rnd_keys.o \
+	./heimdal/lib/hcrypto/sha.o \
+	./heimdal/lib/hcrypto/sha256.o \
+	./heimdal/lib/hcrypto/ui.o \
+	./heimdal/lib/hcrypto/evp.o \
+	./heimdal/lib/hcrypto/pkcs5.o \
+	./heimdal/lib/hcrypto/pkcs12.o \
+	./heimdal/lib/hcrypto/rand.o \
+	./heimdal/lib/hcrypto/rand-egd.o \
+	./heimdal/lib/hcrypto/rand-unix.o \
+	./heimdal/lib/hcrypto/rand-fortuna.o \
+	./heimdal/lib/hcrypto/rand-timer.o \
+	./heimdal/lib/hcrypto/hmac.o \
+	./heimdal/lib/hcrypto/camellia.o \
+	./heimdal/lib/hcrypto/camellia-ntt.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_HX509
 [SUBSYSTEM::HEIMDAL_HX509]
@@ -342,103 +351,78 @@ PRIVATE_DEPENDENCIES = \
 	HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \
 	HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \
 	HEIMDAL_WIND
-OBJ_FILES = \
-	../heimdal/lib/hx509/ca.o \
-	../heimdal/lib/hx509/cert.o \
-	../heimdal/lib/hx509/cms.o \
-	../heimdal/lib/hx509/collector.o \
-	../heimdal/lib/hx509/crypto.o \
-	../heimdal/lib/hx509/error.o \
-	../heimdal/lib/hx509/env.o \
-	../heimdal/lib/hx509/file.o \
-	../heimdal/lib/hx509/keyset.o \
-	../heimdal/lib/hx509/ks_dir.o \
-	../heimdal/lib/hx509/ks_file.o \
-	../heimdal/lib/hx509/ks_keychain.o \
-	../heimdal/lib/hx509/ks_mem.o \
-	../heimdal/lib/hx509/ks_null.o \
-	../heimdal/lib/hx509/ks_p11.o \
-	../heimdal/lib/hx509/ks_p12.o \
-	../heimdal/lib/hx509/lock.o \
-	../heimdal/lib/hx509/name.o \
-	../heimdal/lib/hx509/peer.o \
-	../heimdal/lib/hx509/print.o \
-	../heimdal/lib/hx509/req.o \
-	../heimdal/lib/hx509/revoke.o \
-	../heimdal/lib/hx509/hx509_err.o
 # End SUBSYSTEM HEIMDAL_HX509
 #######################
 
+HEIMDAL_HX509_OBJ_FILES = \
+	./heimdal/lib/hx509/ca.o \
+	./heimdal/lib/hx509/cert.o \
+	./heimdal/lib/hx509/cms.o \
+	./heimdal/lib/hx509/collector.o \
+	./heimdal/lib/hx509/crypto.o \
+	./heimdal/lib/hx509/error.o \
+	./heimdal/lib/hx509/env.o \
+	./heimdal/lib/hx509/file.o \
+	./heimdal/lib/hx509/keyset.o \
+	./heimdal/lib/hx509/ks_dir.o \
+	./heimdal/lib/hx509/ks_file.o \
+	./heimdal/lib/hx509/ks_keychain.o \
+	./heimdal/lib/hx509/ks_mem.o \
+	./heimdal/lib/hx509/ks_null.o \
+	./heimdal/lib/hx509/ks_p11.o \
+	./heimdal/lib/hx509/ks_p12.o \
+	./heimdal/lib/hx509/lock.o \
+	./heimdal/lib/hx509/name.o \
+	./heimdal/lib/hx509/peer.o \
+	./heimdal/lib/hx509/print.o \
+	./heimdal/lib/hx509/req.o \
+	./heimdal/lib/hx509/revoke.o \
+	./heimdal/lib/hx509/hx509_err.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_WIND
 [SUBSYSTEM::HEIMDAL_WIND]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/wind 
 PRIVATE_DEPENDENCIES = \
 	HEIMDAL_ROKEN HEIMDAL_COM_ERR
-OBJ_FILES = \
-	../heimdal/lib/wind/wind_err.o \
-	../heimdal/lib/wind/stringprep.o \
-	../heimdal/lib/wind/errorlist.o \
-	../heimdal/lib/wind/errorlist_table.o \
-	../heimdal/lib/wind/normalize.o \
-	../heimdal/lib/wind/normalize_table.o \
-	../heimdal/lib/wind/combining.o \
-	../heimdal/lib/wind/combining_table.o \
-	../heimdal/lib/wind/utf8.o \
-	../heimdal/lib/wind/bidi.o \
-	../heimdal/lib/wind/bidi_table.o \
-	../heimdal/lib/wind/ldap.o \
-	../heimdal/lib/wind/map.o \
-	../heimdal/lib/wind/map_table.o
+
+HEIMDAL_WIND_OBJ_FILES = \
+	./heimdal/lib/wind/wind_err.o \
+	./heimdal/lib/wind/stringprep.o \
+	./heimdal/lib/wind/errorlist.o \
+	./heimdal/lib/wind/errorlist_table.o \
+	./heimdal/lib/wind/normalize.o \
+	./heimdal/lib/wind/normalize_table.o \
+	./heimdal/lib/wind/combining.o \
+	./heimdal/lib/wind/combining_table.o \
+	./heimdal/lib/wind/utf8.o \
+	./heimdal/lib/wind/bidi.o \
+	./heimdal/lib/wind/bidi_table.o \
+	./heimdal/lib/wind/ldap.o \
+	./heimdal/lib/wind/map.o \
+	./heimdal/lib/wind/map_table.o
 # End SUBSYSTEM HEIMDAL_WIND
 #######################
 
 [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
-OBJ_FILES = ../heimdal/lib/roken/getprogname.o
+
+HEIMDAL_ROKEN_GETPROGNAME_OBJ_FILES = ./heimdal/lib/roken/getprogname.o
 
 [SUBSYSTEM::HEIMDAL_ROKEN_CLOSEFROM] 
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
-OBJ_FILES = ../heimdal/lib/roken/closefrom.o
+
+HEIMDAL_ROKEN_CLOSEFROM_OBJ_FILES = ./heimdal/lib/roken/closefrom.o
 
 [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME_H] 
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken  -Ilib/socket_wrapper
-OBJ_FILES = ../heimdal/lib/roken/getprogname.ho
+
+HEIMDAL_ROKEN_GETPROGNAME_H_OBJ_FILES = ./heimdal/lib/roken/getprogname.ho
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
 [SUBSYSTEM::HEIMDAL_ROKEN]
 CFLAGS =  -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper
-OBJ_FILES = \
-	../heimdal/lib/roken/base64.o \
-	../heimdal/lib/roken/hex.o \
-	../heimdal/lib/roken/bswap.o \
-	../heimdal/lib/roken/dumpdata.o \
-	../heimdal/lib/roken/emalloc.o \
-	../heimdal/lib/roken/ecalloc.o \
-	../heimdal/lib/roken/get_window_size.o \
-	../heimdal/lib/roken/h_errno.o \
-	../heimdal/lib/roken/issuid.o \
-	../heimdal/lib/roken/net_read.o \
-	../heimdal/lib/roken/net_write.o \
-	../heimdal/lib/roken/socket.o \
-	../heimdal/lib/roken/parse_time.o \
-	../heimdal/lib/roken/parse_units.o \
-	../heimdal/lib/roken/resolve.o \
-	../heimdal/lib/roken/roken_gethostby.o \
-	../heimdal/lib/roken/signal.o \
-	../heimdal/lib/roken/vis.o \
-	../heimdal/lib/roken/strlwr.o \
-	../heimdal/lib/roken/strsep_copy.o \
-	../heimdal/lib/roken/strsep.o \
-	../heimdal/lib/roken/strupr.o \
-	../heimdal/lib/roken/strpool.o \
-	../heimdal/lib/roken/estrdup.o \
-	../heimdal/lib/roken/erealloc.o \
-	../heimdal/lib/roken/simple_exec.o \
-	../heimdal/lib/roken/strcollect.o \
-	../heimdal/lib/roken/rtbl.o \
-	replace.o
 PUBLIC_DEPENDENCIES = \
 			HEIMDAL_ROKEN_GETPROGNAME \
 			HEIMDAL_ROKEN_CLOSEFROM \
@@ -447,64 +431,99 @@ PUBLIC_DEPENDENCIES = \
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################
 
+HEIMDAL_ROKEN_OBJ_FILES = \
+	./heimdal/lib/roken/base64.o \
+	./heimdal/lib/roken/hex.o \
+	./heimdal/lib/roken/bswap.o \
+	./heimdal/lib/roken/dumpdata.o \
+	./heimdal/lib/roken/emalloc.o \
+	./heimdal/lib/roken/ecalloc.o \
+	./heimdal/lib/roken/get_window_size.o \
+	./heimdal/lib/roken/h_errno.o \
+	./heimdal/lib/roken/issuid.o \
+	./heimdal/lib/roken/net_read.o \
+	./heimdal/lib/roken/net_write.o \
+	./heimdal/lib/roken/socket.o \
+	./heimdal/lib/roken/parse_time.o \
+	./heimdal/lib/roken/parse_units.o \
+	./heimdal/lib/roken/resolve.o \
+	./heimdal/lib/roken/roken_gethostby.o \
+	./heimdal/lib/roken/signal.o \
+	./heimdal/lib/roken/vis.o \
+	./heimdal/lib/roken/strlwr.o \
+	./heimdal/lib/roken/strsep_copy.o \
+	./heimdal/lib/roken/strsep.o \
+	./heimdal/lib/roken/strupr.o \
+	./heimdal/lib/roken/strpool.o \
+	./heimdal/lib/roken/estrdup.o \
+	./heimdal/lib/roken/erealloc.o \
+	./heimdal/lib/roken/simple_exec.o \
+	./heimdal/lib/roken/strcollect.o \
+	./heimdal/lib/roken/rtbl.o \
+	./heimdal_build/replace.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_GLUE
 [SUBSYSTEM::HEIMDAL_GLUE]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -Iheimdal/lib/asn1 -Iheimdal/lib/com_err 
-OBJ_FILES = glue.o
 PUBLIC_DEPENDENCIES = LIBNETIF LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM HEIMDAL_GLUE
 #######################
 
+HEIMDAL_GLUE_OBJ_FILES = heimdal_build/glue.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_COM_ERR
 [SUBSYSTEM::HEIMDAL_COM_ERR]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err
-OBJ_FILES = \
-	../heimdal/lib/com_err/com_err.o \
-	../heimdal/lib/com_err/error.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN
 # End SUBSYSTEM HEIMDAL_COM_ERR
 #######################
 
+HEIMDAL_COM_ERR_OBJ_FILES = \
+	./heimdal/lib/com_err/com_err.o \
+	./heimdal/lib/com_err/error.o
+
 #######################
 # Start SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_ASN1_COMPILE_LEX]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/asn1 -Iheimdal/lib/roken  -Ilib/socket_wrapper
-OBJ_FILES = ../heimdal/lib/asn1/lex.ho 
 # End SUBSYSTEM HEIMDAL_ASN1_COMPILE_LEX
 #######################
 
+HEIMDAL_ASN1_COMPILE_LEX_OBJ_FILES = ./heimdal/lib/asn1/lex.ho 
+
 #######################
 # Start BINARY asn1_compile
 [BINARY::asn1_compile]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 USE_HOSTCC = YES
-OBJ_FILES = \
-	../heimdal/lib/asn1/main.ho \
-	../heimdal/lib/asn1/gen.ho \
-	../heimdal/lib/asn1/gen_copy.ho \
-	../heimdal/lib/asn1/gen_decode.ho \
-	../heimdal/lib/asn1/gen_encode.ho \
-	../heimdal/lib/asn1/gen_free.ho \
-	../heimdal/lib/asn1/gen_glue.ho \
-	../heimdal/lib/asn1/gen_length.ho \
-	../heimdal/lib/asn1/gen_seq.ho \
-	../heimdal/lib/asn1/hash.ho \
-	../heimdal/lib/asn1/parse.ho \
-	../heimdal/lib/roken/emalloc.ho \
-	../heimdal/lib/roken/getarg.ho \
-	../heimdal/lib/roken/setprogname.ho \
-	../heimdal/lib/roken/strupr.ho \
-	../heimdal/lib/roken/get_window_size.ho \
-	../heimdal/lib/roken/estrdup.ho \
-	../heimdal/lib/roken/ecalloc.ho \
-	../heimdal/lib/asn1/symbol.ho \
-	../heimdal/lib/vers/print_version.ho \
-	../lib/socket_wrapper/socket_wrapper.ho \
-	replace.ho
 PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
 
+asn1_compile_OBJ_FILES = \
+	./heimdal/lib/asn1/main.ho \
+	./heimdal/lib/asn1/gen.ho \
+	./heimdal/lib/asn1/gen_copy.ho \
+	./heimdal/lib/asn1/gen_decode.ho \
+	./heimdal/lib/asn1/gen_encode.ho \
+	./heimdal/lib/asn1/gen_free.ho \
+	./heimdal/lib/asn1/gen_glue.ho \
+	./heimdal/lib/asn1/gen_length.ho \
+	./heimdal/lib/asn1/gen_seq.ho \
+	./heimdal/lib/asn1/hash.ho \
+	./heimdal/lib/asn1/parse.ho \
+	./heimdal/lib/roken/emalloc.ho \
+	./heimdal/lib/roken/getarg.ho \
+	./heimdal/lib/roken/setprogname.ho \
+	./heimdal/lib/roken/strupr.ho \
+	./heimdal/lib/roken/get_window_size.ho \
+	./heimdal/lib/roken/estrdup.ho \
+	./heimdal/lib/roken/ecalloc.ho \
+	./heimdal/lib/asn1/symbol.ho \
+	./heimdal/lib/vers/print_version.ho \
+	./lib/socket_wrapper/socket_wrapper.ho \
+	./heimdal_build/replace.ho
+
 # End BINARY asn1_compile
 #######################
 
@@ -512,28 +531,31 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBR
 # Start SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 [SUBSYSTEM::HEIMDAL_COM_ERR_COMPILE_LEX]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/com_err -Iheimdal/lib/roken  -Ilib/socket_wrapper
-OBJ_FILES = ../heimdal/lib/com_err/lex.ho 
 # End SUBSYSTEM HEIMDAL_COM_ERR_COMPILE_LEX
 #######################
 
+HEIMDAL_COM_ERR_COMPILE_LEX_OBJ_FILES = ./heimdal/lib/com_err/lex.ho 
+
 #######################
 # Start BINARY compile_et
 [BINARY::compile_et]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
 USE_HOSTCC = YES
-OBJ_FILES = ../heimdal/lib/vers/print_version.ho \
-	../heimdal/lib/com_err/parse.ho \
-	../heimdal/lib/com_err/compile_et.ho \
-	../heimdal/lib/roken/getarg.ho \
-	../heimdal/lib/roken/get_window_size.ho \
-	../heimdal/lib/roken/strupr.ho \
-	../heimdal/lib/roken/setprogname.ho \
-	../lib/socket_wrapper/socket_wrapper.ho \
-	replace.ho
 PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK
 # End BINARY compile_et
 #######################
 
+compile_et_OBJ_FILES = ./heimdal/lib/vers/print_version.ho \
+	./heimdal/lib/com_err/parse.ho \
+	./heimdal/lib/com_err/compile_et.ho \
+	./heimdal/lib/roken/getarg.ho \
+	./heimdal/lib/roken/get_window_size.ho \
+	./heimdal/lib/roken/strupr.ho \
+	./heimdal/lib/roken/setprogname.ho \
+	./lib/socket_wrapper/socket_wrapper.ho \
+	./heimdal_build/replace.ho
+
+
 mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hdb/hdb.asn1 hdb_asn1 heimdal/lib/hdb |
 mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/spnego/spnego.asn1 spnego_asn1 heimdal/lib/gssapi --sequence=MechTypeList |
 mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/gssapi/mech/gssapi.asn1 gssapi_asn1 heimdal/lib/gssapi|
@@ -550,7 +572,7 @@ mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/asn1/kx509.asn1 kx509_as
 mkinclude perl_path_wrapper.sh asn1_deps.pl heimdal/lib/hx509/pkcs10.asn1 pkcs10_asn1 heimdal/lib/hx509 --preserve-binary=CertificationRequestInfo|
 
 #
-# Ensure to update ../static_deps.mk when you add a new entry here!
+# Ensure to update ./static_deps.mk when you add a new entry here!
 #
 mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/asn1/asn1_err.et heimdal/lib/asn1|
 mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hdb/hdb_err.et heimdal/lib/hdb|
@@ -569,31 +591,25 @@ clean::
 # Start SUBSYSTEM HEIMDAL
 [SUBSYSTEM::HEIMDAL]
 CFLAGS = -Iheimdal_build
-OBJ_FILES = ../heimdal/lib/vers/print_version.o
 PUBLIC_DEPENDENCIES = \
 		HEIMDAL_GSSAPI HEIMDAL_KRB5
 # End SUBSYSTEM HEIMDAL
 #######################
 
-#######################
-# Start SUBSYSTEM KERBEROS_LIB
-[SUBSYSTEM::KERBEROS_LIB]
-#PUBLIC_DEPENDENCIES = EXT_KRB5
-PUBLIC_DEPENDENCIES = HEIMDAL
-# End SUBSYSTEM KERBEROS_LIB
-#######################
+HEIMDAL_OBJ_FILES = ./heimdal/lib/vers/print_version.o
 
 #######################
 # Start BINARY compile_et
 [BINARY::samba4kinit]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
-OBJ_FILES = ../heimdal/kuser/kinit.o \
-	../heimdal/lib/vers/print_version.o \
-	../heimdal/lib/roken/setprogname.o \
-	../heimdal/lib/roken/getarg.o 
 PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM
 # End BINARY compile_et
 #######################
 
+samba4kinit_OBJ_FILES = ./heimdal/kuser/kinit.o \
+	./heimdal/lib/vers/print_version.o \
+	./heimdal/lib/roken/setprogname.o \
+	./heimdal/lib/roken/getarg.o 
+
 dist:: heimdal/lib/asn1/lex.c heimdal/lib/com_err/lex.c \
 	heimdal/lib/asn1/parse.c heimdal/lib/com_err/parse.c
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 479cb36296..94ba933e57 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -5,25 +5,22 @@
 [MODULE::KDC]
 INIT_FUNCTION = server_service_kdc_init
 SUBSYSTEM = service
-OBJ_FILES = \
-		kdc.o \
-		kpasswdd.o
 PRIVATE_DEPENDENCIES = \
-		LIBLDB KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB SAMDB
+		LIBLDB HEIMDAL HEIMDAL_KDC HEIMDAL_HDB SAMDB
 # End SUBSYSTEM KDC
 #######################
 
+KDC_OBJ_FILES = $(addprefix kdc/, kdc.o kpasswdd.o)
+
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::HDB_LDB]
 CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
 PRIVATE_PROTO_HEADER = pac_glue.h
-OBJ_FILES = \
-		hdb-ldb.o \
-		pac-glue.o 
 PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply KERBEROS CREDENTIALS \
+		LIBLDB auth_sam auth_sam_reply HEIMDAL CREDENTIALS \
 		HEIMDAL_HDB_ASN1
 # End SUBSYSTEM KDC
 #######################
 
+HDB_LDB_OBJ_FILES = $(addprefix kdc/, hdb-ldb.o pac-glue.o)
diff --git a/source4/ldap_server/config.mk b/source4/ldap_server/config.mk
index 5f8c530db9..03cc41d69d 100644
--- a/source4/ldap_server/config.mk
+++ b/source4/ldap_server/config.mk
@@ -6,11 +6,6 @@
 INIT_FUNCTION = server_service_ldap_init
 SUBSYSTEM = service
 PRIVATE_PROTO_HEADER = proto.h
-OBJ_FILES = \
-		ldap_server.o \
-		ldap_backend.o \
-		ldap_bind.o \
-		ldap_extended.o
 PRIVATE_DEPENDENCIES = CREDENTIALS \
 		LIBCLI_LDAP SAMDB \
 		process_model \
@@ -18,3 +13,10 @@ PRIVATE_DEPENDENCIES = CREDENTIALS \
 		LIBSAMBA-HOSTCONFIG
 # End SUBSYSTEM SMB
 #######################
+
+LDAP_OBJ_FILES = $(addprefix ldap_server/, \
+		ldap_server.o \
+		ldap_backend.o \
+		ldap_bind.o \
+		ldap_extended.o)
+
diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk
index df0f81dccb..c0bba35ba5 100644
--- a/source4/lib/appweb/config.mk
+++ b/source4/lib/appweb/config.mk
@@ -1,31 +1,25 @@
 #######################
 # Start SUBSYSTEM MPR
 [SUBSYSTEM::MPR]
-OBJ_FILES = \
-		mpr/miniMpr.o \
-		mpr/var.o
 # End SUBSYSTEM MPR
 #######################
 
+MPR_OBJ_FILES = $(addprefix lib/appweb/mpr/, miniMpr.o var.o)
 
 #######################
 # Start SUBSYSTEM EJS
 [SUBSYSTEM::EJS]
-OBJ_FILES = \
-		ejs/ejsLib.o  \
-		ejs/ejsLex.o \
-		ejs/ejsParser.o \
-		ejs/ejsProcs.o
 PUBLIC_DEPENDENCIES = MPR
 # End SUBSYSTEM EJS
 #######################
 
+EJS_OBJ_FILES = $(addprefix lib/appweb/ejs/, ejsLib.o ejsLex.o ejsParser.o ejsProcs.o)
+
 #######################
 # Start SUBSYSTEM ESP
 [SUBSYSTEM::ESP]
-OBJ_FILES = \
-		esp/esp.o  \
-		esp/espProcs.o
 PUBLIC_DEPENDENCIES = EJS
 # End SUBSYSTEM ESP
 #######################
+
+ESP_OBJ_FILES = $(addprefix lib/appweb/esp/, esp.o espProcs.o)
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index d6e90928b0..a02151282c 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -19,26 +19,27 @@ mkinclude dbwrap/config.mk
 mkinclude crypto/config.mk
 
 [SUBSYSTEM::LIBCOMPRESSION]
-OBJ_FILES = compression/mszip.o
+
+LIBCOMPRESSION_OBJ_FILES = lib/compression/mszip.o
 
 [SUBSYSTEM::GENCACHE]
-OBJ_FILES = gencache/gencache.o
 PRIVATE_DEPENDENCIES = TDB_WRAP
 
+GENCACHE_OBJ_FILES = gencache/gencache.o
 
 # PUBLIC_HEADERS += lib/gencache/gencache.h
 
 [SUBSYSTEM::LDB_WRAP]
-OBJ_FILES = ldb_wrap.o
 PUBLIC_DEPENDENCIES = LIBLDB
 PRIVATE_DEPENDENCIES = LDBSAMBA UTIL_LDB
 
-
+LDB_WRAP_OBJ_FILES = lib/ldb_wrap.o
 PUBLIC_HEADERS += lib/ldb_wrap.h
 
 [SUBSYSTEM::TDB_WRAP]
-OBJ_FILES = tdb_wrap.o
 PUBLIC_DEPENDENCIES = LIBTDB
 
-
+TDB_WRAP_OBJ_FILES = lib/tdb_wrap.o
 PUBLIC_HEADERS += lib/tdb_wrap.h
+
+SMBREADLINE_OBJ_LIST = $(SMBREADLINE_OBJ_FILES)
diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index 2766784c52..e5e5bd4560 100644
--- a/source4/lib/charset/config.mk
+++ b/source4/lib/charset/config.mk
@@ -1,15 +1,12 @@
 ################################################
 # Start SUBSYSTEM CHARSET
 [SUBSYSTEM::CHARSET]
-OBJ_FILES = \
-		iconv.o \
-		charcnv.o \
-		util_unistr.o
 PRIVATE_PROTO_HEADER = charset_proto.h
 PUBLIC_DEPENDENCIES = ICONV
 PRIVATE_DEPENDENCIES = DYNCONFIG
 # End SUBSYSTEM CHARSET
 ################################################
 
+CHARSET_OBJ_FILES = $(addprefix lib/charset/, iconv.o charcnv.o util_unistr.o)
 
 PUBLIC_HEADERS += lib/charset/charset.h
diff --git a/source4/lib/cmdline/config.mk b/source4/lib/cmdline/config.mk
index 87014d4d53..f8a971a063 100644
--- a/source4/lib/cmdline/config.mk
+++ b/source4/lib/cmdline/config.mk
@@ -1,16 +1,19 @@
 [SUBSYSTEM::LIBCMDLINE_CREDENTIALS]
 PRIVATE_PROTO_HEADER = credentials.h
-OBJ_FILES = credentials.o
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBPOPT
 
+LIBCMDLINE_CREDENTIALS_OBJ_FILES = lib/cmdline/credentials.o
+
 [SUBSYSTEM::POPT_SAMBA]
-OBJ_FILES = popt_common.o
 PUBLIC_DEPENDENCIES = LIBPOPT
 
+POPT_SAMBA_OBJ_FILES = lib/cmdline/popt_common.o
+
 PUBLIC_HEADERS += lib/cmdline/popt_common.h 
 
 [SUBSYSTEM::POPT_CREDENTIALS]
 PRIVATE_PROTO_HEADER = popt_credentials.h
-OBJ_FILES = popt_credentials.o
 PUBLIC_DEPENDENCIES = CREDENTIALS LIBCMDLINE_CREDENTIALS LIBPOPT
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
+
+POPT_CREDENTIALS_OBJ_FILES = lib/cmdline/popt_credentials.o
diff --git a/source4/lib/crypto/config.mk b/source4/lib/crypto/config.mk
index f7a8d20604..82dbe4a4cb 100644
--- a/source4/lib/crypto/config.mk
+++ b/source4/lib/crypto/config.mk
@@ -1,26 +1,19 @@
 ##############################
 # Start SUBSYSTEM LIBCRYPTO
 [SUBSYSTEM::LIBCRYPTO]
-OBJ_FILES = \
-		crc32.o \
-		md5.o \
-		hmacmd5.o \
-		md4.o \
-		arcfour.o \
-		sha1.o \
-		hmacsha1.o
 # End SUBSYSTEM LIBCRYPTO
 ##############################
 
+LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
+					 crc32.o md5.o hmacmd5.o md4.o \
+					 arcfour.o sha1.o hmacsha1.o)
+
+
 [MODULE::TORTURE_LIBCRYPTO]
-OBJ_FILES = \
-		md4test.o \
-		md5test.o \
-		hmacmd5test.o \
-		sha1test.o \
-		hmacsha1test.o
 SUBSYSTEM = torture
 PRIVATE_DEPENDENCIES = LIBCRYPTO
 PRIVATE_PROTO_HEADER = test_proto.h
 
+TORTURE_LIBCRYPTO_OBJ_FILES = $(addprefix lib/crypto/, \
+		md4test.o md5test.o hmacmd5test.o sha1test.o hmacsha1test.o)
 
diff --git a/source4/lib/dbwrap/config.mk b/source4/lib/dbwrap/config.mk
index 01ce4ddd8e..9038873d32 100644
--- a/source4/lib/dbwrap/config.mk
+++ b/source4/lib/dbwrap/config.mk
@@ -1,6 +1,6 @@
 [SUBSYSTEM::LIBDBWRAP]
-OBJ_FILES = dbwrap.o \
-		dbwrap_tdb.o \
-		dbwrap_ctdb.o
 PUBLIC_DEPENDENCIES = \
 		LIBTDB ctdb
+
+LIBDBWRAP_OBJ_FILES = $(addprefix lib/dbwrap/, dbwrap.o dbwrap_tdb.o dbwrap_ctdb.o)
+
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 225a23c634..e5a1316c47 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -1,43 +1,49 @@
 ##############################
 [MODULE::EVENTS_AIO]
-OBJ_FILES = events_aio.o
 PRIVATE_DEPENDENCIES = LIBAIO_LINUX
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_aio_init
 ##############################
 
+EVENTS_AIO_OBJ_FILES = lib/events/events_aio.o
+
 ##############################
 [MODULE::EVENTS_EPOLL]
-OBJ_FILES = events_epoll.o
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_epoll_init
 ##############################
 
+EVENTS_EPOLL_OBJ_FILES = lib/events/events_epoll.o
+
 ##############################
 [MODULE::EVENTS_SELECT]
-OBJ_FILES = events_select.o
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_select_init
 ##############################
 
+EVENTS_SELECT_OBJ_FILES = lib/events/events_select.o
+
 ##############################
 [MODULE::EVENTS_STANDARD]
-OBJ_FILES = events_standard.o
 SUBSYSTEM = LIBEVENTS
 INIT_FUNCTION = s4_events_standard_init
 ##############################
 
+EVENTS_STANDARD_OBJ_FILES = lib/events/events_standard.o
 
 ##############################
 # Start SUBSYSTEM LIBEVENTS
 [SUBSYSTEM::LIBEVENTS]
-OBJ_FILES = events.o events_timed.o events_signal.o
 PUBLIC_DEPENDENCIES = LIBTALLOC LIBSAMBA-UTIL
 # End SUBSYSTEM LIBEVENTS
 ##############################
 
+LIBEVENTS_OBJ_FILES = $(addprefix lib/events/, events.o events_timed.o events_signal.o)
+
 PUBLIC_HEADERS += $(addprefix lib/events/, events.h events_internal.h)
 
 [PYTHON::swig_events]
 SWIG_FILE = events.i
 PRIVATE_DEPENDENCIES = LIBEVENTS
+
+swig_events_OBJ_FILES = lib/events/events_wrap.o
diff --git a/source4/lib/ldb-samba/config.mk b/source4/lib/ldb-samba/config.mk
index fa3ac46021..6a0b842fff 100644
--- a/source4/lib/ldb-samba/config.mk
+++ b/source4/lib/ldb-samba/config.mk
@@ -4,9 +4,8 @@
 PUBLIC_DEPENDENCIES = LIBLDB
 PRIVATE_PROTO_HEADER = ldif_handlers.h
 PRIVATE_DEPENDENCIES = LIBSECURITY SAMDB_SCHEMA LIBNDR NDR_MISC
-OBJ_FILES = \
-		ldif_handlers.o
 # End SUBSYSTEM LDBSAMBA
 ################################################
 
+LDBSAMBA_OBJ_FILES = lib/ldb-samba/ldif_handlers.o
 
diff --git a/source4/lib/ldb/ldb_ildap/config.mk b/source4/lib/ldb/ldb_ildap/config.mk
index 3062dc886f..1b534645b6 100644
--- a/source4/lib/ldb/ldb_ildap/config.mk
+++ b/source4/lib/ldb/ldb_ildap/config.mk
@@ -6,9 +6,8 @@ CFLAGS = -Ilib/ldb/include
 OUTPUT_TYPE = SHARED_LIBRARY
 PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP CREDENTIALS
 ALIASES = ldapi ldaps ldap
-OBJ_FILES = \
-		ldb_ildap.o
 # End MODULE ldb_ildap
 ################################################
 
+ldb_ildap_OBJ_FILES = lib/ldb/ldb_ildap/ldb_ildap.o
 
diff --git a/source4/lib/ldb/python.mk b/source4/lib/ldb/python.mk
index bbd4c1c5eb..448cc3ed60 100644
--- a/source4/lib/ldb/python.mk
+++ b/source4/lib/ldb/python.mk
@@ -2,3 +2,5 @@
 PUBLIC_DEPENDENCIES = LIBLDB
 CFLAGS = -Ilib/ldb/include
 SWIG_FILE = ldb.i
+
+swig_ldb_OBJ_FILES = lib/ldb/ldb_wrap.o
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
index 02ad84ae25..6729636434 100644
--- a/source4/lib/ldb/tools/config.mk
+++ b/source4/lib/ldb/tools/config.mk
@@ -2,89 +2,89 @@
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
 CFLAGS = -Ilib/ldb -Ilib/ldb/include
-OBJ_FILES= \
-		cmdline.o
 PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
 # End SUBSYSTEM LIBLDB_CMDLINE
 ################################################
 
+LIBLDB_CMDLINE_OBJ_FILES = lib/ldb/tools/cmdline.o
+
 ################################################
 # Start BINARY ldbadd
 [BINARY::ldbadd]
 INSTALLDIR = BINDIR
-OBJ_FILES = \
-		ldbadd.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE LIBCLI_RESOLVE
 # End BINARY ldbadd
 ################################################
 
+
+ldbadd_OBJ_FILES = lib/ldb/tools/ldbadd.o
+
 MANPAGES += $(ldbdir)/man/ldbadd.1
 
 ################################################
 # Start BINARY ldbdel
 [BINARY::ldbdel]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbdel.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbdel
 ################################################
 
+ldbdel_OBJ_FILES = lib/ldb/tools/ldbdel.o
+
 MANPAGES += $(ldbdir)/man/ldbdel.1
 
 ################################################
 # Start BINARY ldbmodify
 [BINARY::ldbmodify]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbmodify.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbmodify
 ################################################
 
+ldbmodify_OBJ_FILES = lib/ldb/tools/ldbmodify.o
 MANPAGES += $(ldbdir)/man/ldbmodify.1
 
 ################################################
 # Start BINARY ldbsearch
 [BINARY::ldbsearch]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbsearch.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE 
 # End BINARY ldbsearch
 ################################################
 
+ldbsearch_OBJ_FILES = lib/ldb/tools/ldbsearch.o
+
 MANPAGES += $(ldbdir)/man/ldbsearch.1
 
 ################################################
 # Start BINARY ldbedit
 [BINARY::ldbedit]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbedit.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbedit
 ################################################
 
+ldbedit_OBJ_FILES = lib/ldb/tools/ldbedit.o
+
 MANPAGES += $(ldbdir)/man/ldbedit.1
 
 ################################################
 # Start BINARY ldbrename
 [BINARY::ldbrename]
 INSTALLDIR = BINDIR
-OBJ_FILES= \
-		ldbrename.o
 PRIVATE_DEPENDENCIES = \
 		LIBLDB_CMDLINE
 # End BINARY ldbrename
 ################################################
 
+ldbrename_OBJ_FILES = lib/ldb/tools/ldbrename.o
+
 MANPAGES += $(ldbdir)/man/ldbrename.1
 
 
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index 3fec9c0c90..0a0097bdf3 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -2,8 +2,6 @@
 ################################################
 # Start SUBSYSTEM MESSAGING
 [SUBSYSTEM::MESSAGING]
-OBJ_FILES = \
-		messaging.o
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL \
 		TDB_WRAP \
@@ -14,3 +12,6 @@ PUBLIC_DEPENDENCIES = \
 		LIBNDR
 # End SUBSYSTEM MESSAGING
 ################################################
+
+
+MESSAGING_OBJ_FILES = lib/messaging/messaging.o
diff --git a/source4/lib/policy/config.mk b/source4/lib/policy/config.mk
index 6763884b48..9a8e60bfbe 100644
--- a/source4/lib/policy/config.mk
+++ b/source4/lib/policy/config.mk
@@ -1,12 +1,14 @@
 [SUBSYSTEM::LIBPOLICY]
 CFLAGS = -Iheimdal/lib/roken
-OBJ_FILES = lex.o parse_adm.o 
 PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSAMBA-HOSTCONFIG LIBTALLOC CHARSET 
 
+LIBPOLICY_OBJ_FILES = lib/policy/lex.o lib/policy/parse_adm.o 
+
 lib/policy/lex.l: lib/policy/parse_adm.h
 
 lib/policy/parse_adm.h: lib/policy/parse_adm.c
 
 [BINARY::dumpadm]
-OBJ_FILES = dumpadm.o
 PRIVATE_DEPENDENCIES = LIBPOLICY LIBPOPT LIBSAMBA-HOSTCONFIG LIBTALLOC LIBSAMBA-UTIL CHARSET
+
+dumpadm_OBJ_FILES = lib/policy/dumpadm.o
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
index ad218517b3..86d440ac78 100644
--- a/source4/lib/popt/config.mk
+++ b/source4/lib/popt/config.mk
@@ -1,7 +1,5 @@
 [SUBSYSTEM::LIBPOPT]
-OBJ_FILES = findme.o \
-			popt.o \
-			poptconfig.o \
-			popthelp.o \
-			poptparse.o
 CFLAGS = -Ilib/popt
+
+LIBPOPT_OBJ_FILES = $(addprefix lib/popt/, findme.o popt.o poptconfig.o popthelp.o poptparse.o)
+
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 77b4ece552..affc11d31c 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -1,6 +1,7 @@
 [SUBSYSTEM::TDR_REGF]
 PUBLIC_DEPENDENCIES = TDR 
-OBJ_FILES = tdr_regf.o
+
+TDR_REGF_OBJ_FILES = lib/registry/tdr_regf.o
 
 # Special support for external builddirs
 lib/registry/regf.c: lib/registry/tdr_regf.c
@@ -20,93 +21,87 @@ clean::
 VERSION = 0.0.1
 PC_FILE = registry.pc
 SO_VERSION = 0
-OBJ_FILES = \
-		interface.o \
-		util.o \
-		samba.o \
-		patchfile_dotreg.o \
-		patchfile_preg.o \
-		patchfile.o \
-		regf.o \
-		hive.o \
-		local.o \
-		ldb.o \
-		dir.o \
-		rpc.o
 PUBLIC_DEPENDENCIES = \
 		LIBSAMBA-UTIL CHARSET TDR_REGF LIBLDB \
 		RPC_NDR_WINREG LDB_WRAP
 # End MODULE registry_ldb
 ################################################
 
+registry_OBJ_FILES = $(addprefix lib/registry/, interface.o util.o samba.o \
+					patchfile_dotreg.o patchfile_preg.o patchfile.o regf.o \
+					hive.o local.o ldb.o dir.o rpc.o)
+
 PUBLIC_HEADERS += lib/registry/registry.h
 
 [SUBSYSTEM::registry_common]
 PUBLIC_DEPENDENCIES = registry
-OBJ_FILES = tools/common.o
 PRIVATE_PROTO_HEADER = tools/common.h
 
+registry_common_OBJ_FILES = lib/registry/tools/common.o
+
 ################################################
 # Start BINARY regdiff
 [BINARY::regdiff]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regdiff.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
 # End BINARY regdiff
 ################################################
 
+regdiff_OBJ_FILES = lib/registry/tools/regdiff.o
+
 MANPAGES += lib/registry/man/regdiff.1
 
 ################################################
 # Start BINARY regpatch
 [BINARY::regpatch]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regpatch.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-HOSTCONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
 		registry_common
 # End BINARY regpatch
 ################################################
 
+regpatch_OBJ_FILES = lib/registry/tools/regpatch.o
+
 MANPAGES += lib/registry/man/regpatch.1
 
 ################################################
 # Start BINARY regshell
 [BINARY::regshell]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regshell.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
 		SMBREADLINE registry_common
 # End BINARY regshell
 ################################################
 
+regshell_OBJ_FILES = lib/registry/tools/regshell.o
+
 MANPAGES += lib/registry/man/regshell.1
 
 ################################################
 # Start BINARY regtree
 [BINARY::regtree]
 INSTALLDIR = BINDIR
-OBJ_FILES = tools/regtree.o
 PRIVATE_DEPENDENCIES = \
 		LIBSAMBA-HOSTCONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
 		registry_common
 # End BINARY regtree
 ################################################
 
+regtree_OBJ_FILES = lib/registry/tools/regtree.o
+
 MANPAGES += lib/registry/man/regtree.1
 
 [SUBSYSTEM::torture_registry]
 PRIVATE_DEPENDENCIES = registry
 PRIVATE_PROTO_HEADER = tests/proto.h
-OBJ_FILES = \
-		tests/generic.o \
-		tests/hive.o \
-		tests/diff.o \
-		tests/registry.o
+
+torture_registry_OBJ_FILES = $(addprefix lib/registry/tests/, generic.o hive.o diff.o registry.o)
 
 [PYTHON::swig_registry]
 PUBLIC_DEPENDENCIES = registry
 SWIG_FILE = registry.i
 
+swig_registry_OBJ_FILES = lib/registry/registry_wrap.o
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 6cbfa16045..9eb3cfa653 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -1,34 +1,24 @@
 # server subsystem
 
-################################################
-# Start MODULE service_auth
-[MODULE::service_auth]
-INIT_FUNCTION = server_service_auth_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-		auth
-# End MODULE server_auth
-################################################
-
 [SUBSYSTEM::service]
 PRIVATE_PROTO_HEADER = service_proto.h
-OBJ_FILES = \
-		service.o \
-		service_stream.o \
-		service_task.o
 PRIVATE_DEPENDENCIES = \
 		MESSAGING samba-socket
 
+service_OBJ_FILES = $(addprefix smbd/, \
+		service.o \
+		service_stream.o \
+		service_task.o)
+
 [SUBSYSTEM::PIDFILE]
-OBJ_FILES = pidfile.o
 PRIVATE_PROTO_HEADER = pidfile.h
 
+PIDFILE_OBJ_FILES = smbd/pidfile.o
+
 #################################
 # Start BINARY smbd
 [BINARY::smbd]
 INSTALLDIR = SBINDIR
-OBJ_FILES = \
-		server.o
 PRIVATE_DEPENDENCIES = \
 		process_model \
 		service \
author	Jelmer Vernooij <jelmer@samba.org>	2008-04-14 16:53:00 +0200
committer	Jelmer Vernooij <jelmer@samba.org>	2008-04-14 16:53:00 +0200
commit	ffc5cbfe803326a1c3bf55684717af910d091c5a (patch)
tree	46e3b9f4a60971176b43f0a4c5cfc4ccc001dd14 /source4
parent	f800cf250f079ab1e1bc1051c34d1d1061187447 (diff)
download	samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.tar.gz samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.tar.bz2 samba-ffc5cbfe803326a1c3bf55684717af910d091c5a.zip