summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-25 22:58:14 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-25 22:58:14 +0100
commitbe68e484c3d370ff0b66a78169706d930fe8bccf (patch)
tree5ce65d342fcfa238ecd1ea53a313eddf80d127ce /source4
parentd15fd2c94f87c9d82eecefa64404f317a192ded0 (diff)
downloadsamba-be68e484c3d370ff0b66a78169706d930fe8bccf.tar.gz
samba-be68e484c3d370ff0b66a78169706d930fe8bccf.tar.bz2
samba-be68e484c3d370ff0b66a78169706d930fe8bccf.zip
Remove binaries:: in favor of SBIN_PROGS, BIN_PROGS.
(This used to be commit a924c9cf6b4f52ff6b403c683d32b7826e72c3d7)
Diffstat (limited to 'source4')
-rw-r--r--source4/Makefile2
-rw-r--r--source4/build/smb_build/makefile.pm9
2 files changed, 3 insertions, 8 deletions
diff --git a/source4/Makefile b/source4/Makefile
index 75c1c6db35..4bd5042f3c 100644
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -56,7 +56,7 @@ endif
DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
$(srcdir)/version.h
-binaries::
+binaries:: $(BIN_PROGS) $(SBIN_PROGS)
libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
modules:: $(PLUGINS)
headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index bc1c9970da..cde7faf866 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -272,14 +272,13 @@ sub Binary($$)
my ($self,$ctx) = @_;
unless (defined($ctx->{INSTALLDIR})) {
+ $self->output("binaries:: $ctx->{TARGET_BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
$self->output("SBIN_PROGS += $ctx->{RESULT_BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
$self->output("BIN_PROGS += $ctx->{RESULT_BINARY}\n");
}
- $self->output("binaries:: $ctx->{TARGET_BINARY}\n");
-
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -402,11 +401,7 @@ sub CFlags($$)
my $cflags = join(' ', @cflags);
foreach (@{$key->{OBJ_LIST}}) {
- my $ofile = $_;
- my $dfile = $_;
- $dfile =~ s/\.o$/.d/;
- $dfile =~ s/\.ho$/.d/;
- $self->output("$ofile $dfile: CFLAGS+= $cflags\n");
+ $self->output("\$($key->{NAME}_OBJ_FILES) \$($key->{NAME}_OBJ_FILES:.o=.d): CFLAGS+= $cflags\n");
}
}