summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-08-03 07:06:09 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:05 -0500
commitc90cba5a73ab330c5b3adb415a8d028af9b0ae52 (patch)
tree5127fb45261ca2faf1a199a63e3c26a23560a3fe
parent0165e1e71dd10278282362949c3c5c9469809a0c (diff)
downloadsamba-c90cba5a73ab330c5b3adb415a8d028af9b0ae52.tar.gz
samba-c90cba5a73ab330c5b3adb415a8d028af9b0ae52.tar.bz2
samba-c90cba5a73ab330c5b3adb415a8d028af9b0ae52.zip
r8996: More build fixes...
(This used to be commit 2b15c74f201d7fad11f1c50dd91b27b78b221550)
-rw-r--r--source4/build/smb_build/makefile.pm13
-rw-r--r--source4/heimdal_build/config.mk15
-rw-r--r--source4/main.mk2
3 files changed, 20 insertions, 10 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 70afa29955..ed69e02e91 100644
--- 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 2dae1dea5d..d258b3dae3 100644
--- 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 4edda5a575..7fc43f3482 100644
--- 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)