sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-12 09:18:10 +03:00
Code

r14997: Fix build of static libraries. Libraries build fine now, but linking doesn't

Browse Source 
work yet.
This commit is contained in:
Jelmer Vernooij 2006-04-08 14:49:59 +00:00 committed by Gerald (Jerry) Carter
parent 6782214c44
commit d3106699db
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,7 +133,7 @@ LD=$self->{config}->{LD}
LDFLAGS=$self->{config}->{LDFLAGS} -L\$(builddir)/bin
STLD=$self->{config}->{AR}
STLD_FLAGS=-rc -L\$(builddir)/bin
STLD_FLAGS=-rc
SHLD=$self->{config}->{CC}
SHLD_FLAGS=$self->{config}->{LDSHFLAGS} -L\$(builddir)/bin
@ -342,7 +342,7 @@ sub StaticLibrary($$)
{
my ($self,$ctx) = @_;
push (@{$self->{static_libs}}, $ctx->{OUTPUT});
push (@{$self->{static_libs}}, $ctx->{TARGET});
$self->_prepare_list($ctx, "OBJ_LIST");
$self->_prepare_list($ctx, "CFLAGS");
@ -355,10 +355,10 @@ sub StaticLibrary($$)
$self->output(<< "__EOD__"
#
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_DEPEND_LIST) \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
$ctx->{TARGET}: \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
\@echo Linking \$@
\@\$(STLD) \$(STLD_FLAGS) \$@ \\
\$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST)
\$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST)
__EOD__
);

2
source/smb_server/config.mk
View File

@ -2,7 +2,7 @@
#######################
# Start SUBSYSTEM SMB
[SUBSYSTEM::SMB]
[SUBSYSTEM::SMB_SERVER]
OBJ_FILES = \
smb_server.o \
tcon.o \

2
source/smbd/config.mk
View File

@ -17,7 +17,7 @@ INIT_FUNCTION = server_service_smb_init
OUTPUT_TYPE = MERGEDOBJ
SUBSYSTEM = service
REQUIRED_SUBSYSTEMS = \
SMB
SMB_SERVER
# End MODULE server_smb
################################################