Fix unresolved symbols.

(This used to be commit 8573e828d1b68c47b3c1754e9be230b2e78d9d52)

7 files changed, 32 insertions, 35 deletions

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 8f1aa9f84d..7cb673c9d2 100644
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -19,7 +19,7 @@ PUBLIC_HEADERS += auth/gensec/gensec.h
 [MODULE::gensec_krb5]
 SUBSYSTEM = gensec
 INIT_FUNCTION = gensec_krb5_init
-PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS service_auth auth_sam
+PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 76a11f0a38..01bf565774 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -4,8 +4,6 @@ dnl Copyright (C) 2004 Stefan Metzmacher
 dnl Copyright (C) 2004-2005 Jelmer Vernooij
 dnl Published under the GPL
 dnl
-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
 dnl SMB_EXT_LIB(name,libs,cflags,cppflags,ldflags)
@@ -18,12 +16,13 @@ dnl #######################################################
 dnl ### And now the implementation			###
 dnl #######################################################
 
-dnl SMB_SUBSYSTEM(name,required_subsystems,cflags)
+dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems,cflags)
 AC_DEFUN([SMB_SUBSYSTEM],
 [
 MAKE_SETTINGS="$MAKE_SETTINGS
 $1_CFLAGS = $4
 $1_ENABLE = YES
+$1_OBJ_FILES = $2
 "
 
 SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
@@ -38,13 +37,14 @@ ENABLE = YES
 "
 ])
 
-dnl SMB_LIBRARY(name,required_subsystems,version,so_version,cflags,ldflags)
+dnl SMB_LIBRARY(name,obj_files,required_subsystems,version,so_version,cflags,ldflags)
 AC_DEFUN([SMB_LIBRARY],
 [
 MAKE_SETTINGS="$MAKE_SETTINGS
 $1_CFLAGS = $6
 $1_LDFLAGS = $7
 $1_ENABLE = YES
+$1_OBJ_FILES = $2
 "
 
 SMB_INFO_LIBRARIES="$SMB_INFO_LIBRARIES
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 7728bc4f8d..9ce04ca8d4 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -263,10 +263,10 @@ sub MergedObj($$)
 	$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
 	$self->output(<< "__EOD__"
 #
-$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_LIST)
+$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_OBJ_FILES)
 	\@echo Partially linking \$@
 	\@mkdir -p \$(\@D)
-	\$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_LIST)
+	\$(PARTLINK) -o \$@ \$($ctx->{NAME}_OBJ_FILES)
 
 __EOD__
 );
@@ -276,8 +276,6 @@ sub StaticLibrary($$)
 {
 	my ($self,$ctx) = @_;
 
-	return unless (defined($ctx->{OBJ_FILES}));
-
 	$self->output("STATIC_LIBS += $ctx->{TARGET_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY");
 
 	$self->output("$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)\n");
@@ -338,13 +336,13 @@ sub ProtoHeader($$)
 {
 	my ($self,$ctx) = @_;
 
-	my $priv = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
+	my $priv = "$ctx->{BASEDIR}/$ctx->{PRIVATE_PROTO_HEADER}";
 	$self->output("PROTO_HEADERS += $priv\n");
 
-	$self->output("$priv: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");
+	$self->output("$priv: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_FILES:.o=.c) \$(srcdir)/script/mkproto.pl\n");
 	$self->output("\t\@echo \"Creating \$@\"\n");
 	$self->output("\t\@mkdir -p \$(\@D)\n");
-	$self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --srcdir=\$(srcdir) --builddir=\$(builddir) --public=/dev/null --private=\$@ \$($ctx->{NAME}_OBJ_LIST)\n\n");
+	$self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --srcdir=\$(srcdir) --builddir=\$(builddir) --public=/dev/null --private=\$@ \$($ctx->{NAME}_OBJ_FILES)\n\n");
 }
 
 sub write($$)
@@ -382,7 +380,6 @@ sub CFlags($$)
 
 	my $src_ne_build = ($srcdir ne $builddir) ? 1 : 0;
 
-	return unless defined ($key->{OBJ_LIST});
 	return unless defined ($key->{FINAL_CFLAGS});
 	return unless (@{$key->{FINAL_CFLAGS}} > 0);
 
@@ -396,19 +393,19 @@ sub CFlags($$)
 	my @cflags = ();
 	foreach my $flag (@sorted_cflags) {
 		if($src_ne_build) {
-				if($flag =~ m#^-I([^/].*$)#) {
-					my $dir = $1;
-					$dir =~ s#^\$\((?:src|build)dir\)/?##;
+			if($flag =~ m#^-I([^/].*$)#) {
+				my $dir = $1;
+				$dir =~ s#^\$\((?:src|build)dir\)/?##;
 				push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
-					next;
-				}
+				next;
+			}
 		}
 		push(@cflags, $flag);
 	}
 	
 	my $cflags = join(' ', @cflags);
 
-	$self->output("\$(patsubst %.ho,%.d,\$($key->{NAME}_OBJ_LIST:.o=.d)) \$($key->{NAME}_OBJ_LIST): CFLAGS+= $cflags\n");
+	$self->output("\$(patsubst %.ho,%.d,\$($key->{NAME}_OBJ_FILES:.o=.d)) \$($key->{NAME}_OBJ_FILES): CFLAGS+= $cflags\n");
 }
 
 1;
diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk
index dd1c8b10db..414b449ba8 100644
--- a/source4/dsdb/samdb/ldb_modules/config.mk
+++ b/source4/dsdb/samdb/ldb_modules/config.mk
@@ -22,7 +22,7 @@ INIT_FUNCTION = repl_meta_data_module_module_ops
 ################################################
 
 ldb_repl_meta_data_OBJ_FILES = \
-		repl_meta_data.o
+		dsdb/samdb/ldb_modules/repl_meta_data.o
 
 ################################################
 # Start MODULE ldb_dsdb_cache
@@ -35,7 +35,7 @@ INIT_FUNCTION = dsdb_cache_module_module_ops
 ################################################
 
 ldb_dsdb_cache_OBJ_FILES = \
-		dsdb_cache.o
+		dsdb/samdb/ldb_modules/dsdb_cache.o
 
 ################################################
 # Start MODULE ldb_schema_fsmo
@@ -48,7 +48,7 @@ INIT_FUNCTION = schema_fsmo_module_module_ops
 ################################################
 
 ldb_schema_fsmo_OBJ_FILES = \
-		schema_fsmo.o
+		dsdb/samdb/ldb_modules/schema_fsmo.o
 
 ################################################
 # Start MODULE ldb_naming_fsmo
@@ -61,7 +61,7 @@ INIT_FUNCTION = naming_fsmo_module_module_ops
 ################################################
 
 ldb_naming_fsmo_OBJ_FILES = \
-		naming_fsmo.o
+		dsdb/samdb/ldb_modules/naming_fsmo.o
 
 ################################################
 # Start MODULE ldb_pdc_fsmo
@@ -74,7 +74,7 @@ INIT_FUNCTION = pdc_fsmo_module_module_ops
 ################################################
 
 ldb_pdc_fsmo_OBJ_FILES = \
-		pdc_fsmo.o
+		dsdb/samdb/ldb_modules/pdc_fsmo.o
 
 ################################################
 # Start MODULE ldb_samldb
@@ -88,7 +88,7 @@ INIT_FUNCTION = samldb_module_module_ops
 ################################################
 
 ldb_samldb_OBJ_FILES = \
-		samldb.o
+		dsdb/samdb/ldb_modules/samldb.o
 
 ################################################
 # Start MODULE ldb_samba3sam
@@ -103,7 +103,7 @@ PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER LIBSECURITY \
 ################################################
 
 ldb_samba3sam_OBJ_FILES = \
-		samba3sam.o
+		dsdb/samdb/ldb_modules/samba3sam.o
 
 ################################################
 # Start MODULE ldb_simple_ldap_map
@@ -119,7 +119,7 @@ ALIASES = entryuuid nsuniqueid
 ################################################
 
 ldb_simple_ldap_map_OBJ_FILES = \
-		simple_ldap_map.o
+		dsdb/samdb/ldb_modules/simple_ldap_map.o
 
 # ################################################
 # # Start MODULE ldb_proxy
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index a3ed5239bf..cadd71673c 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -58,7 +58,7 @@ smbcalls_data_OBJ_FILES = scripting/ejs/smbcalls_data.o
 OUTPUT_TYPE = MERGED_OBJ
 SUBSYSTEM = smbcalls
 INIT_FUNCTION = smb_setup_ejs_auth
-PRIVATE_DEPENDENCIES = service_auth
+PRIVATE_DEPENDENCIES = auth
 
 smbcalls_auth_OBJ_FILES = scripting/ejs/smbcalls_auth.o
 
diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk
index cb03bfaeea..2f010644b1 100644
--- a/source4/scripting/python/config.mk
+++ b/source4/scripting/python/config.mk
@@ -1,23 +1,25 @@
 [BINARY::smbpython]
 PRIVATE_DEPENDENCIES = LIBPYTHON
 
-smbpython_OBJ_FILES = smbpython.o
+smbpython_OBJ_FILES = scripting/python/smbpython.o
 
 [SUBSYSTEM::LIBPYTHON]
 PUBLIC_DEPENDENCIES = EXT_LIB_PYTHON
 INIT_FUNCTION_SENTINEL = { NULL, NULL }
 
-LIBPYTHON_OBJ_FILES = modules.o pytalloc.o
+LIBPYTHON_OBJ_FILES = $(addprefix scripting/python/, modules.o pytalloc.o)
 
 [PYTHON::python_uuid]
 PRIVATE_DEPENDENCIES = LIBNDR 
 
-python_uuid_OBJ_FILES = uuidmodule.o
+python_uuid_OBJ_FILES = scripting/python/uuidmodule.o
 
 [PYTHON::python_misc]
 PRIVATE_DEPENDENCIES = LIBNDR LIBLDB SAMDB CREDENTIALS
 SWIG_FILE = misc.i
 
+python_misc_OBJ_FILES = scripting/python/misc_wrap.o
+
 PYDOCTOR_MODULES=bin/python/ldb.py bin/python/auth.py bin/python/credentials.py bin/python/registry.py bin/python/tdb.py bin/python/security.py bin/python/events.py bin/python/net.py
 
 pythonmods:: $(PYTHON_PYS) $(PYTHON_MODS)
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index e15d20d9cd..dc2b1c5c5e 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -11,9 +11,7 @@ PUBLIC_DEPENDENCIES = \
 		LIBPOPT
 
 
-torture_OBJ_FILES = \
-		torture.o \
-		ui.o
+torture_OBJ_FILES = $(addprefix torture/, torture.o ui.o)
 
 PUBLIC_HEADERS += torture/torture.h torture/ui.h
 
@@ -21,7 +19,7 @@ PUBLIC_HEADERS += torture/torture.h torture/ui.h
 PRIVATE_DEPENDENCIES = LIBCLI_RAW LIBPYTHON smbcalls PROVISION
 PUBLIC_DEPENDENCIES = POPT_CREDENTIALS
 
-TORTURE_UTIL_OBJ_FILES = util_smb.o
+TORTURE_UTIL_OBJ_FILES = torture/util_smb.o
 
 #################################
 # Start SUBSYSTEM TORTURE_BASIC