Remove extra line for partial linkage objects, simplify binary handling.

(This used to be commit df899e14cb6cdf9725bedc085649bc1ac8749205)

diff --git a/source4/Makefile b/source4/Makefile
index bdcdf2507eef8a832eda75482f28839cf660ed3f..3d4743c47f77fc197f2c2159693fe73448ddf40c 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -49,6 +49,8 @@ include build/make/rules.mk
 include build/make/python.mk
 include data.mk
 
+BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
+
 DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
                   include/includes.d
 
@@ -75,7 +77,7 @@ endif
 DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
                  $(srcdir)/version.h
 
-binaries:: $(BIN_PROGS) $(SBIN_PROGS)
+binaries:: $(BINARIES)
 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 50aec93a1e925b31bd42571678dd06eb82ff4cd9..1f66fabf726fac5d5732a9b9cbae1bebedf67d40 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -165,8 +165,7 @@ sub MergedObj($$)
 {
        my ($self, $ctx) = @_;
 
-       $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
-       $self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_FILES))\n");
+       $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n");
 }
 
 sub StaticLibraryPrimitives($$)
@@ -197,7 +196,7 @@ sub Binary($$)
        my ($self,$ctx) = @_;
 
        unless (defined($ctx->{INSTALLDIR})) {
-               $self->output("binaries:: $ctx->{TARGET_BINARY}\n");
+               $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") {