[SCM] Samba Shared Repository - branch v4-0-test updated -
release-4-0-0alpha2-1202-gb0ecd8f
Stefan Metzmacher
metze at samba.org
Tue Mar 4 10:57:07 GMT 2008
The branch, v4-0-test has been updated
via b0ecd8f8d2c1ebf23957921f4852e90b556812fc (commit)
from 7f0341dd589150ab01563957460cdcf42515cadc (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit b0ecd8f8d2c1ebf23957921f4852e90b556812fc
Author: Stefan Metzmacher <metze at samba.org>
Date: Tue Mar 4 10:47:40 2008 +0100
build: fix the build with --enable-automatic-dependencies=yes
metze
-----------------------------------------------------------------------
Summary of changes:
source/Makefile | 4 ++--
source/build/smb_build/makefile.pm | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/Makefile b/source/Makefile
index 97518eb..914f158 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -21,7 +21,7 @@ HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
.DEFAULT_GOAL := all
-ifneq ($(automatic_deps),yes)
+ifneq ($(automatic_dependencies),yes)
ALL_PREDEP = proto
.NOTPARALLEL:
endif
@@ -32,7 +32,7 @@ include data.mk
DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
include/includes.d
-ifeq ($(automatic_deps),yes)
+ifeq ($(automatic_dependencies),yes)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(MAKECMDGOALS),distclean)
ifneq ($(MAKECMDGOALS),realdistclean)
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index f2bff1a..03198fd 100644
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -400,7 +400,7 @@ sub CFlags($$)
my $cflags = join(' ', @cflags);
- $self->output("\$(patsubst %.ho,%.d,\$(key->{NAME}_OBJ_LIST:.o=.d)) \$($key->{NAME}_OBJ_LIST): CFLAGS+= $cflags\n");
+ $self->output("\$(patsubst %.ho,%.d,\$($key->{NAME}_OBJ_LIST:.o=.d)) \$($key->{NAME}_OBJ_LIST): CFLAGS+= $cflags\n");
}
1;
--
Samba Shared Repository
More information about the samba-cvs
mailing list