Author: jelmer Date: 2006-04-08 14:49:59 +0000 (Sat, 08 Apr 2006) New Revision: 14997
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=14997 Log: Fix build of static libraries. Libraries build fine now, but linking doesn't work yet. Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm branches/SAMBA_4_0/source/smb_server/config.mk branches/SAMBA_4_0/source/smbd/config.mk Changeset: Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm =================================================================== --- branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-08 14:48:04 UTC (rev 14996) +++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm 2006-04-08 14:49:59 UTC (rev 14997) @@ -133,7 +133,7 @@ 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 @@ { 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 @@ $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) [EMAIL PROTECTED] Linking \$@ [EMAIL PROTECTED](STLD) \$(STLD_FLAGS) \$@ \\ - \$($ctx->{TYPE}_$ctx->{NAME}_LINK_LIST) + \$($ctx->{TYPE}_$ctx->{NAME}_OBJ_LIST) __EOD__ ); Modified: branches/SAMBA_4_0/source/smb_server/config.mk =================================================================== --- branches/SAMBA_4_0/source/smb_server/config.mk 2006-04-08 14:48:04 UTC (rev 14996) +++ branches/SAMBA_4_0/source/smb_server/config.mk 2006-04-08 14:49:59 UTC (rev 14997) @@ -2,7 +2,7 @@ ####################### # Start SUBSYSTEM SMB -[SUBSYSTEM::SMB] +[SUBSYSTEM::SMB_SERVER] OBJ_FILES = \ smb_server.o \ tcon.o \ Modified: branches/SAMBA_4_0/source/smbd/config.mk =================================================================== --- branches/SAMBA_4_0/source/smbd/config.mk 2006-04-08 14:48:04 UTC (rev 14996) +++ branches/SAMBA_4_0/source/smbd/config.mk 2006-04-08 14:49:59 UTC (rev 14997) @@ -17,7 +17,7 @@ OUTPUT_TYPE = MERGEDOBJ SUBSYSTEM = service REQUIRED_SUBSYSTEMS = \ - SMB + SMB_SERVER # End MODULE server_smb ################################################
