diff options
| -rw-r--r-- | source4/build/m4/check_make.m4 | 29 | ||||
| -rw-r--r-- | source4/build/smb_build/env.pm | 1 | ||||
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 | ||||
| -rw-r--r-- | source4/rules.mk | 14 |
4 files changed, 15 insertions, 31 deletions
diff --git a/source4/build/m4/check_make.m4 b/source4/build/m4/check_make.m4 index d7799649a7..f497684453 100644 --- a/source4/build/m4/check_make.m4 +++ b/source4/build/m4/check_make.m4 @@ -6,35 +6,26 @@ dnl Released under the GNU GPL dnl ------------------------------------------------------- dnl -AC_PATH_PROG(MAKE,make) +AC_PATH_PROGS(MAKE,gmake make) AC_CACHE_CHECK([whether we have GNU make], samba_cv_gnu_make, [ -if $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null +if ! $ac_cv_path_MAKE --version | head -1 | grep GNU 2>/dev/null >/dev/null then - samba_cv_gnu_make=yes -else - samba_cv_gnu_make=no + AC_MSG_ERROR([Unable to find GNU make]) fi ]) -GNU_MAKE=$samba_cv_gnu_make -AC_SUBST(GNU_MAKE) - -if test "x$GNU_MAKE" = x"yes"; then - AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[ +AC_CACHE_CHECK([GNU make version], samba_cv_gnu_make_version,[ samba_cv_gnu_make_version=`$ac_cv_path_MAKE --version | head -1 | cut -d " " -f 3 2>/dev/null` ]) GNU_MAKE_VERSION=$samba_cv_gnu_make_version AC_SUBST(GNU_MAKE_VERSION) -fi new_make=no AC_MSG_CHECKING([for GNU make >= 3.81]) -if test x$GNU_MAKE = x"yes"; then - if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then - new_make=yes - fi +if $PERL -e " \$_ = '$GNU_MAKE_VERSION'; s/@<:@^\d\.@:>@.*//g; exit (\$_ < 3.81);"; then + new_make=yes fi AC_MSG_RESULT($new_make) automatic_dependencies=no @@ -46,11 +37,3 @@ 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/env.pm b/source4/build/smb_build/env.pm index 76cd8d1a26..01e05d57e3 100644 --- a/source4/build/smb_build/env.pm +++ b/source4/build/smb_build/env.pm @@ -50,7 +50,6 @@ sub _set_config($$) } $self->{developer} = ($self->{config}->{developer} eq "yes"); - $self->{gnu_make} = ($self->{config}->{GNU_MAKE} eq "yes"); $self->{automatic_deps} = ($self->{config}->{automatic_dependencies} eq "yes"); } diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 86bbb44a8b..acf8928d32 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -106,4 +106,6 @@ To run binaries without installing, set the following environment variable: EOF } +print "To build Samba, run $config::config{MAKE}\n"; + 1; diff --git a/source4/rules.mk b/source4/rules.mk index 7e36ca2647..8707fc3825 100644 --- a/source4/rules.mk +++ b/source4/rules.mk @@ -1,12 +1,12 @@ # Dependencies command DEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.o) -MT $@ \ - $(CFLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@ + $(CFLAGS) $(CPPFLAGS) $< -o $@ # Dependencies for host objects HDEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ \ - $(HOSTCC_FLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@ + $(HOSTCC_FLAGS) $(CPPFLAGS) $< -o $@ # Dependencies for precompiled headers PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \ - $(CFLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@ + $(CFLAGS) $(CPPFLAGS) $< -o $@ # $< is broken in older BSD versions: # when $@ is foo/bar.o, $< could be torture/foo/bar.c @@ -17,19 +17,19 @@ PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \ # building with $srcdir != $builddir work. # Run a static analysis checker -CHECK = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) $(CPPLAGS) -c $(FIRST_PREREQ) -o $@ +CHECK = $(CC_CHECKER) $(CFLAGS) $(PICFLAG) $(CPPLAGS) -c $< -o $@ # Run the configured compiler COMPILE = $(CC) $(CFLAGS) $(PICFLAG) \ $(CPPFLAGS) \ - -c $(FIRST_PREREQ) -o $@ + -c $< -o $@ # Run the compiler for the build host -HCOMPILE = $(HOSTCC) $(HOSTCC_FLAGS) $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@ +HCOMPILE = $(HOSTCC) $(HOSTCC_FLAGS) $(CPPFLAGS) -c $< -o $@ # Precompile headers PCHCOMPILE = @$(CC) -Ilib/replace \ - $(CFLAGS) $(PICFLAG) $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@ + $(CFLAGS) $(PICFLAG) $(CPPFLAGS) -c $< -o $@ # Partial linking PARTLINK = @$(PROG_LD) -r |