r15279: Fix dependencies when using static libraries
authorJelmer Vernooij <jelmer@samba.org>
Wed, 26 Apr 2006 14:15:14 +0000 (14:15 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:05:01 +0000 (14:05 -0500)
source/build/smb_build/TODO
source/build/smb_build/input.pm

index 2c4a913828a286c5e5bbef71b4c1cc167bbfc1da..3ded8265396e8fd562d76d72ae05846af980898f 100644 (file)
@@ -1,4 +1,6 @@
 - let the build system implement some make functions($(patsubst),$(wildcard),...) and use our own implementations where `make' does not support them
+- change default subsystem/library build type to STATIC_LIBRARY
+ - fix order of UNIQUE_DEPENDENCIES
 - make --enable-dso the default
  - fix module loading for selftest during non-developer builds
 - clearer distinction between dcerpc and ndr. seperate interface tables?
index c153e0c95d327c36f8af145ec3b9455f8ab497c7..bb664f863545c5454ff5b87eac6a916b2cf37f8a 100644 (file)
@@ -132,7 +132,7 @@ sub calc_unique_deps($$$$)
                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"))) {
+                       ($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, $withlibs);
                }
@@ -203,9 +203,6 @@ sub check($$$$$)
                        die("$part->{NAME} has undefined dependency $key\n") if not defined($depend{$key});
                        push (@{$part->{DEPENDENCIES}}, \$depend{$key});
                }
-
-#              delete ($part->{PRIVATE_DEPENDENCIES});
-#              delete ($part->{PUBLIC_DEPENDENCIES});
        }
 
        foreach my $part (values %depend) {