svn commit: samba r19575 - in branches/SAMBA_4_0/source: . bin bin/static build/smb_build

[jelmer]

Author: jelmer
Date: 2006-11-06 17:28:27 +0000 (Mon, 06 Nov 2006)
New Revision: 19575

WebSVN: 
http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19575

Log:
Build static libs in bin/static rather than bin/

Added:
   branches/SAMBA_4_0/source/bin/static/
Modified:
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm
   branches/SAMBA_4_0/source/main.mk


Changeset:

Property changes on: branches/SAMBA_4_0/source/bin/static
___________________________________________________________________
Name: svn:ignore
   + *.a


Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-11-06 
16:57:00 UTC (rev 19574)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm       2006-11-06 
17:28:27 UTC (rev 19575)
@@ -114,7 +114,7 @@
                $libdir = "\$(builddir)/bin/shared";
                $devld_install = " -Wl,-rpath-link,\$(builddir)/bin/shared";
        } else {
-               $libdir = "\$(builddir)/bin";
+               $libdir = "\$(builddir)/bin/static";
        }
        
        if (!(abs_path($self->{config}->{srcdir}) eq 
abs_path($self->{config}->{builddir}))) {
@@ -248,14 +248,14 @@
                $proto_fn =~ s/\(\*\)/$ctx->{INIT_FUNCTION}/;
 
                $self->output(<< "__EOD__"
-$ctx->{SHAREDDIR}/$ctx->{NAME}_init_module.c:
+bin/$ctx->{NAME}_init_module.c:
        [EMAIL PROTECTED] Creating \$\@
        [EMAIL PROTECTED] \"#include \\\"includes.h\\\"\" > \$\@
        [EMAIL PROTECTED] \"$proto_fn;\" >> \$\@
        [EMAIL PROTECTED] -e \"_PUBLIC_ $init_fn \\n{\\n\\treturn 
$ctx->{INIT_FUNCTION}();\\n}\\n\" >> \$\@
 __EOD__
 );
-               $init_obj = "$ctx->{SHAREDDIR}/$ctx->{NAME}_init_module.o";
+               $init_obj = "bin/$ctx->{NAME}_init_module.o";
        }
 
        my $soarg = "";

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-11-06 16:57:00 UTC 
(rev 19574)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm 2006-11-06 17:28:27 UTC 
(rev 19575)
@@ -89,7 +89,7 @@
        push(@{$lib->{LINK_FLAGS}}, "\$($lib->{TYPE}_$lib->{NAME}\_OBJ_LIST)");
 
        if (defined($lib->{OBJ_FILES})) {
-               $lib->{TARGET} = "bin/$lib->{LIBRARY_NAME}";
+               $lib->{TARGET} = "bin/static/$lib->{LIBRARY_NAME}";
        } else {
                $lib->{TARGET} = "";
        }

Modified: branches/SAMBA_4_0/source/main.mk
===================================================================
--- branches/SAMBA_4_0/source/main.mk   2006-11-06 16:57:00 UTC (rev 19574)
+++ branches/SAMBA_4_0/source/main.mk   2006-11-06 17:28:27 UTC (rev 19575)
@@ -253,7 +253,7 @@
        @-rm -f $(BIN_PROGS) $(SBIN_PROGS) $(BINARIES) $(TORTURE_PROGS)
        @echo Removing libraries
        @-rm -f $(STATIC_LIBRARIES) $(SHARED_LIBRARIES)
-       @-rm -f bin/*.a bin/shared/*.$(SHLIBEXT)
+       @-rm -f bin/static/*.a bin/shared/*.$(SHLIBEXT)
        @echo Removing modules
        @-rm -f bin/modules/*/*.$(SHLIBEXT)
        @-rm -f bin/*_init_module.c