svn commit: samba r8994 - in branches/SAMBA_4_0/source:
build/smb_build heimdal_build
jelmer at samba.org
jelmer at samba.org
Wed Aug 3 06:43:06 GMT 2005
Author: jelmer
Date: 2005-08-03 06:43:06 +0000 (Wed, 03 Aug 2005)
New Revision: 8994
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8994
Log:
Clean up some more autogenerated files so I can predict when I'm going to
break the build...
Modified:
branches/SAMBA_4_0/source/build/smb_build/makefile.pm
branches/SAMBA_4_0/source/heimdal_build/et_deps.pl
Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-08-03 06:28:18 UTC (rev 8993)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2005-08-03 06:43:06 UTC (rev 8994)
@@ -248,11 +248,10 @@
my ($var,$ctx) = @_;
my $tmplist = array2oneperline($ctx->{OBJ_LIST});
+ return "" if ($tmplist eq "");
return << "__EOD__";
-# $var $ctx->{NAME} OBJ LIST
$var\_$ctx->{NAME}_OBJS =$tmplist
-
__EOD__
}
@@ -261,6 +260,7 @@
my ($var,$ctx) = @_;
my $tmplist = array2oneperline($ctx->{CFLAGS});
+ return "" if ($tmplist eq "");
return << "__EOD__";
$var\_$ctx->{NAME}_CFLAGS =$tmplist
@@ -298,7 +298,6 @@
$output = << "__EOD__";
LIBRARY_$ctx->{NAME}_DEPEND_LIST =$tmpdepend
-#
LIBRARY_$ctx->{NAME}_SHARED_LINK_LIST =$tmpshlink
LIBRARY_$ctx->{NAME}_SHARED_LINK_FLAGS =$tmpshflag
#
@@ -502,9 +501,13 @@
@echo Removing generated files
@-rm -rf librpc/gen_*
@echo Removing generated ASN1 files
- @-find heimdal/lib/asn1 -name 'asn1_*.[xc]' -exec rm -f '{}' \;
- @-find heimdal/lib/gssapi -name 'asn1_*.[xc]' -exec rm -f '{}' \;
- @-find heimdal/lib/hdb -name 'asn1_*.[xc]' -exec rm -f '{}' \;
+ @-find heimdal/lib/asn1 -name 'asn1_*.[c]' -exec rm -f '{}' \;
+ @-find heimdal/lib/gssapi -name 'asn1_*.[c]' -exec rm -f '{}' \;
+ @-find heimdal/lib/hdb -name 'asn1_*.[c]' -exec rm -f '{}' \;
+ @-rm -f heimdal/lib/roken/vis.h heimdal/lib/roken/err.h
+ @-rm -f heimdal/lib/hdb/hdb_asn1.h
+ @-rm -f heimdal/lib/gssapi/spnego_asn1.h
+ @-rm -f heimdal/lib/asn1/krb5_asn1.h
distclean: clean
Modified: branches/SAMBA_4_0/source/heimdal_build/et_deps.pl
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2005-08-03 06:28:18 UTC (rev 8993)
+++ branches/SAMBA_4_0/source/heimdal_build/et_deps.pl 2005-08-03 06:43:06 UTC (rev 8994)
@@ -9,6 +9,7 @@
my $header = $file; $header =~ s/\.et$/.h/;
my $source = $file; $source =~ s/\.et$/.c/;
print "$source: $file bin/compile_et\n";
+print "\t\@echo \"Compiling error table $file\"\n";
print "\t\@cd $dirname && ../../../bin/compile_et $basename\n\n";
print "$header: $source\n";
More information about the samba-cvs
mailing list