Fix unresolved symbols.

(This used to be commit 8573e828d1b68c47b3c1754e9be230b2e78d9d52)

2 files changed, 15 insertions, 18 deletions

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;