diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-09 17:07:02 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-09 17:07:02 +0100 |
| commit | c8c9d70221b5d5b5e58ebb306911aa2f9b6ac2a6 (patch) | |
| tree | 1bf5ca52a461cf03a5efb14f8f90f82d66807e25 | |
| parent | 9fccd8361320e82a7819e73f44bc62cf37f88c60 (diff) | |
| download | samba-c8c9d70221b5d5b5e58ebb306911aa2f9b6ac2a6.tar.gz samba-c8c9d70221b5d5b5e58ebb306911aa2f9b6ac2a6.tar.bz2 samba-c8c9d70221b5d5b5e58ebb306911aa2f9b6ac2a6.zip | |
Move first_prereq test to m4 code.
(This used to be commit c0fef09c5d88158b620f38b6f74498a8b6323bd9)
| -rw-r--r-- | source4/build/m4/check_make.m4 | 8 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 8 |
2 files changed, 9 insertions, 7 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index 4780f43e1c..d7799649a7 100644 --- a/source4/build/m4/check_make.m4 +++ b/source4/build/m4/check_make.m4 @@ -46,3 +46,11 @@ AC_ARG_ENABLE(automatic-dependencies, [ automatic_dependencies=no ]) AC_MSG_RESULT($automatic_dependencies) AC_SUBST(automatic_dependencies) + +FIRST_PREREQ="\$*.c" +AC_SUBST(FIRST_PREREQ) + +if test x$GNU_MAKE = xyes; then + FIRST_PREREQ="\$<" +fi + diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 0b1cc7eac2..5799d89c57 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -111,14 +111,9 @@ __EOD__ sub _prepare_suffix_rules($) { my ($self) = @_; - my $first_prereq = '$*.c'; - - if ($self->{config}->{GNU_MAKE} eq 'yes') { - $first_prereq = '$<'; - } $self->output(<< "__EOD__" -FIRST_PREREQ = $first_prereq +FIRST_PREREQ = $self->{config}->{FIRST_PREREQ} __EOD__ ); @@ -461,7 +456,6 @@ sub Binary($$) push (@{$self->{torture_progs}}, "$installdir/$ctx->{BINARY}"); } - push (@{$self->{binaries}}, "$localdir/$ctx->{BINARY}"); $self->_prepare_list($ctx, "OBJ_LIST"); |