Reenable partial linking
authorJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 12:10:30 +0000 (13:10 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 18 Feb 2008 12:10:30 +0000 (13:10 +0100)
source/build/smb_build/main.pl
source/heimdal_build/config.mk
source/libcli/config.mk

index 46a092d69f54b2ea2463d932e06592f2ab46f3c3..ba25035ea597a53cd16717be24995f8d478f06e8 100644 (file)
@@ -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") {
index 604516ccf640a88d16d4b7c08fd2fc3195e80b12..1e627967fb7e03e753c0a36e805fc2542c9c5f4e 100644 (file)
@@ -412,7 +412,6 @@ OBJ_FILES = \
        ../heimdal/lib/roken/estrdup.o \
        ../heimdal/lib/roken/erealloc.o \
        ../heimdal/lib/roken/simple_exec.o \
-       ../heimdal/lib/roken/simple_exec.o \
        ../heimdal/lib/roken/strcollect.o \
        ../heimdal/lib/roken/rtbl.o \
        replace.o
index bd96d5e8f52f935468c924dd57c77921fb38976e..67620fac894a11fee1bb7169b7acb1b190b25b0c 100644 (file)
@@ -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 \