diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-08 14:49:59 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-04-08 14:49:59 +0000 |
| commit | 66627e798249d73b208a7c271ce7e44bb3a59305 (patch) | |
| tree | ec03ec09790c3a8c9a24f6498f5f8171e6399cc2 | |
| parent | a6266ea59410d99d3c75cfa80d20bc69d1a78fc5 (diff) | |
| download | samba-66627e798249d73b208a7c271ce7e44bb3a59305.tar.gz samba-66627e798249d73b208a7c271ce7e44bb3a59305.tar.xz samba-66627e798249d73b208a7c271ce7e44bb3a59305.zip | |
r14997: Fix build of static libraries. Libraries build fine now, but linking doesn't
work yet.
| -rw-r--r-- | source/build/smb_build/makefile.pm | 8 | ||||
| -rw-r--r-- | source/smb_server/config.mk | 2 | ||||
| -rw-r--r-- | source/smbd/config.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm index e511cbaca2e..197cbc9551f 100644 --- a/source/build/smb_build/makefile.pm +++ b/source/build/smb_build/makefile.pm @@ -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__ ); diff --git a/source/smb_server/config.mk b/source/smb_server/config.mk index d41ec24acaa..f460a375f57 100644 --- a/source/smb_server/config.mk +++ b/source/smb_server/config.mk @@ -2,7 +2,7 @@ ####################### # Start SUBSYSTEM SMB -[SUBSYSTEM::SMB] +[SUBSYSTEM::SMB_SERVER] OBJ_FILES = \ smb_server.o \ tcon.o \ diff --git a/source/smbd/config.mk b/source/smbd/config.mk index 11e42c3d28d..9f47e20e5e5 100644 --- a/source/smbd/config.mk +++ b/source/smbd/config.mk @@ -17,7 +17,7 @@ INIT_FUNCTION = server_service_smb_init OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = service REQUIRED_SUBSYSTEMS = \ - SMB + SMB_SERVER # End MODULE server_smb ################################################ |