From 9c913ef5925c968d17e8656177cfce58cbace00d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 3 Aug 2005 06:43:06 +0000
Subject: r8994: Clean up some more autogenerated files so I can predict when
 I'm going to break the build... (This used to be commit
 1f31414f372bf930db0a65531e85ab5cb9a34723)

---
 source4/build/smb_build/makefile.pm | 15 +++++++++------
 source4/heimdal_build/et_deps.pl    |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'source4')

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 77c6d07a5d..70afa29955 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -248,11 +248,10 @@ sub _prepare_obj_list($$)
 	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 @@ sub _prepare_cflags($$)
 	my ($var,$ctx) = @_;
 
 	my $tmplist = array2oneperline($ctx->{CFLAGS});
+	return "" if ($tmplist eq "");
 
 	return << "__EOD__";
 $var\_$ctx->{NAME}_CFLAGS =$tmplist
@@ -298,7 +298,6 @@ sub _prepare_shared_library_rule($)
 
 	$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 @@ clean: delheaders
 	@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
diff --git a/source4/heimdal_build/et_deps.pl b/source4/heimdal_build/et_deps.pl
index d7be6074fe..fef0618b58 100755
--- a/source4/heimdal_build/et_deps.pl
+++ b/source4/heimdal_build/et_deps.pl
@@ -9,6 +9,7 @@ my $basename = basename($file);
 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";
-- 
cgit