svn commit: samba r15279 - in
branches/SAMBA_4_0/source/build/smb_build: .
jelmer at samba.org
jelmer at samba.org
Wed Apr 26 14:15:14 GMT 2006
Author: jelmer
Date: 2006-04-26 14:15:14 +0000 (Wed, 26 Apr 2006)
New Revision: 15279
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=15279
Log:
Fix dependencies when using static libraries
Modified:
branches/SAMBA_4_0/source/build/smb_build/TODO
branches/SAMBA_4_0/source/build/smb_build/input.pm
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO 2006-04-26 13:17:43 UTC (rev 15278)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO 2006-04-26 14:15:14 UTC (rev 15279)
@@ -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?
Modified: branches/SAMBA_4_0/source/build/smb_build/input.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-26 13:17:43 UTC (rev 15278)
+++ branches/SAMBA_4_0/source/build/smb_build/input.pm 2006-04-26 14:15:14 UTC (rev 15279)
@@ -132,7 +132,7 @@
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 @@
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) {
More information about the samba-cvs
mailing list