build: fix the build with --enable-automatic-dependencies=yes
authorStefan Metzmacher <metze@samba.org>
Tue, 4 Mar 2008 09:47:40 +0000 (10:47 +0100)
committerStefan Metzmacher <metze@samba.org>
Tue, 4 Mar 2008 10:55:41 +0000 (11:55 +0100)
metze
(This used to be commit b0ecd8f8d2c1ebf23957921f4852e90b556812fc)

source4/Makefile
source4/build/smb_build/makefile.pm

index 97518ebcb695ea71f16b726b74c6d227a949e105..914f15826a1fad450c66bd16154322ce7215aeeb 100644 (file)
@@ -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)
index f2bff1a029ca8ef5326a200cd2e2e2b449732a21..03198fd944d8ae92102f3219ef867727e67a6326 100644 (file)
@@ -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;