Reorder the linking of objects into a binary.

[kai/samba.git] / source / build / smb_build / makefile.pm

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index c56fdbf8cca6f13d8dd235b5ecbf3b5374b0d60b..0ea31062f78b1bd6fc7ed4928fec2db7341f4e73 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -121,13 +121,13 @@ sub SharedModule($$)
        $sane_subsystem =~ s/^lib//;
        
        $self->output("PLUGINS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n");
-       $self->output("\$(eval \$(call shared_module_install_template,$sane_subsystem, $ctx->{LIBRARY_REALNAME}))\n");
+       $self->output("\$(eval \$(call shared_module_install_template,$sane_subsystem,$ctx->{LIBRARY_REALNAME}))\n");
 
        $self->_prepare_list($ctx, "FULL_OBJ_LIST");
        $self->_prepare_list($ctx, "DEPEND_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
-       if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/) {
+       if (defined($ctx->{INIT_FUNCTION}) and $ctx->{INIT_FUNCTION_TYPE} =~ /\(\*\)/ and not ($ctx->{INIT_FUNCTION} =~ /\(/)) {
                $self->output("\$($ctx->{NAME}_OBJ_FILES): CFLAGS+=-D$ctx->{INIT_FUNCTION}=init_module\n");
        }
 
@@ -176,14 +176,6 @@ sub MergedObj($$)
        $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n");
 }
 
-sub StaticLibraryPrimitives($$)
-{
-       my ($self,$ctx) = @_;
-
-       $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
-}
-
 sub InitFunctions($$)
 {
        my ($self, $ctx) = @_;
@@ -216,36 +208,20 @@ sub Binary($$)
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
        if (defined($ctx->{USE_HOSTCC}) && $ctx->{USE_HOSTCC} eq "YES") {
-$self->output("\$(call host_binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}_LINK_FLAGS))\n");
+$self->output("\$(call host_binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_FULL_OBJ_LIST) \$($ctx->{NAME}_DEPEND_LIST), \$($ctx->{NAME}_LINK_FLAGS))\n");
        } else {
-$self->output("\$(call binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST), \$($ctx->{NAME}_LINK_FLAGS))\n");
-       }
-}
-
-sub PythonFiles($$)
-{
-       my ($self,$ctx) = @_;
-
-       foreach (@{$ctx->{PYTHON_FILES}}) {
-               $self->output("\$(eval \$(call python_py_module_template," . basename($_) . ",\$(addprefix $ctx->{BASEDIR}/, $_)))\n");
+$self->output("\$(call binary_link_template, $ctx->{RESULT_BINARY}, \$($ctx->{NAME}_FULL_OBJ_LIST) \$($ctx->{NAME}_DEPEND_LIST), \$($ctx->{NAME}_LINK_FLAGS))\n");
        }
 }
 
-sub ProtoHeader($$)
-{
-       my ($self,$ctx) = @_;
-
-       my $target = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})";
-       $self->output("PROTO_HEADERS += $target\n");
-       $self->output("\$(call proto_header_template, $target, \$($ctx->{NAME}_OBJ_FILES:.o=.c))\n");
-}
-
 sub write($$)
 {
        my ($self, $file) = @_;
 
        $self->_prepare_mk_files();
 
+       $self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
+
        open(MAKEFILE,">$file") || die ("Can't open $file\n");
        print MAKEFILE $self->{output};
        close(MAKEFILE);
@@ -286,6 +262,10 @@ sub CFlags($$)
                if($src_ne_build) {
                        if($flag =~ m#^-I([^/].*$)#) {
                                my $dir = $1;
+                               if ($dir =~ /^\$\(/) {
+                                       push (@cflags, $flag);
+                                       next;
+                               }
                                $dir =~ s#^\$\((?:src|build)dir\)/?##;
                                push(@cflags, "-I$builddir/$dir", "-I$srcdir/$dir");
                                next;