summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 13:10:30 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 13:10:30 +0100
commite5d7bd3821327b509ebf38232e8b972455829f88 (patch)
tree313505e8974396d85744a57449ea8f1387452715
parent72642989e8863553b88185e5e33e602eb78d8516 (diff)
downloadsamba-e5d7bd3821327b509ebf38232e8b972455829f88.tar.gz
samba-e5d7bd3821327b509ebf38232e8b972455829f88.tar.bz2
samba-e5d7bd3821327b509ebf38232e8b972455829f88.zip
Reenable partial linking
(This used to be commit a7512fb059d5dcb6bf70418622206eec94153693)
-rw-r--r--source4/build/smb_build/main.pl4
-rw-r--r--source4/heimdal_build/config.mk1
-rw-r--r--source4/libcli/config.mk2
3 files changed, 3 insertions, 4 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 46a092d69f..ba25035ea5 100644
--- 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/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 604516ccf6..1e627967fb 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -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
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index bd96d5e8f5..67620fac89 100644
--- 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 \