[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1147-g666311d
Jelmer Vernooij
jelmer at samba.org
Fri Feb 29 13:08:45 GMT 2008
The branch, v4-0-test has been updated
via 666311dccf19293316b0335c5418446c66e76101 (commit)
via 0580357fb4b10e4a751d281e209f6a87e1c88143 (commit)
via 9db23848dcd1b73273b90edd923b6c55f6c915c4 (commit)
from 28bbd546195461d4b8747bc6cefd6320f8efe17d (commit)
http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 666311dccf19293316b0335c5418446c66e76101
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 20:39:16 2008 +0100
Remove obsolete comment.
commit 0580357fb4b10e4a751d281e209f6a87e1c88143
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 18:44:52 2008 +0100
Remove workaround for some non-GNU makes.
commit 9db23848dcd1b73273b90edd923b6c55f6c915c4
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Mon Feb 25 20:39:29 2008 +0100
Update smb_build README.
-----------------------------------------------------------------------
Summary of changes:
source/build/m4/check_make.m4 | 29 ++++++-----------------------
source/build/smb_build/README.txt | 4 +---
source/build/smb_build/main.pl | 2 ++
source/rules.mk | 26 ++++++++++----------------
4 files changed, 19 insertions(+), 42 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/build/m4/check_make.m4 b/source/build/m4/check_make.m4
index d779964..f497684 100644
--- a/source/build/m4/check_make.m4
+++ b/source/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/source/build/smb_build/README.txt b/source/build/smb_build/README.txt
index a5e4db9..5974db9 100644
--- a/source/build/smb_build/README.txt
+++ b/source/build/smb_build/README.txt
@@ -29,7 +29,7 @@ EXT_LIB:
BINARY:
a BINARY means a executable binary file.
(e.g. 'smbtorture' or 'ldbedit')
- a BINARY typicly has only commandline handling and basic
+ a BINARY typically has only commandline handling and basic
functionality code in it and depends on the functions of
SUBSYSTEM's (REQUIRED_SUBSYSTEMS).
@@ -50,8 +50,6 @@ input.pm - Input validation
main.pm - Main
makefile.pm - Makefile generation
output.pm - Dependency calculation
-header.pm - build.h generation
-cflags.pm - Generates cflags.txt for file-specific cflags
Layout
-------
diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 6d4a732..d2d3dc9 100644
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -92,4 +92,6 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir},
summary::show($OUTPUT, \%config::config);
+print "To build Samba, run $config::config{MAKE}\n";
+
1;
diff --git a/source/rules.mk b/source/rules.mk
index 9791466..b644a6a 100644
--- a/source/rules.mk
+++ b/source/rules.mk
@@ -1,41 +1,33 @@
# Dependencies command
DEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.o) -MT $@ \
$(CFLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` \
- $(CPPFLAGS) $(FIRST_PREREQ) -o $@
+ $(CPPFLAGS) $< -o $@
# Dependencies for host objects
HDEPENDS = $(CC) -M -MG -MP -MT $(<:.c=.ho) -MT $@ \
$(HOSTCC_FLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` \
- $(CPPFLAGS) $(FIRST_PREREQ) -o $@
+ $(CPPFLAGS) $< -o $@
# Dependencies for precompiled headers
PCHDEPENDS = $(CC) -M -MG -MT include/includes.h.gch -MT $@ \
- $(CFLAGS) $(CPPFLAGS) $(FIRST_PREREQ) -o $@
-
-# $< is broken in older BSD versions:
-# when $@ is foo/bar.o, $< could be torture/foo/bar.c
-# if it also exists. So better use $* which is foo/bar
-# and append .c manually to get foo/bar.c
-#
-# If we have GNU Make, it is safe to use $<, which also lets
-# building with $srcdir != $builddir work.
+ $(CFLAGS) $(CPPFLAGS) $< -o $@
# Run a static analysis checker
CHECK = $(CC_CHECKER) $(CFLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` \
- $(PICFLAG) $(CPPLAGS) -c $(FIRST_PREREQ) -o $@
+ $(PICFLAG) $(CPPLAGS) -c $< -o $@
# Run the configured compiler
COMPILE = $(CC) $(CFLAGS) $(PICFLAG) \
`$(PERL) $(srcdir)/script/cflags.pl $@` \
$(CPPFLAGS) \
- -c $(FIRST_PREREQ) -o $@
+ -c $< -o $@
# Run the compiler for the build host
HCOMPILE = $(HOSTCC) $(HOSTCC_FLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` \
- $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@
+ $(CPPFLAGS) -c $< -o $@
# Precompile headers
PCHCOMPILE = @$(CC) -Ilib/replace \
$(CFLAGS) `$(PERL) $(srcdir)/script/cflags.pl $@` \
- $(PICFLAG) $(CPPFLAGS) -c $(FIRST_PREREQ) -o $@
+ $(PICFLAG) $(CPPFLAGS) -c $< -o $@
# Partial linking
PARTLINK = @$(PROG_LD) -r
@@ -134,9 +126,11 @@ include/includes.d: include/includes.h
@-mkdir -p `dirname $@`
@$(COMPILE) && exit 0 ; \
echo "The following command failed:" 1>&2;\
- echo "$(COMPILE)" 1>&2;\
$(COMPILE) >/dev/null 2>&1
+
+# echo "$(COMPILE)" 1>&2;\
+
.c.ho:
@echo "Compiling $< with host compiler"
@-mkdir -p `dirname $@`
--
Samba Shared Repository
More information about the samba-cvs
mailing list