Fix the build.

(This used to be commit 49ef8d0c197fa61dc5c524e4a0f569af72d3c0e9)

9 files changed, 21 insertions, 43 deletions

diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 0bbff5b09a..c738c83bf4 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -36,7 +36,7 @@ auth_sam_reply_OBJ_FILES = $(addprefix auth/, auth_sam_reply.o)
 [MODULE::auth_sam_module]
 # gensec_krb5 and gensec_gssapi depend on it
 INIT_FUNCTION = auth_sam_init
-SUBSYSTEM = auth
+SUBSYSTEM = service_auth
 PRIVATE_DEPENDENCIES = \
 		SAMDB auth_sam
 # End MODULE auth_sam
@@ -48,7 +48,7 @@ auth_sam_module_OBJ_FILES = $(addprefix auth/, auth_sam.o)
 # Start MODULE auth_anonymous
 [MODULE::auth_anonymous]
 INIT_FUNCTION = auth_anonymous_init
-SUBSYSTEM = auth
+SUBSYSTEM = service_auth
 # End MODULE auth_anonymous
 #######################
 
@@ -58,7 +58,7 @@ auth_anonymous_OBJ_FILES = $(addprefix auth/, auth_anonymous.o)
 # Start MODULE auth_winbind
 [MODULE::auth_winbind]
 INIT_FUNCTION = auth_winbind_init
-SUBSYSTEM = auth
+SUBSYSTEM = service_auth
 PRIVATE_DEPENDENCIES = NDR_WINBIND MESSAGING LIBWINBIND-CLIENT
 # End MODULE auth_winbind
 #######################
@@ -69,7 +69,7 @@ auth_winbind_OBJ_FILES = $(addprefix auth/, auth_winbind.o)
 # Start MODULE auth_developer
 [MODULE::auth_developer]
 INIT_FUNCTION = auth_developer_init
-SUBSYSTEM = auth
+SUBSYSTEM = service_auth
 # End MODULE auth_developer
 #######################
 
@@ -77,7 +77,7 @@ auth_developer_OBJ_FILES = $(addprefix auth/, auth_developer.o)
 
 [MODULE::auth_unix]
 INIT_FUNCTION = auth_unix_init
-SUBSYSTEM = auth
+SUBSYSTEM = service_auth
 PRIVATE_DEPENDENCIES = CRYPT PAM PAM_ERRORS NSS_WRAPPER
 
 auth_unix_OBJ_FILES = $(addprefix auth/, auth_unix.o)
@@ -87,18 +87,13 @@ PRIVATE_PROTO_HEADER = pam_errors.h
 
 PAM_ERRORS_OBJ_FILES = $(addprefix auth/, pam_errors.o)
 
-#######################
-# Start SUBSYSTEM auth
-[SUBSYSTEM::auth]
-#VERSION = 0.0.1
-#SO_VERSION = 0
+[MODULE::service_auth]
+INIT_FUNCTION = server_service_auth_init
+SUBSYSTEM = service
 PRIVATE_PROTO_HEADER = auth_proto.h
-PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB CREDENTIALS
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL
-# End SUBSYSTEM auth
-#######################
+PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL LIBSECURITY SAMDB CREDENTIALS 
 
-auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
+service_auth_OBJ_FILES = $(addprefix auth/, auth.o auth_util.o auth_simple.o)
 
 PUBLIC_HEADERS += auth/auth.h
 
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 660c2353af..2ab6437643 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -20,7 +20,7 @@ PUBLIC_HEADERS += $(addprefix auth/gensec/, gensec.h spnego.h)
 [MODULE::gensec_krb5]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_krb5_init
-PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
+PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS service_auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm
index 66a0bc723e..ba2f937db8 100644
--- a/source4/build/smb_build/input.pm
+++ b/source4/build/smb_build/input.pm
@@ -107,7 +107,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});
 	}
 }
 
diff --git a/source4/cldap_server/config.mk b/source4/cldap_server/config.mk
index 8195f24543..c10cf57b5b 100644
--- a/source4/cldap_server/config.mk
+++ b/source4/cldap_server/config.mk
@@ -11,7 +11,7 @@ PRIVATE_DEPENDENCIES = \
 # End SUBSYSTEM CLDAPD
 #######################
 
-CLAPD_OBJ_FILES = $(addprefix cldap_server, \
+CLDAPD_OBJ_FILES = $(addprefix cldap_server/, \
 		cldap_server.o \
 		netlogon.o \
 		rootdse.o)
diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index f5ee2c54ea..a2fbb5e3d0 100755
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -87,13 +87,14 @@ my $depstr = join(' ', @deps);
 
 print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'."\n";
 print "CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n";
-print "\nPUBLIC_DEPENDENCIES = $depstr\n\n";
+print "PUBLIC_DEPENDENCIES = $depstr\n\n";
 
-print "HEIMDAL_".uc($prefix)."_OBJ_FILES = \$(addprefix heimdal/,";
+print "HEIMDAL_".uc($prefix)."_OBJ_FILES = ";
 foreach $o_file (@o_files) {
     print "\\\n\t$o_file";
 }
-print "\t)\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 84dd218a41..d3d87f7a70 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -570,14 +570,6 @@ PUBLIC_DEPENDENCIES = \
 HEIMDAL_OBJ_FILES = ./heimdal/lib/vers/print_version.o
 
 #######################
-# Start SUBSYSTEM KERBEROS_LIB
-[SUBSYSTEM::KERBEROS_LIB]
-#PUBLIC_DEPENDENCIES = EXT_KRB5
-PUBLIC_DEPENDENCIES = HEIMDAL
-# End SUBSYSTEM KERBEROS_LIB
-#######################
-
-#######################
 # Start BINARY compile_et
 [BINARY::samba4kinit]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/roken
@@ -585,7 +577,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_KRB5 HEIMDAL_NTLM
 # End BINARY compile_et
 #######################
 
-samba4_kinit_OBJ_FILES = ./heimdal/kuser/kinit.o \
+samba4kinit_OBJ_FILES = ./heimdal/kuser/kinit.o \
 	./heimdal/lib/vers/print_version.o \
 	./heimdal/lib/roken/setprogname.o \
 	./heimdal/lib/roken/getarg.o 
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 3770b8f298..94ba933e57 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -6,7 +6,7 @@
 INIT_FUNCTION = server_service_kdc_init
 SUBSYSTEM = service
 PRIVATE_DEPENDENCIES = \
-		LIBLDB KERBEROS_LIB HEIMDAL_KDC HEIMDAL_HDB SAMDB
+		LIBLDB HEIMDAL HEIMDAL_KDC HEIMDAL_HDB SAMDB
 # End SUBSYSTEM KDC
 #######################
 
@@ -18,7 +18,7 @@ KDC_OBJ_FILES = $(addprefix kdc/, kdc.o kpasswdd.o)
 CFLAGS = -Iheimdal/kdc -Iheimdal/lib/hdb
 PRIVATE_PROTO_HEADER = pac_glue.h
 PRIVATE_DEPENDENCIES = \
-		LIBLDB auth_sam auth_sam_reply KERBEROS CREDENTIALS \
+		LIBLDB auth_sam auth_sam_reply HEIMDAL CREDENTIALS \
 		HEIMDAL_HDB_ASN1
 # End SUBSYSTEM KDC
 #######################
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 708ff50a45..288ba60f13 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -108,7 +108,7 @@ PUBLIC_HEADERS += librpc/gen_ndr/lsa.h
 [SUBSYSTEM::NDR_DFS]
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
-NDR_DFS_OJB_LIST = librpc/gen_ndr/ndr_dfs.o
+NDR_DFS_OBJ_FILES = librpc/gen_ndr/ndr_dfs.o
 
 [SUBSYSTEM::NDR_FRSRPC]
 PUBLIC_DEPENDENCIES = LIBNDR
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 1ef244bb59..dc8afeba78 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -1,15 +1,5 @@
 # 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
 PRIVATE_DEPENDENCIES = \