r8996: More build fixes...

(This used to be commit 2b15c74f201d7fad11f1c50dd91b27b78b221550)

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 70afa29955456dd527688fdb2e98cdea830b43bc..ed69e02e916cfb0b10072b26dd7a2cf52c6afcd4 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -491,7 +491,7 @@ proto: idl headers
 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,14 +500,9 @@ clean: delheaders
        @-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

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 2dae1dea5d72c4721f6702bdabd886caa56c7c2b..d258b3dae3483fa249b6883b464aa3dbf7238129 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -395,6 +395,21 @@ include ./heimdal_build/et_deps.pl heimdal/lib/krb5/heim_err.et|
 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]

diff --git a/source4/main.mk b/source4/main.mk
index 4edda5a575ae6c506b0f80b49372e9d1134a3e3e..7fc43f3482d482e391b085854aca008af8f3df08 100644 (file)
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -140,7 +140,7 @@ pch: proto include/includes.h.gch
 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)