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

[jelmer]

Author: jelmer
Date: 2006-03-16 16:47:18 +0000 (Thu, 16 Mar 2006)
New Revision: 14483

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

Log:
Allow subsystems with just a public prototype header, no private ones

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-16 16:46:23 UTC 
(rev 14482)
+++ branches/SAMBA_4_0/source/build/smb_build/main.pl   2006-03-16 16:47:18 UTC 
(rev 14483)
@@ -72,7 +72,8 @@
        $mkenv->Binary($key) if $key->{OUTPUT_TYPE} eq "BINARY";
        $mkenv->Manpage($key) if defined($key->{MANPAGE});
        $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
-       $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER});
+       $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or 
+                                                                
defined($key->{PUBLIC_PROTO_HEADER});
 
 #      $mkenv->DependencyInfo($key) if $config::config{developer} eq "yes";
 }

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-03-16 
16:46:23 UTC (rev 14482)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-03-16 
16:47:18 UTC (rev 14483)
@@ -457,17 +457,26 @@
 
        $dir =~ s/^\.\///g;
 
-       my $comment = "";
+       my $comment = "Creating ";
+       if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
+               $comment.= "$dir/$ctx->{PRIVATE_PROTO_HEADER}";
+               if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
+                       $comment .= " and ";
+               }
+               push (@{$self->{proto_headers}}, 
"$dir/$ctx->{PRIVATE_PROTO_HEADER}");
+       } else {
+               $ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
+       }
+       
        if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
-               $comment.= " and $dir/$ctx->{PUBLIC_PROTO_HEADER}";
+               $comment.= "$dir/$ctx->{PUBLIC_PROTO_HEADER}";
                push (@{$self->{proto_headers}}, 
"$dir/$ctx->{PUBLIC_PROTO_HEADER}");
        } else {
                $ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
        }       
-       push (@{$self->{proto_headers}}, "$dir/$ctx->{PRIVATE_PROTO_HEADER}");
 
        $self->output("$dir/$ctx->{PUBLIC_PROTO_HEADER}: 
\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST:.o=.c)\n");
-       $self->output("[EMAIL PROTECTED] \"Creating 
$dir/$ctx->{PRIVATE_PROTO_HEADER}$comment\"\n");
+       $self->output("[EMAIL PROTECTED] \"$comment\"\n");
 
        $self->output("[EMAIL PROTECTED](PERL) \$(srcdir)/script/mkproto.pl 
--private=$dir/$ctx->{PRIVATE_PROTO_HEADER} 
--public=$dir/$ctx->{PUBLIC_PROTO_HEADER} 
\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)\n\n");
 }