svn commit: samba r7764 - in branches/SAMBA_4_0/source/build/smb_build: .

jelmer at samba.org jelmer at samba.org
Sun Jun 19 22:34:29 GMT 2005


Author: jelmer
Date: 2005-06-19 22:34:28 +0000 (Sun, 19 Jun 2005)
New Revision: 7764

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7764

Log:
Generate _ALL_OBJS list.

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-06-19 22:29:40 UTC (rev 7763)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-06-19 22:34:28 UTC (rev 7764)
@@ -513,7 +513,7 @@
 	@[ -f $(builddir)/include/proto.h ] || $(MAKE) proto
 
 clean: delheaders
-	-rm -f *.o */*.o */*/*.o */*/*/*.o bin/* bin/.SUBSYSTEM_* bin/.MODULE_*
+	-rm -f *.o */*.o */*/*.o */*/*/*.o bin/* bin/.*_*
 	-rm -rf librpc/gen_*
 
 distclean: clean

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2005-06-19 22:29:40 UTC (rev 7763)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2005-06-19 22:34:28 UTC (rev 7764)
@@ -70,6 +70,10 @@
 	$depend->{PROTO}{TYPE} = "PROTO";
 	$depend->{PROTO}{NAME} = "PROTO";
 
+	$depend->{ALL_OBJS}{OUTPUT_TYPE} = "OBJLIST";
+	$depend->{ALL_OBJS}{TYPE} = "";
+	$depend->{ALL_OBJS}{NAME} = "ALL_OBJS";
+
 	foreach $part (values %{$depend}) {
 		next if not defined($part->{OUTPUT_TYPE});
 
@@ -83,6 +87,7 @@
 		push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES});
 		push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES});
 
+		push(@{$depend->{ALL_OBJS}{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if (defined(@{$part->{OBJ_LIST}}));
 		push(@{$depend->{PROTO}{OBJ_LIST}}, @{$part->{OBJ_LIST}}) if ((not defined ($part->{NOPROTO}) or $part->{NOPROTO} eq "NO") and defined(@{$part->{OBJ_LIST}}));
 	}
 



More information about the samba-cvs mailing list