From 6e847ca070aa1b15eb24966f8b9803e1982f2a83 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 26 Apr 2006 14:15:14 +0000 Subject: r15279: Fix dependencies when using static libraries (This used to be commit a9eb7b2b3cf46d19ab7dfab521e1259d653507f6) --- source4/build/smb_build/TODO | 2 ++ source4/build/smb_build/input.pm | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'source4/build/smb_build') diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO index 2c4a913828..3ded826539 100644 --- a/source4/build/smb_build/TODO +++ b/source4/build/smb_build/TODO @@ -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? diff --git a/source4/build/smb_build/input.pm b/source4/build/smb_build/input.pm index c153e0c95d..bb664f8635 100644 --- a/source4/build/smb_build/input.pm +++ b/source4/build/smb_build/input.pm @@ -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) { -- cgit