diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 21:46:44 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:07 -0500 |
| commit | b00c2369069c41880598ff430776cc26e8f7b916 (patch) | |
| tree | fe483e7721681d6f5ffc0271a15366a615e260c9 /source4/build/smb_build/output.pm | |
| parent | ab8fd44603c6ac140e6d0c29fd6a1a1065f616a3 (diff) | |
| download | samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.gz samba-b00c2369069c41880598ff430776cc26e8f7b916.tar.bz2 samba-b00c2369069c41880598ff430776cc26e8f7b916.zip | |
r15301: Use static libraries internally. This required a few hacks in the build
system - these should be removed later on.
(This used to be commit 06547391669e064d2b92f5841b7df5f101a34cb9)
Diffstat (limited to 'source4/build/smb_build/output.pm')
| -rw-r--r-- | source4/build/smb_build/output.pm | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index ba8359a72b..0f66ef91fe 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -26,21 +26,6 @@ sub add_dir($$) return @ret; } -sub generate_mergedobj($) -{ - my $subsys = shift; - - $subsys->{OUTPUT} = $subsys->{TARGET} = "bin/subsystems/$subsys->{TYPE}_$subsys->{NAME}.o"; -} - -sub generate_objlist($) -{ - my $subsys = shift; - - $subsys->{TARGET} = "bin/.$subsys->{TYPE}_$subsys->{NAME}"; - $subsys->{OUTPUT} = "\$($subsys->{TYPE}_$subsys->{NAME}_OBJ_LIST)"; -} - sub generate_shared_library($) { my $lib = shift; @@ -129,15 +114,7 @@ sub create_output($$) # Combine object lists push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{OBJ_FILES})) if defined($part->{OBJ_FILES}); - if ((not defined($part->{OBJ_LIST}) or - scalar(@{$part->{OBJ_LIST}}) == 0) and - $part->{OUTPUT_TYPE} eq "MERGEDOBJ") { - $part->{OUTPUT_TYPE} = "OBJLIST"; - } - generate_binary($part) if $part->{OUTPUT_TYPE} eq "BINARY"; - generate_mergedobj($part) if $part->{OUTPUT_TYPE} eq "MERGEDOBJ"; - generate_objlist($part) if $part->{OUTPUT_TYPE} eq "OBJLIST"; generate_shared_library($part) if $part->{OUTPUT_TYPE} eq "SHARED_LIBRARY"; generate_static_library($part) if $part->{OUTPUT_TYPE} eq "STATIC_LIBRARY"; |