summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-03-04 10:47:40 +0100
committerStefan Metzmacher <metze@samba.org>2008-03-04 11:55:41 +0100
commit3ced8006a6a58b459fd68e9b02d7673b16b2df95 (patch)
tree5344410fcf90ba21749903943f45195efbf0829c
parentf042c1509032ff7c2ce87ea543e2fcda59b70532 (diff)
downloadsamba-3ced8006a6a58b459fd68e9b02d7673b16b2df95.tar.gz
samba-3ced8006a6a58b459fd68e9b02d7673b16b2df95.tar.bz2
samba-3ced8006a6a58b459fd68e9b02d7673b16b2df95.zip
build: fix the build with --enable-automatic-dependencies=yes
metze (This used to be commit b0ecd8f8d2c1ebf23957921f4852e90b556812fc)
-rw-r--r--source4/Makefile4
-rw-r--r--source4/build/smb_build/makefile.pm2
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 97518ebcb6..914f15826a 100644
--- a/source4/Makefile
+++ b/source4/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/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index f2bff1a029..03198fd944 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/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;