sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Code

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

Browse Source
This commit is contained in:
Jelmer Vernooij 2008-03-09 01:42:42 +01:00
parent c165b34805
commit df899e14cb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Makefile
View File

@ -49,6 +49,8 @@ include build/make/rules.mk
include build/make/python.mk include build/make/python.mk
include data.mk include data.mk
BINARIES += $(BIN_PROGS) $(SBIN_PROGS)
DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \ DEP_FILES = $(patsubst %.ho,%.hd,$(patsubst %.o,%.d,$(ALL_OBJS))) \
include/includes.d include/includes.d
@ -75,7 +77,7 @@ endif
DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \ DEFAULT_HEADERS = $(srcdir)/lib/util/dlinklist.h \
$(srcdir)/version.h $(srcdir)/version.h
binaries:: $(BIN_PROGS) $(SBIN_PROGS) binaries:: $(BINARIES)
libraries:: $(STATIC_LIBS) $(SHARED_LIBS) libraries:: $(STATIC_LIBS) $(SHARED_LIBS)
modules:: $(PLUGINS) modules:: $(PLUGINS)
headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS) headers:: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)

5
source/build/smb_build/makefile.pm
View File

@ -165,8 +165,7 @@ sub MergedObj($$)
{ {
my ($self, $ctx) = @_; my ($self, $ctx) = @_;
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); $self->output("\$(call partial_link_template, $ctx->{OUTPUT}, \$($ctx->{NAME}_OBJ_FILES))\n");
$self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_FILES))\n");
} }
sub StaticLibraryPrimitives($$) sub StaticLibraryPrimitives($$)
@ -197,7 +196,7 @@ sub Binary($$)
my ($self,$ctx) = @_; my ($self,$ctx) = @_;
unless (defined($ctx->{INSTALLDIR})) { unless (defined($ctx->{INSTALLDIR})) {
$self->output("binaries:: $ctx->{TARGET_BINARY}\n"); $self->output("BINARIES += $ctx->{TARGET_BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "SBINDIR") { } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
$self->output("SBIN_PROGS += $ctx->{RESULT_BINARY}\n"); $self->output("SBIN_PROGS += $ctx->{RESULT_BINARY}\n");
} elsif ($ctx->{INSTALLDIR} eq "BINDIR") { } elsif ($ctx->{INSTALLDIR} eq "BINDIR") {