diff options
| author | Martin Pool <mbp@samba.org> | 2002-04-30 05:11:52 +0000 |
|---|---|---|
| committer | Martin Pool <mbp@samba.org> | 2002-04-30 05:11:52 +0000 |
| commit | 8e5ef527cc964e079457db78828d89630e8bae77 (patch) | |
| tree | 2785fb80242fb8241166fd410ccf0cff7eca130a | |
| parent | ee744e4cddd3675071a479c3de8ec04d2aa34cc7 (diff) | |
| download | samba-8e5ef527cc964e079457db78828d89630e8bae77.tar.gz samba-8e5ef527cc964e079457db78828d89630e8bae77.tar.bz2 samba-8e5ef527cc964e079457db78828d89630e8bae77.zip | |
Two small fixes for "make proto": wbrepld was never getting rebuilt
because it wasn't killed by delheaders; and there was a race in
delheaders with make -j.
(This used to be commit a615811f57f2827dd1b9cd23ad3e34e5a9fb22da)
| -rw-r--r-- | source3/Makefile.in | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index dee2daa6b9..f7a7a333b2 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -833,32 +833,30 @@ winbindd_proto: $(WINBINDD_OBJ1) delheaders: - @/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h - @/bin/rm -f include/proto.h include/build_env.h - -# we want our generated headers to be rebuilt if they don't exist, but not rebuilt every time -.headers.stamp: - @[ -f $@ ] || touch $@ - -$(PROTO_OBJ) : .headers.stamp + @/bin/rm -f $(srcdir)/include/proto.h $(srcdir)/include/build_env.h + @/bin/rm -f $(srcdir)/include/wrepld_proto.h $(srcdir)/nsswitch/winbindd_proto.h + @/bin/rm -f include/proto.h include/build_env.h include/wrepld_proto.h nsswitch/winbindd_proto.h include/proto.h: - @echo rebuilding include/proto.h + @echo Building include/proto.h @cd $(srcdir) && $(AWK) -f script/mkproto.awk `echo $(PROTO_OBJ) | tr ' ' '\n' | sed -e 's/\.o/\.c/g' | sort -u | egrep -v 'ubiqx/|wrapped'` > $(builddir)/include/proto.h include/build_env.h: - @echo rebuilding include/build_env.h + @echo Building include/build_env.h @cd $(srcdir) && $(SHELL) script/build_env.sh $(srcdir) $(builddir) $(CC) > $(builddir)/include/build_env.h include/wrepld_proto.h: - @echo rebuilding include/wrepld_proto.h + @echo Building include/wrepld_proto.h @cd $(srcdir) && $(SHELL) script/mkproto.sh $(AWK) \ -h _WREPLD_PROTO_H_ $(builddir)/include/wrepld_proto.h \ $(WREPL_OBJ1) -headers: delheaders include/proto.h include/build_env.h include/wrepld_proto.h .headers.stamp +headers: + $(MAKE) $(MAKEFLAGS) delheaders include/proto.h include/build_env.h include/wrepld_proto.h winbindd_proto + +proto: headers -proto: headers winbindd_proto +.PHONY: headers proto etags: etags `find $(srcdir) -name "*.[ch]" | grep -v /CVS/` |