Remove binaries:: in favor of SBIN_PROGS, BIN_PROGS.

(This used to be commit a924c9cf6b4f52ff6b403c683d32b7826e72c3d7)

diff --git a/source4/Makefile b/source4/Makefile
index 75c1c6db359dc17d9229502d45596f8c1d8d6e8a..4bd5042f3c52621155f596f1ef53133f6e398252 100644 (file)
--- 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 bc1c9970da1a46c8c896ef5b4fa683b5b6662819..cde7faf8665040a1fbf00f2296b8fedd72cea80f 100644 (file)
--- 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");
        }
 }