svn commit: samba r14874 - in branches/SAMBA_4_0/source/build/smb_build: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-04-03 00:46:17 +0000 (Mon, 03 Apr 2006)
New Revision: 14874

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

Log:
Allow overriding LIBRARY_REALNAME

Modified:
   branches/SAMBA_4_0/source/build/smb_build/TODO
   branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/build/smb_build/output.pm


Changeset:
Modified: branches/SAMBA_4_0/source/build/smb_build/TODO
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-03 00:24:59 UTC (rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/TODO	2006-04-03 00:46:17 UTC (rev 14874)
@@ -1,3 +1,5 @@
+- make --enable-dso the default
+- per-subsystem CFLAGS (which are inherited)
 - pregenerate more stuff (IDL, manpages, lex/yacc?)
 - saner names for:
 	libcli.so.0.0.1 (rename to libsmb?)

Modified: branches/SAMBA_4_0/source/build/smb_build/config_mk.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2006-04-03 00:24:59 UTC (rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/config_mk.pm	2006-04-03 00:46:17 UTC (rev 14874)
@@ -74,6 +74,7 @@
 	"LIBRARY" => {
 		"VERSION"		=> "string",
 		"SO_VERSION"		=> "string",
+		"LIBRARY_REALNAME" => "string",
 		
 		"INIT_FUNCTION_TYPE"	=> "string",
 

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-04-03 00:24:59 UTC (rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2006-04-03 00:46:17 UTC (rev 14874)
@@ -204,7 +204,7 @@
 	}
 
 	if ($ctx->{TYPE} eq "LIBRARY") {
-		push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}");
+		push (@{$self->{shared_libs}}, "$ctx->{DEBUGDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
 		push (@{$self->{installable_shared_libs}}, "$installdir/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
 	} elsif ($ctx->{TYPE} eq "MODULE") {
 		push (@{$self->{shared_modules}}, "$ctx->{TARGET}");
@@ -260,7 +260,7 @@
 
 	my $singlesoarg = "";
 	
-	if ($self->{duplicate_build}) {
+	if ($ctx->{DEBUGDIR} ne $installdir) {
 		$self->output(<< "__EOD__"
 #
 

Modified: branches/SAMBA_4_0/source/build/smb_build/output.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-04-03 00:24:59 UTC (rev 14873)
+++ branches/SAMBA_4_0/source/build/smb_build/output.pm	2006-04-03 00:46:17 UTC (rev 14874)
@@ -58,16 +58,22 @@
 		$lib_name = "lib$link_name";
 	}
 
-	if ($lib->{TYPE} eq "MODULE") {
-		$lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}";
-		$lib->{RELEASEDIR} = "bin/install/modules/$lib->{SUBSYSTEM}";
-		$lib->{LIBRARY_REALNAME} = $link_name;
-		$lib->{LIBRARY_REALNAME} =~ s/^$lib->{SUBSYSTEM}_//g;
-		$lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
+	if (defined($lib->{LIBRARY_REALNAME})) {
+		$lib->{BASEDIR} =~ s/^\.\///g;
+		$lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}";
+		$lib->{DEBUGDIR} = $lib->{RELEASEDIR} = $lib->{BASEDIR};
 	} else {
-		$lib->{DEBUGDIR} = "bin";
-		$lib->{RELEASEDIR} = "bin/install";
-		$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
+		if ($lib->{TYPE} eq "MODULE") {
+			$lib->{DEBUGDIR} = "bin/modules/$lib->{SUBSYSTEM}";
+			$lib->{RELEASEDIR} = "bin/install/modules/$lib->{SUBSYSTEM}";
+			$lib->{LIBRARY_REALNAME} = $link_name;
+			$lib->{LIBRARY_REALNAME} =~ s/^$lib->{SUBSYSTEM}_//g;
+			$lib->{LIBRARY_REALNAME}.= ".\$(SHLIBEXT)";
+		} else {
+			$lib->{DEBUGDIR} = "bin";
+			$lib->{RELEASEDIR} = "bin/install";
+			$lib->{LIBRARY_REALNAME} = "$lib_name.\$(SHLIBEXT)";
+		}
 	}
 
 	if (defined($lib->{VERSION})) {