summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-08-04 04:45:42 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:31:12 -0500
commit3742b978cc1d29ac0e31d9646f6e1584d37a633a (patch)
tree50ab6f51d7b56a8e9f796324ebb8fd499edf808d /source4/build
parent223262c11e94c1e67b8cdec1a264d7f93a9afdc4 (diff)
downloadsamba-3742b978cc1d29ac0e31d9646f6e1584d37a633a.tar.gz
samba-3742b978cc1d29ac0e31d9646f6e1584d37a633a.tar.bz2
samba-3742b978cc1d29ac0e31d9646f6e1584d37a633a.zip
r9049: - add property dependencies to include/proto.h
- make some stuff easier metze (This used to be commit 14b92e8a085f7d1a011b1663bf2a2728a907b0af)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm32
1 files changed, 5 insertions, 27 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;
}