diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 21:09:04 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-18 21:09:04 +0200 |
| commit | dc114f8c5acbcffe2f7114083f3e058f17fb4fa2 (patch) | |
| tree | 0d8424597a9635a284f6f8d9af8bb155bc698632 /source4/build | |
| parent | 333c169529a3f64a28fcaff1056069867fd56a90 (diff) | |
| download | samba-dc114f8c5acbcffe2f7114083f3e058f17fb4fa2.tar.gz samba-dc114f8c5acbcffe2f7114083f3e058f17fb4fa2.tar.bz2 samba-dc114f8c5acbcffe2f7114083f3e058f17fb4fa2.zip | |
Avoid smb_build for prototype headers in some places.
(This used to be commit 4876c4efbbafb4e0afa3554cd9f748ab591a2927)
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/make/templates.mk | 2 | ||||
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source4/build/make/templates.mk b/source4/build/make/templates.mk index 3a1f5656a6..e3ecffb02d 100644 --- a/source4/build/make/templates.mk +++ b/source4/build/make/templates.mk @@ -36,6 +36,8 @@ define proto_header_template $(1): $(2) ; @echo "Creating $$@" @$$(PERL) $$(srcdir)/script/mkproto.pl --srcdir=$$(srcdir) --builddir=$$(builddir) --public=/dev/null --private=$$@ $$^ + +PROTO_HEADERS += $(1) endef # Shared module diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 4c375cecf6..f2df09d9cd 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -227,9 +227,8 @@ sub ProtoHeader($$) { my ($self,$ctx) = @_; - my $target = "\$(addprefix $ctx->{BASEDIR}/, $ctx->{PRIVATE_PROTO_HEADER})"; - $self->output("PROTO_HEADERS += $target\n"); - $self->output("\$(call proto_header_template, $target, \$($ctx->{NAME}_OBJ_FILES:.o=.c))\n"); + my $target = "$ctx->{BASEDIR}/$ctx->{PRIVATE_PROTO_HEADER}"; + $self->output("\$(call proto_header_template,$target,\$($ctx->{NAME}_OBJ_FILES:.o=.c))\n"); } sub write($$) |