summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-09 01:42:42 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-09 01:42:42 +0100
commit17c7f7cc7417e87828fb9e87070f94d7e442e937 (patch)
tree45cedfec4d0350e63d9d2feaef3229dadc5c03d0
parentb44dcae6bb201d4c243672d1fd8877ab17d5c636 (diff)
downloadsamba-17c7f7cc7417e87828fb9e87070f94d7e442e937.tar.gz
samba-17c7f7cc7417e87828fb9e87070f94d7e442e937.tar.bz2
samba-17c7f7cc7417e87828fb9e87070f94d7e442e937.zip
Remove extra line for partial linkage objects, simplify binary handling.
(This used to be commit df899e14cb6cdf9725bedc085649bc1ac8749205)
-rw-r--r--source4/Makefile4
-rw-r--r--source4/build/smb_build/makefile.pm5
2 files changed, 5 insertions, 4 deletions
diff --git a/source4/Makefile b/source4/Makefile
index bdcdf2507e..3d4743c47f 100644
--- 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 50aec93a1e..1f66fabf72 100644
--- 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") {