summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-03-04 01:26:19 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-03-04 01:26:19 +0100
commite018501ca8e3e12e52557eafa66d104fe65088ae (patch)
tree9f094ae09da770e8a09d06c21aa5fc9990097fa2 /source4
parent2d1c06c5781600a0efcf9becd3e2773dbbbf2cc7 (diff)
downloadsamba-e018501ca8e3e12e52557eafa66d104fe65088ae.tar.gz
samba-e018501ca8e3e12e52557eafa66d104fe65088ae.tar.bz2
samba-e018501ca8e3e12e52557eafa66d104fe65088ae.zip
Fix some paths.
(This used to be commit bb16e51e60df296fa7b89eeeba6b80908099dda6)
Diffstat (limited to 'source4')
-rw-r--r--source4/auth/gensec/config.mk4
-rw-r--r--source4/build/smb_build/output.pm10
-rwxr-xr-xsource4/heimdal_build/asn1_deps.pl2
-rw-r--r--source4/lib/socket_wrapper/config.mk2
-rw-r--r--source4/lib/util/config.mk2
5 files changed, 9 insertions, 11 deletions
diff --git a/source4/auth/gensec/config.mk b/source4/auth/gensec/config.mk
index 1f32f5ecd3..660c2353af 100644
--- 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 ffab456d68..3c3a8a6b48 100644
--- 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 d320331c8b..6b6c723ff3 100755
--- 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 99ff5c7bd1..f7e874d8e2 100644
--- 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 c0c19c2529..85394513cd 100644
--- 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 \