Fix build with partial linking.

(This used to be commit bfad9610c472e8d7e3656e19c8dbb6b85727dc13)

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 46a092d69f54b2ea2463d932e06592f2ab46f3c3..4c09e32422bddfc21f9ebfee192b0abbff48727f 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -20,8 +20,7 @@ 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"];
 
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index 586ea121cbba8e96bed58968524ba8df13eede40..67b905ef558dc50b029ec2cfb6a97385ea139c72 100644 (file)
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -97,9 +97,14 @@ sub generate_merged_obj($)
        my $link_name = $lib->{NAME};
        $link_name =~ s/^LIB//;
 
-       $lib->{MERGED_OBJNAME} = lc($link_name).".o";
-       $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
-       $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ};
+       if (defined($lib->{OBJ_FILES})) {
+               $lib->{MERGED_OBJNAME} = lc($link_name).".o";
+               $lib->{RESULT_MERGED_OBJ} = $lib->{OUTPUT_MERGED_OBJ} = "bin/mergedobj/$lib->{MERGED_OBJNAME}";
+               $lib->{TARGET_MERGED_OBJ} = $lib->{RESULT_MERGED_OBJ};
+       } else {
+               $lib->{TARGET_MERGED_OBJ} = "";
+               $lib->{RESULT_MERGED_OBJ} = "";
+       }
 }
 
 sub generate_static_library($)
@@ -121,6 +126,7 @@ sub generate_static_library($)
                $lib->{OUTPUT_STATIC_LIBRARY} = "-l".lc($link_name);
        } else {
                $lib->{RESULT_STATIC_LIBRARY} = "";
+               $lib->{TARGET_STATIC_LIBRARY} = "";
                $lib->{OUTPUT_STATIC_LIBRARY} = "";
        }
 }

diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index 1e627967fb7e03e753c0a36e805fc2542c9c5f4e..b337fab2d0ea51ba660e337785a1007b486eb12d 100644 (file)
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -15,8 +15,7 @@ OBJ_FILES = \
        ../heimdal/kdc/digest.o \
        ../heimdal/kdc/process.o \
        ../heimdal/kdc/windc.o \
-       ../heimdal/kdc/kx509.o \
-       ../heimdal/lib/asn1/asn1_KRB5SignedPath.o
+       ../heimdal/kdc/kx509.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 HEIMDAL_HDB HEIMDAL_HEIM_ASN1 HEIMDAL_DIGEST_ASN1 HEIMDAL_KX509_ASN1
 PUBLIC_DEPENDENCIES = HEIMDAL_NTLM HEIMDAL_HCRYPTO
 # End SUBSYSTEM HEIMDAL_KDC
@@ -31,9 +30,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5
 [SUBSYSTEM::HEIMDAL_HDB_KEYS]
 CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb
 OBJ_FILES = \
-       ../heimdal/lib/hdb/keys.o \
-       ../heimdal/lib/hdb/asn1_Key.o \
-       ../heimdal/lib/hdb/asn1_Salt.o
+       ../heimdal/lib/hdb/keys.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5
 
 #######################
@@ -278,9 +275,7 @@ OBJ_FILES = \
        ../heimdal/lib/asn1/der_cmp.o \
        ../heimdal/lib/asn1/extra.o \
        ../heimdal/lib/asn1/timegm.o \
-       ../heimdal/lib/asn1/asn1_err.o \
-       ../heimdal/lib/asn1/asn1_krb5int32.o \
-       ../heimdal/lib/asn1/asn1_krb5uint32.o
+       ../heimdal/lib/asn1/asn1_err.o
 PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_COM_ERR
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
@@ -341,7 +336,7 @@ PRIVATE_DEPENDENCIES = \
        HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \
        HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \
        HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \
-       HEIMDAL_PKINIT_ASN1
+       HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1
 OBJ_FILES = \
        ../heimdal/lib/hx509/ca.o \
        ../heimdal/lib/hx509/cert.o \

diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index bd96d5e8f52f935468c924dd57c77921fb38976e..67620fac894a11fee1bb7169b7acb1b190b25b0c 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 \

diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 621939256c96e91eed9248320e0d29a813fcc16b..e53e0642721f12db71cb47604b31fea85009339f 100644 (file)
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -10,7 +10,8 @@ OBJ_FILES = \
                nsstest.o
 PRIVATE_DEPENDENCIES = \
                LIBSAMBA-UTIL \
-               LIBREPLACE_EXT
+               LIBREPLACE_EXT \
+               LIBSAMBA-CONFIG
 # End BINARY nsstest
 #################################
 

diff --git a/source4/param/config.mk b/source4/param/config.mk
index 8ded5f1a139fc722a49359bcef4c3ac6e9c51872..c3f50b13feadc4733881b890d7e66c625dda73df 100644 (file)
--- a/source4/param/config.mk
+++ b/source4/param/config.mk
@@ -1,7 +1,4 @@
-[LIBRARY::LIBSAMBA-CONFIG]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = samba-config.pc
+[SUBSYSTEM::LIBSAMBA-CONFIG]
 OBJ_FILES = loadparm.o \
                        params.o \
                        generic.o \

diff --git a/source4/smb_server/smb/config.mk b/source4/smb_server/smb/config.mk
index ddadc29ddb4eb8ff037aa3a894bbfc5ddc39efef..7927f295b93d6c9676e77022c0da64d890b76986 100644 (file)
--- a/source4/smb_server/smb/config.mk
+++ b/source4/smb_server/smb/config.mk
@@ -16,6 +16,5 @@ OBJ_FILES = \
                signing.o
 PUBLIC_DEPENDENCIES = \
                ntvfs LIBPACKET CREDENTIALS
-LDFLAGS = $(SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB_PROTOCOL
 #######################

diff --git a/source4/smb_server/smb2/config.mk b/source4/smb_server/smb2/config.mk
index b7d7cdc2827540a2883805dd7b3d9ee9de00d244..d5ba43b3a8b232dbc256e8be8a627e6e3124d388 100644 (file)
--- a/source4/smb_server/smb2/config.mk
+++ b/source4/smb_server/smb2/config.mk
@@ -13,6 +13,5 @@ OBJ_FILES = \
                keepalive.o
 PUBLIC_DEPENDENCIES = \
                ntvfs LIBPACKET LIBCLI_SMB2
-LDFLAGS = $(SMB_SERVER_OUTPUT)
 # End SUBSYSTEM SMB2_PROTOCOL
 #######################