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

[jelmer at samba.org]

Author: jelmer
Date: 2005-08-03 07:06:09 +0000 (Wed, 03 Aug 2005)
New Revision: 8996

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

Log:
More build fixes...

Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/heimdal_build/config.mk
   branches/SAMBA_4_0/source/main.mk


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:51:58 UTC (rev 8995)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2005-08-03 07:06:09 UTC (rev 8996)
@@ -491,7 +491,7 @@
 proto_test:
 	@[ -f $(builddir)/include/proto.h ] || $(MAKE) proto
 
-clean: delheaders
+clean: delheaders heimdal_clean
 	@echo Removing objects
 	@-find . -name '*.o' -exec rm -f '{}' \;
 	@echo Removing binaries
@@ -500,16 +500,11 @@
 	@-rm -f bin/.*_*
 	@echo Removing generated files
 	@-rm -rf librpc/gen_*
-	@echo Removing generated ASN1 files
-	@-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
 	-rm -f bin/.dummy
 	-rm -f include/config.h include/smb_build.h

Modified: branches/SAMBA_4_0/source/heimdal_build/config.mk
===================================================================
--- branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-08-03 06:51:58 UTC (rev 8995)
+++ branches/SAMBA_4_0/source/heimdal_build/config.mk	2005-08-03 07:06:09 UTC (rev 8996)
@@ -395,6 +395,21 @@
 include ./heimdal_build/et_deps.pl heimdal/lib/krb5/k524_err.et|
 include ./heimdal_build/et_deps.pl heimdal/lib/krb5/krb5_err.et|
 
+heimdal_clean:
+	@echo Removing generated ASN1 files
+	@-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
+	@-rm -f heimdal/lib/asn1/asn1_err.{c,h}
+	@-rm -f heimdal/lib/hdb/hdb_err.{c,h}
+	@-rm -f heimdal/lib/krb5/heim_err.{c,h}
+	@-rm -f heimdal/lib/krb5/k524_err.{c,h}
+	@-rm -f heimdal/lib/krb5/krb5_err.{c,h}
+
 #######################
 # Start SUBSYSTEM HEIMDAL
 [SUBSYSTEM::HEIMDAL]

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk	2005-08-03 06:51:58 UTC (rev 8995)
+++ branches/SAMBA_4_0/source/main.mk	2005-08-03 07:06:09 UTC (rev 8996)
@@ -140,7 +140,7 @@
 pch_clean:
 	-rm -f include/includes.h.gch
 
-basics: idl proto_exists heimdal/lib/hdb/hdb_asn1.h heimdal/lib/gssapi/spnego_asn1.h heimdal/lib/asn1/krb5_asn1.h heimdal/lib/roken/vis.h heimdal/lib/roken/err.h
+basics: idl proto_exists heimdal/lib/hdb/hdb_asn1.h heimdal/lib/gssapi/spnego_asn1.h heimdal/lib/asn1/krb5_asn1.h heimdal/lib/roken/vis.h heimdal/lib/roken/err.h heimdal/lib/asn1/asn1_err.h heimdal/lib/hdb/hdb_err.h heimdal/lib/krb5/heim_err.h heimdal/lib/krb5/k524_err.h heimdal/lib/krb5/krb5_err.h
 
 test: $(DEFAULT_TEST_TARGET)