From 1ac5c35ed9bf5f557b8f42eee9c392af353430fe Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 23 Dec 2005 13:02:52 +0000 Subject: r12450: Move generation of proto and full object lists to makefile.pm. 'make' now handles expanding the protoheader object list, rather then the build system, which makes the makefile quite a bit shorter. (This used to be commit a4088ccc704f1338c040c53596ff606cc1651d03) --- source4/build/smb_build/output.pm | 22 ---------------------- 1 file changed, 22 deletions(-) (limited to 'source4/build/smb_build/output.pm') diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index d39ff62101..d3d0840350 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -97,23 +97,7 @@ sub create_output($) my $depend = shift; my $part; - $depend->{PROTO} = { - OUTPUT_TYPE => "OBJLIST", - TYPE => "PROTO", - NAME => "PROTO", - OBJ_LIST => [] - }; - - $depend->{ALL_OBJS} = { - OUTPUT_TYPE => "OBJLIST", - TYPE => "", - NAME => "ALL_OBJS", - OBJ_LIST => [] - }; - foreach $part (values %{$depend}) { - next if $part->{NAME} eq "PROTO"; - next if $part->{NAME} eq "ALL_OBJS"; next if not defined($part->{OUTPUT_TYPE}); # Combine object lists @@ -133,12 +117,6 @@ sub create_output($) generate_shared_library($part) if $part->{OUTPUT_TYPE} eq "SHARED_LIBRARY"; generate_static_library($part) if $part->{OUTPUT_TYPE} eq "STATIC_LIBRARY"; - - push(@{$depend->{ALL_OBJS}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}})); - - if ((not defined ($part->{NOPROTO})) or ($part->{NOPROTO} eq "NO")) { - push(@{$depend->{PROTO}->{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}})); - } } foreach $part (values %{$depend}) { -- cgit