Fix some paths.

(This used to be commit bb16e51e60df296fa7b89eeeba6b80908099dda6)

diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 1f32f5ecd3e1cbc7dccf571683c5bc6fa9b42fb9..660c2353af6c3c1b9dc3be143d0aec2c8a5818ba 100644 (file)
--- a/source4/auth/gensec/config.mk
+++ b/source4/auth/gensec/config.mk
@@ -24,7 +24,7 @@ PRIVATE_DEPENDENCIES = CREDENTIALS KERBEROS auth auth_sam
 # End MODULE gensec_krb5
 ################################################
 
-gensec_krb5_OBJ_FILES = $(addprefix auth/, gensec_krb5.o)
+gensec_krb5_OBJ_FILES = $(addprefix auth/gensec/, gensec_krb5.o)
 
 ################################################
 # Start MODULE gensec_gssapi
@@ -35,7 +35,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_GSSAPI CREDENTIALS KERBEROS
 # End MODULE gensec_gssapi
 ################################################
 
-gensec_gssapi_OBJ_FILES = $(addprefix auth/, gensec_gssapi.o)
+gensec_gssapi_OBJ_FILES = $(addprefix auth/gensec/, gensec_gssapi.o)
 
 ################################################
 # Start MODULE cyrus_sasl

diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index ffab456d68db6ddf7b36231e00caf8ad8eb54c9f..3c3a8a6b48b0a99a36fc3acf238185decf24e321 100644 (file)
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -82,12 +82,10 @@ sub generate_static_library($)
 
        $lib->{LIBRARY_NAME} = "lib".lc($link_name).".a";
 
-       if (defined($lib->{OBJ_FILES})) {
-               $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);
-       }
+       $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);
 }
 
 sub generate_binary($)

diff --git a/source4/heimdal_build/asn1_deps.pl b/source4/heimdal_build/asn1_deps.pl
index d320331c8b5c1dd9111db9eede89a6ae1fd7481d..6b6c723ff36e1c708663496e2c4f32338f69f9b5 100755 (executable)
--- a/source4/heimdal_build/asn1_deps.pl
+++ b/source4/heimdal_build/asn1_deps.pl
@@ -89,7 +89,7 @@ print '[SUBSYSTEM::HEIMDAL_'.uc($prefix).']'."\n";
 print "CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -I$dirname\n";
 print "\nPUBLIC_DEPENDENCIES = $depstr\n\n";
 
-print "HEIMDAL_".uc($prefix)."OBJ_LIST = \$(addprefix heimdal_build/,";
+print "HEIMDAL_".uc($prefix)."OBJ_FILES = \$(addprefix heimdal/,";
 foreach $o_file (@o_files) {
     print "\\\n\t$o_file";
 }

diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index 99ff5c7bd18e35859d56fc4d897329aa22926719..f7e874d8e28e91264a6975adcbeea55fbf87cd48 100644 (file)
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -7,4 +7,4 @@ PRIVATE_DEPENDENCIES = EXT_SOCKET
 
 PUBLIC_HEADERS += lib/socket_wrapper/socket_wrapper.h
 
-SOCKET_WRAPPER_OBJ_FILES = lib/socket/socket_wrapper.o
+SOCKET_WRAPPER_OBJ_FILES = lib/socket_wrapper/socket_wrapper.o

diff --git a/source4/lib/util/config.mk b/source4/lib/util/config.mk
index c0c19c25292d180e03ac1e8abb91addbfb9f97aa..85394513cd1dac2e7d0fe865ad89fcd727619d92 100644 (file)
--- a/source4/lib/util/config.mk
+++ b/source4/lib/util/config.mk
@@ -4,7 +4,7 @@
 PUBLIC_DEPENDENCIES = \
                LIBTALLOC LIBCRYPTO \
                SOCKET_WRAPPER EXT_NSL \
-               CHARSET EXECINFO
+               CHARSET EXECINFO DYNCONFIG
 
 LIBSAMBA-UTIL_OBJ_FILES = $(addprefix lib/util/, \
        xfile.o \