r9049: - add property dependencies to include/proto.h

- make some stuff easier

metze
(This used to be commit 14b92e8a085f7d1a011b1663bf2a2728a907b0af)

3 files changed, 35 insertions, 32 deletions

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 0c4df18369..59ae6c5c04 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -466,34 +466,12 @@ bin/.TARGET_$ctx->{NAME}:
 ";
 }
 
-sub _prepare_proto_rules()
+sub _prepare_clean_rules()
 {
 	my $output = << '__EOD__';
-# Making this target will just make sure that the prototype files
-# exist, not necessarily that they are up to date.  Since they're
-# removed by 'make clean' this will always be run when you do anything
-# afterwards.
-proto_exists: include/proto.h
-
-delheaders: pch_clean
-	-rm -f $(builddir)/include/proto.h
-
-include/proto.h:
-	@cd $(srcdir) && $(SHELL) script/mkproto.sh "$(PERL)" \
-	  -h _PROTO_H_ $(builddir)/include/proto.h \
-	  $(PROTO_PROTO_OBJS)
-
-# 'make headers' or 'make proto' calls a subshell because we need to
-# make sure these commands are executed in sequence even for a
-# parallel make.
-headers: delheaders proto_exists
-
-proto: idl headers
-
-proto_test:
-	@[ -f $(builddir)/include/proto.h ] || $(MAKE) proto
-
-clean: delheaders heimdal_clean
+clean: heimdal_clean
+	@echo Removing headers
+	@-rm -f include/proto.h
 	@echo Removing objects
 	@-find . -name '*.o' -exec rm -f '{}' \;
 	@echo Removing binaries
@@ -577,7 +555,7 @@ sub _prepare_rule_lists($)
 		($output .= _prepare_custom_rule($key) ) if $key->{TYPE} eq "TARGET";
 	}
 
-	$output .= _prepare_proto_rules();
+	$output .= _prepare_clean_rules();
 
 	return $output;
 }
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 70e5a22173..860b4b94bd 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -395,6 +395,18 @@ 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_basics: \
+	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
+
 heimdal_clean:
 	@echo Removing generated ASN1 files
 	@-find heimdal/lib/asn1 -name 'asn1_*.[cx]' -exec rm -f '{}' \;
diff --git a/source4/main.mk b/source4/main.mk
index 288c4daa71..5214f48047 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -52,7 +52,7 @@ include kdc/config.mk
 include lib/replace/config.mk
 include scripting/ejs/config.mk
 
-all: proto bin/asn1_compile bin/compile_et basics binaries
+all: binary_asn1_compile binary_compile_et binaries
 binaries: $(BIN_PROGS) $(SBIN_PROGS)
 manpages: $(MANPAGES)
 everything: all
@@ -141,12 +141,25 @@ smb_interfaces: build/pidl/smb_interfaces.pm
 build/pidl/smb_interfaces.pm: build/pidl/smb_interfaces.yp
 	-yapp -s -m 'smb_interfaces' -o build/pidl/smb_interfaces.pm build/pidl/smb_interfaces.yp 
 
-pch: proto include/includes.h.gch
+include/config.h:
+	@echo "include/config.h not present"
+	@echo "You need to rerun ./autogen.sh and ./configure"
+	@/bin/false
+
+include/proto.h: $(PROTO_PROTO_OBJS:.o=.c)
+	@-rm -f include/includes.h.gch
+	@$(SHELL) script/mkproto.sh "$(PERL)" \
+	  -h _PROTO_H_ include/proto.h \
+	  $(PROTO_PROTO_OBJS)
+	@touch include/proto.h
 
-pch_clean:
-	-rm -f include/includes.h.gch
+proto: include/proto.h
+pch: proto 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 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
+basics: include/config.h \
+	include/proto.h \
+	idl \
+	heimdal_basics
 
 test: $(DEFAULT_TEST_TARGET)