r15279: Fix dependencies when using static libraries

[samba.git] / source / build / smb_build / input.pm

diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index f83e04f0c4897829c3db29d6ac93ee93c92f6c3e..bb664f863545c5454ff5b87eac6a916b2cf37f8a 100644 (file)
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -74,8 +74,10 @@ sub check_module($$$)
 
        if ($mod->{OUTPUT_TYPE} eq "SHARED_LIBRARY") {
                $mod->{INSTALLDIR} = "MODULESDIR/$mod->{SUBSYSTEM}";
+               push (@{$mod->{PRIVATE_DEPENDENCIES}}, $mod->{SUBSYSTEM}) unless 
+                       $INPUT->{$mod->{SUBSYSTEM}}->{TYPE} eq "BINARY";
        } else {
-               push (@{$INPUT->{$mod->{SUBSYSTEM}}{REQUIRED_SUBSYSTEMS}}, $mod->{NAME});
+               push (@{$INPUT->{$mod->{SUBSYSTEM}}{PRIVATE_DEPENDENCIES}}, $mod->{NAME});
                push (@{$INPUT->{$mod->{SUBSYSTEM}}{INIT_FUNCTIONS}}, $mod->{INIT_FUNCTION}) if defined($mod->{INIT_FUNCTION});
        }
 }
@@ -118,23 +120,24 @@ sub check_binary($$)
 
 my $level = "";
 
-sub calc_unique_deps($$$)
+sub calc_unique_deps($$$$)
 {
-       sub calc_unique_deps($$$);
-       my ($name, $deps, $udeps) = @_;
+       sub calc_unique_deps($$$$);
+       my ($name, $deps, $udeps, $withlibs) = @_;
 
        print "$level-> $name\n" if ($ENV{SMB_BUILD_VERBOSE});
        $level.=" ";
 
        foreach my $dep (@{$deps}) {
-               if (not defined($udeps->{$$dep->{NAME}})) {
-                  if (defined ($$dep->{OUTPUT_TYPE}) && (($$dep->{OUTPUT_TYPE} eq "OBJ_LIST")
-                           or ($$dep->{OUTPUT_TYPE} eq "MERGEDOBJ"))) {
+               next if defined($udeps->{$$dep->{NAME}});
+
+               if (defined ($$dep->{OUTPUT_TYPE}) && 
+                       ($withlibs or ($$dep->{OUTPUT_TYPE} eq "OBJ_LIST") or ($$dep->{OUTPUT_TYPE} eq "MERGEDOBJ") or ($$dep->{OUTPUT_TYPE} eq "STATIC_LIBRARY"))) {
                                $udeps->{$$dep->{NAME}} = "BUSY";
-                               calc_unique_deps($$dep->{NAME}, $$dep->{DEPENDENCIES}, $udeps);
-                       }
-                       $udeps->{$$dep->{NAME}} = $$dep;
-               }
+                               calc_unique_deps($$dep->{NAME}, $$dep->{DEPENDENCIES}, $udeps, $withlibs);
+               }
+
+               $udeps->{$$dep->{NAME}} = $$dep;
        }
        
        $level = substr($level, 1);
@@ -145,18 +148,6 @@ sub check($$$$$)
        my ($INPUT, $enabled, $subsys_ot, $lib_ot, $module_ot) = @_;
 
        foreach my $part (values %$INPUT) {
-               unless(defined($part->{NOPROTO})) {
-                       if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") {
-                               $part->{NOPROTO} = "YES";
-                       } else {
-                               $part->{NOPROTO} = "NO";
-                       }
-               }
-
-               if (defined($part->{PRIVATE_PROTO_HEADER})) {
-                       $part->{NOPROTO} = "YES";
-               }
-
                unless (defined($part->{STANDARD_VISIBILITY})) {
                        if ($part->{TYPE} eq "MODULE" or $part->{TYPE} eq "BINARY") {
                                $part->{STANDARD_VISIBILITY} = "hidden";
@@ -165,12 +156,15 @@ sub check($$$$$)
                        }
                }
 
-               unless (defined($part->{EXTRA_CFLAGS})) {
-                       $part->{EXTRA_CFLAGS} = "";
+               unless (defined($part->{CFLAGS})) {
+                       $part->{CFLAGS} = "";
+               }
+
+               unless (defined($part->{PUBLIC_HEADERS})) {
+                       $part->{PUBLIC_HEADERS} = [];
                }
                
                if (defined($part->{PUBLIC_PROTO_HEADER})) {
-                       $part->{NOPROTO} = "YES";
                        push (@{$part->{PUBLIC_HEADERS}}, $part->{PUBLIC_PROTO_HEADER});
                }
 
@@ -204,17 +198,21 @@ sub check($$$$$)
                # Generate list of dependencies
                $part->{DEPENDENCIES} = [];
 
-               foreach my $key (@{$part->{REQUIRED_SUBSYSTEMS}}) {
+               foreach my $key (@{$part->{PUBLIC_DEPENDENCIES}},
+                                @{$part->{PRIVATE_DEPENDENCIES}}) {
                        die("$part->{NAME} has undefined dependency $key\n") if not defined($depend{$key});
                        push (@{$part->{DEPENDENCIES}}, \$depend{$key});
                }
-
-               delete ($part->{REQUIRED_SUBSYSTEMS});
        }
 
        foreach my $part (values %depend) {
                $part->{UNIQUE_DEPENDENCIES} = {};
-               calc_unique_deps($part->{NAME}, $part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES});
+               calc_unique_deps($part->{NAME}, $part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES}, 0);
+       }
+
+       foreach my $part (values %depend) {
+               $part->{UNIQUE_DEPENDENCIES_ALL} = {};
+               calc_unique_deps($part->{NAME}, $part->{DEPENDENCIES}, $part->{UNIQUE_DEPENDENCIES_ALL}, 1);
        }
 
        return \%depend;