1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-27 03:21:53 +03:00

Use $@ where possible.

(This used to be commit 1353e3e46a)
This commit is contained in:
Jelmer Vernooij 2008-02-25 15:59:34 +01:00
parent e001b6f1b0
commit 1025deb436
2 changed files with 4 additions and 8 deletions

View File

@ -328,7 +328,6 @@ sub ProtoHeader($$)
my ($self,$ctx) = @_;
my $target = "";
my $comment = "Creating ";
my $priv = undef;
my $pub = undef;
@ -336,9 +335,7 @@ sub ProtoHeader($$)
if (defined($ctx->{PRIVATE_PROTO_HEADER})) {
$priv = "\$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER}))";
$target .= $priv;
$comment .= $priv;
if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
$comment .= " and ";
$target.= " ";
}
$self->output("PROTO_HEADERS += $priv\n");
@ -349,7 +346,6 @@ sub ProtoHeader($$)
if (defined($ctx->{PUBLIC_PROTO_HEADER})) {
$pub = "\$(realpath \$(addprefix $ctx->{BASEDIR}/, $ctx->{PUBLIC_PROTO_HEADER}))";
$comment .= $pub;
$target .= $pub;
$self->output("PROTO_HEADERS += $pub\n");
} else {
@ -358,7 +354,7 @@ sub ProtoHeader($$)
}
$self->output("$pub: $ctx->{MK_FILE} \$($ctx->{NAME}_OBJ_LIST:.o=.c) \$(srcdir)/script/mkproto.pl\n");
$self->output("\t\@echo \"$comment\"\n");
$self->output("\t\@echo \"Creating \$@\"\n");
$self->output("\t\@\$(PERL) \$(srcdir)/script/mkproto.pl --srcdir=\$(srcdir) --builddir=\$(builddir) --private=$priv --public=$pub \$($ctx->{NAME}_OBJ_LIST)\n\n");
}

View File

@ -280,9 +280,9 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
mkinclude ../heimdal_build/perl_path_wrapper.sh ../librpc/idl-deps.pl librpc/idl/*.idl|
librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES)
@echo Generating librpc/gen_ndr/tables.c
@$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
mv librpc/gen_ndr/tables.x librpc/gen_ndr/tables.c
@echo Generating $@
@$(PERL) $(srcdir)/librpc/tables.pl --output=$@ $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
mv librpc/gen_ndr/tables.x $@
[SUBSYSTEM::NDR_TABLE]
OBJ_FILES = ndr/ndr_table.o gen_ndr/tables.o