diff options
| -rw-r--r-- | source4/build/smb_build/main.pl | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 18 |
2 files changed, 3 insertions, 17 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 3443dbc46b..907f513c5c 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -74,8 +74,6 @@ foreach my $key (values %$OUTPUT) { $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS}); $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or defined($key->{PUBLIC_PROTO_HEADER}); - -# $mkenv->DependencyInfo($key) if $config::config{developer} eq "yes"; } $mkenv->write("Makefile"); diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index e632895f20..aeffc79e4d 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -187,18 +187,6 @@ sub _prepare_list($$$) $self->output("$ctx->{TYPE}\_$ctx->{NAME}_$var =$tmplist\n"); } -sub DependencyInfo($$) -{ - my ($self,$ctx) = @_; - - $self->output("bin/deps/$ctx->{TYPE}_$ctx->{NAME}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)"); - $self->output("\n"); - $self->output("\t\@echo \"Generating dependency info for $ctx->{NAME}\"\n"); - $self->output("\t\@./script/cdeps.pl \$^ > \$@\n"); - $self->output("\n"); - $self->output("-include bin/deps/$ctx->{TYPE}_$ctx->{NAME}\n\n"); -} - sub SharedLibrary($$) { my ($self,$ctx) = @_; @@ -518,17 +506,17 @@ sub write($$) $self->_prepare_mk_files(); + $self->output($self->{mkfile}); + if ($self->{developer}) { $self->output(<<__EOD__ -#-include \$(ALL_OBJS:.o=.d) +-include \$(DEP_FILES) __EOD__ ); } - $self->output($self->{mkfile}); - open(MAKEFILE,">$file") || die ("Can't open $file\n"); print MAKEFILE $self->{output}; close(MAKEFILE); |