Fix the build.

diff --git a/source/auth/config.mk b/source/auth/config.mk
index 0bbff5b09ae345b981ee561a3a3bc57216634923..c738c83bf4040783b75681360bf5abccd432e1b8 100644 (file)
--- a/source/auth/config.mk
+++ b/source/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/source/auth/gensec/config.mk b/source/auth/gensec/config.mk
index 660c2353af6c3c1b9dc3be143d0aec2c8a5818ba..2ab643764359c25cc3963b2986502e89a55fe877 100644 (file)
--- a/source/auth/gensec/config.mk
+++ b/source/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/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 66a0bc723e8b18d9c391525abde32b2e1b9219fa..ba2f937db84abd6dc952d360bb50b8f3a14d0569 100644 (file)
--- a/source/build/smb_build/input.pm
+++ b/source/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/source/cldap_server/config.mk b/source/cldap_server/config.mk
index 8195f245437b0f6a359faaa42d999fe0b9b728a0..c10cf57b5b2aaaf737aefd533b694b1efc85c62e 100644 (file)
--- a/source/cldap_server/config.mk
+++ b/source/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/source/heimdal_build/asn1_deps.pl b/source/heimdal_build/asn1_deps.pl
index f5ee2c54eae203e013f6d31bc7bd560329418d57..a2fbb5e3d0f3d62b5dbf6a7e3000c722ef6a54f6 100755 (executable)
--- a/source/heimdal_build/asn1_deps.pl
+++ b/source/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/source/heimdal_build/config.mk b/source/heimdal_build/config.mk
index 84dd218a4175896be13bff4c25aa33373a935117..d3d87f7a70f4ed28971131f711fde208430635f7 100644 (file)
--- a/source/heimdal_build/config.mk
+++ b/source/heimdal_build/config.mk
@@ -569,14 +569,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]
@@ -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/source/kdc/config.mk b/source/kdc/config.mk
index 3770b8f298308da85fbc2a2ae08668d4e4e40b5c..94ba933e573bbf1574ce0b7eff1f0200dbfa791a 100644 (file)
--- a/source/kdc/config.mk
+++ b/source/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/source/librpc/config.mk b/source/librpc/config.mk
index 708ff50a45957c72eae8ab7251fc39f0924bda3b..288ba60f137572e011b0ccd515b0129f328e2c3e 100644 (file)
--- a/source/librpc/config.mk
+++ b/source/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/source/smbd/config.mk b/source/smbd/config.mk
index 1ef244bb5967d79bd55da140d4b9becb576ab1d7..dc8afeba7833320fb36458132456e849989e265a 100644 (file)
--- a/source/smbd/config.mk
+++ b/source/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 = \