diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 15:59:34 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 15:59:34 +0100 |
| commit | 1025deb436c9ad4edce5f6e2bf49efa280b4ec28 (patch) | |
| tree | 298dc8d07fbc081ca41009f5e89a4c6cccc6d507 /source4 | |
| parent | e001b6f1b05d4e93380d005da28227aece6e1c1c (diff) | |
| download | samba-1025deb436c9ad4edce5f6e2bf49efa280b4ec28.tar.gz samba-1025deb436c9ad4edce5f6e2bf49efa280b4ec28.tar.bz2 samba-1025deb436c9ad4edce5f6e2bf49efa280b4ec28.zip | |
Use $@ where possible.
(This used to be commit 1353e3e46a699b77f04fb0e69900bec9b15e0d48)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 6 | ||||
| -rw-r--r-- | source4/librpc/config.mk | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index b57015b65e..9dfc2e327d 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -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"); } diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 2fdef41b2a..d7a83374e1 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -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 |