diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-08 14:49:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:03:59 -0500 |
| commit | a45445682047a60dd435f8a3e2176bb217b68c55 (patch) | |
| tree | 25fa0a3e01e4dfd1fd1a29c8d1176fad8fae695a | |
| parent | c42923a4e3769b5a259d3461714944f77047cc64 (diff) | |
| download | samba-a45445682047a60dd435f8a3e2176bb217b68c55.tar.gz samba-a45445682047a60dd435f8a3e2176bb217b68c55.tar.bz2 samba-a45445682047a60dd435f8a3e2176bb217b68c55.zip | |
r14997: Fix build of static libraries. Libraries build fine now, but linking doesn't
work yet.
(This used to be commit d3106699dba7a4344511134dd2cf1bfa2f4bc7ab)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 8 | ||||
| -rw-r--r-- | source4/smb_server/config.mk | 2 | ||||
| -rw-r--r-- | source4/smbd/config.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index e511cbaca2..197cbc9551 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/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/source4/smb_server/config.mk b/source4/smb_server/config.mk index d41ec24aca..f460a375f5 100644 --- a/source4/smb_server/config.mk +++ b/source4/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/source4/smbd/config.mk b/source4/smbd/config.mk index 11e42c3d28..9f47e20e5e 100644 --- a/source4/smbd/config.mk +++ b/source4/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 ################################################ |