samba-cvs.cvs
[Top] [All Lists]

svn commit: samba r14552 - in branches/SAMBA_4_0/source/build/smb_build:

Subject: svn commit: samba r14552 - in branches/SAMBA_4_0/source/build/smb_build: .
From:
Date: Sat, 18 Mar 2006 23:31:40 +0000 GMT
Author: jelmer
Date: 2006-03-18 23:31:40 +0000 (Sat, 18 Mar 2006)
New Revision: 14552

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14552

Log:
Remove old dependency code

Modified:
   branches/SAMBA_4_0/source/build/smb_build/main.pl
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/main.pl
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/main.pl   2006-03-18 22:27:38 UTC 
(rev 14551)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl   2006-03-18 23:31:40 UTC 
(rev 14552)
@@ -74,8 +74,6 @@
        $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");

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-03-18 
22:27:38 UTC (rev 14551)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-03-18 
23:31:40 UTC (rev 14552)
@@ -187,18 +187,6 @@
        $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 @@
 
        $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);

<Prev in Thread] Current Thread [Next in Thread>
  • svn commit: samba r14552 - in branches/SAMBA_4_0/source/build/smb_build: ., jelmer <=