summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Pool <mbp@samba.org>2002-03-19 11:46:31 +0000
committerMartin Pool <mbp@samba.org>2002-03-19 11:46:31 +0000
commit7154d14a850a180a83b9b70053a7b1428b971094 (patch)
tree14b7ce48d274c0cb44590d58070125b60596ca21
parent1f62003cd771b4620f0f3a5afe9f9999169877f9 (diff)
downloadsamba-7154d14a850a180a83b9b70053a7b1428b971094.tar.gz
samba-7154d14a850a180a83b9b70053a7b1428b971094.tar.bz2
samba-7154d14a850a180a83b9b70053a7b1428b971094.zip
Refactor for systems like Solaris that cannot handle wildcards on the
right side of a dependency line. (This used to be commit 87f2e3c30d11bcf0cecb7c32dc5f01755d181ad6)
-rw-r--r--source3/Makefile.in12
1 files changed, 8 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 029c64698b..e0cbfcf3cc 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -858,7 +858,7 @@ $(PROTO_OBJ): .proto.stamp
# different to the existing ones.
$(srcdir)/include/proto.h: .proto.check
-.proto.check: $(srcdir)/*.c $(srcdir)/*/*.c
+.proto.check: $(ALL_SOURCE)
@echo Checking $(srcdir)/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'` \
@@ -872,8 +872,12 @@ $(srcdir)/include/proto.h: .proto.check
mv $(builddir)/include/proto.h.new include/proto.h; \
fi
-.proto.stamp: .proto.check
- @[ -f .proto.stamp ] || touch .proto.stamp
+.proto.stamp:
+ @if [ \! -f .proto.stamp ] ; \
+ then \
+ touch .proto.stamp; \
+ ALL_SOURCE="`echo $(srcdir)/*.c $(srcdir)/*/*.c`" $(MAKE) $(MAKEFLAGS) .proto.check; \
+ fi
include/build_env.h:
@echo rebuilding include/build_env.h
@@ -885,7 +889,7 @@ include/wrepld_proto.h:
-h _WREPLD_PROTO_H_ $(builddir)/include/wrepld_proto.h \
$(WREPL_OBJ1)
-headers: .proto.check $(srcdir)/include/proto.h include/build_env.h include/wrepld_proto.h
+headers: .proto.stamp $(srcdir)/include/proto.h include/build_env.h include/wrepld_proto.h
proto: headers winbindd_proto