Avoid redetermining paths; use already stored values.

(This used to be commit 0d223ddc39b7438dbce6716f1f00c29579a1f4c4)

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index ba25035ea597a53cd16717be24995f8d478f06e8..46a092d69f54b2ea2463d932e06592f2ab46f3c3 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -20,8 +20,8 @@ my $INPUT = {};
 my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
 
 my $subsys_output_type;
-$subsys_output_type = ["MERGED_OBJ"];
-#$subsys_output_type = ["STATIC_LIBRARY"];
+#$subsys_output_type = ["MERGED_OBJ"];
+$subsys_output_type = ["STATIC_LIBRARY"];
 
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b84caa12d7fc08c90f09b089303ece51d7f8f327..dc9e1e99113bb00b0f6739753ff34e7cfb054741 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -230,7 +230,7 @@ sub SharedLibrary($$)
 {
        my ($self,$ctx) = @_;
 
-       push (@{$self->{shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
+       push (@{$self->{shared_libs}}, $ctx->{RESULT_SHARED_LIBRARY}) if (defined($ctx->{SO_VERSION}));
 
        $self->_prepare_list($ctx, "DEPEND_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
@@ -252,8 +252,7 @@ sub SharedLibrary($$)
 
        $self->output(<< "__EOD__"
 #
-
-$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
+$ctx->{RESULT_SHARED_LIBRARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$\@
        \@mkdir -p $ctx->{SHAREDDIR}
        \@\$(SHLD) \$(SHLD_FLAGS) \$(INTERN_LDFLAGS) -o \$\@ \$(INSTALL_LINK_FLAGS) \\
@@ -275,7 +274,7 @@ sub MergedObj($$)
        push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
        $self->output(<< "__EOD__"
 #
-$ctx->{TARGET_MERGED_OBJ}: \$($ctx->{NAME}_FULL_OBJ_LIST)
+$ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Partially linking \$@
        \@mkdir -p bin/mergedobj
        \$(PARTLINK) -o \$@ \$($ctx->{NAME}_FULL_OBJ_LIST)
@@ -290,7 +289,7 @@ sub StaticLibrary($$)
 
        return unless (defined($ctx->{OBJ_FILES}));
 
-       push (@{$self->{static_libs}}, $ctx->{TARGET_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY");
+       push (@{$self->{static_libs}}, $ctx->{RESULT_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY");
 
        $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
        $self->_prepare_list($ctx, "OBJ_LIST");
@@ -300,7 +299,7 @@ sub StaticLibrary($$)
 
        $self->output(<< "__EOD__"
 #
-$ctx->{TARGET_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)
+$ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$@
        \@rm -f \$@
        \@mkdir -p $ctx->{STATICDIR}
@@ -323,23 +322,18 @@ sub Binary($$)
 {
        my ($self,$ctx) = @_;
 
-       my $installdir;
        my $extradir = "";
 
-       my $localdir = "bin$extradir";
-
-       $installdir = "bin$extradir";
-
        push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
                
        unless (defined($ctx->{INSTALLDIR})) {
        } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
-               push (@{$self->{sbin_progs}}, "$installdir/$ctx->{BINARY}");
+               push (@{$self->{sbin_progs}}, $ctx->{RESULT_BINARY});
        } elsif ($ctx->{INSTALLDIR} eq "BINDIR") {
-               push (@{$self->{bin_progs}}, "$installdir/$ctx->{BINARY}");
+               push (@{$self->{bin_progs}}, $ctx->{RESULT_BINARY});
        }
 
-       $self->output("binaries:: $localdir/$ctx->{BINARY}\n");
+       $self->output("binaries:: $ctx->{TARGET_BINARY}\n");
 
        $self->_prepare_list($ctx, "OBJ_LIST");
        $self->_prepare_list($ctx, "FULL_OBJ_LIST");
@@ -347,7 +341,7 @@ sub Binary($$)
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
 $self->output(<< "__EOD__"
-$installdir/$ctx->{BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
+$ctx->{RESULT_BINARY}: \$($ctx->{NAME}_DEPEND_LIST) \$($ctx->{NAME}_FULL_OBJ_LIST)
        \@echo Linking \$\@
 __EOD__
        );

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 0ddb9e4efbe3d127264f49091a1894b25c654d92..586ea121cbba8e96bed58968524ba8df13eede40 100644 (file)
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -85,8 +85,9 @@ sub generate_shared_library($)
                $lib->{LIBRARY_REALNAME} = "$lib->{LIBRARY_REALNAME}.\$($lib->{NAME}_VERSION)";
        } 
        
-       $lib->{TARGET_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}";
-       $lib->{OUTPUT_SHARED_LIBRARY} = $lib->{TARGET_SHARED_LIBRARY};
+       $lib->{RESULT_SHARED_LIBRARY} = "$lib->{SHAREDDIR}/$lib->{LIBRARY_REALNAME}";
+       $lib->{OUTPUT_SHARED_LIBRARY} = "-l$link_name";
+       $lib->{TARGET_SHARED_LIBRARY} = $lib->{RESULT_SHARED_LIBRARY};
 }
 
 sub generate_merged_obj($)
@@ -97,7 +98,8 @@ sub generate_merged_obj($)
        $link_name =~ s/^LIB//;
 
        $lib->{MERGED_OBJNAME} = lc($link_name).".o";
-       $lib->{TARGET_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
+       $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
+       $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ};
 }
 
 sub generate_static_library($)
@@ -113,11 +115,12 @@ sub generate_static_library($)
        $lib->{LIBRARY_NAME} = "lib".lc($link_name).".a";
 
        if (defined($lib->{OBJ_FILES})) {
-               $lib->{TARGET_STATIC_LIBRARY} = "bin/static/$lib->{LIBRARY_NAME}";
+               $lib->{RESULT_STATIC_LIBRARY} = "bin/static/$lib->{LIBRARY_NAME}";
+               $lib->{TARGET_STATIC_LIBRARY} = $lib->{RESULT_STATIC_LIBRARY};
                $lib->{STATICDIR} = 'bin/static';
                $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name);
        } else {
-               $lib->{TARGET_STATIC_LIBRARY} = "";
+               $lib->{RESULT_STATIC_LIBRARY} = "";
                $lib->{OUTPUT_STATIC_LIBRARY} = "";
        }
 }
@@ -129,8 +132,9 @@ sub generate_binary($)
        $bin->{DEPEND_LIST} = [];
        push(@{$bin->{LINK_FLAGS}}, "\$($bin->{NAME}\_OBJ_LIST)");
 
-       $bin->{DEBUGDIR} = "bin/";
-       $bin->{TARGET_BINARY} = $bin->{OUTPUT_BINARY} = "$bin->{DEBUGDIR}/$bin->{NAME}";
+       $bin->{DEBUGDIR} = "bin";
+       $bin->{RESULT_BINARY} = $bin->{OUTPUT_BINARY} = "$bin->{DEBUGDIR}/$bin->{NAME}";
+       $bin->{TARGET_BINARY} = $bin->{RESULT_BINARY};
        $bin->{BINARY} = $bin->{NAME};
 }
 

diff --git a/source4/configure.ac b/source4/configure.ac
index 17925dfa995a0b8b28cc4e6449bb4f9abf991597..1c17126f4a5198ebcb39e6debb518cff57e91cf4 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -142,10 +142,10 @@ AC_SUBST(INTERN_LDFLAGS)
 AC_SUBST(INSTALL_LINK_FLAGS)
 if test $USESHARED = "true";
 then
-       INTERN_LDFLAGS="-L\${builddir}/bin/shared"
+       INTERN_LDFLAGS="-L\${builddir}/bin/shared -L\${builddir}/bin/static"
        INSTALL_LINK_FLAGS="-Wl,-rpath-link,\${builddir}/bin/shared";
 else
-       INTERN_LDFLAGS="-L\${builddir}/bin/static"
+       INTERN_LDFLAGS="-L\${builddir}/bin/static -L\${builddir}/bin/shared"
 fi
 
 builddir_headers=""

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 67620fac894a11fee1bb7169b7acb1b190b25b0c..bd96d5e8f52f935468c924dd57c77921fb38976e 100644 (file)
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -118,7 +118,7 @@ PUBLIC_DEPENDENCIES = LIBCLI_RAW LIBSAMBA-ERRORS LIBCLI_AUTH \
 [SUBSYSTEM::LIBCLI_RAW]
 PRIVATE_PROTO_HEADER = raw/raw_proto.h
 PRIVATE_DEPENDENCIES = LIBCLI_COMPOSITE LP_RESOLVE gensec LIBCLI_RESOLVE LIBSECURITY LIBNDR
-#LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
+LDFLAGS = $(LIBCLI_SMB_COMPOSITE_OUTPUT)
 PUBLIC_DEPENDENCIES = samba-socket LIBPACKET gensec LIBCRYPTO CREDENTIALS 
 OBJ_FILES = raw/rawfile.o \
                raw/smb_signing.o \