summaryrefslogtreecommitdiff
path: root/source4/ntvfs/posix
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-18 22:25:19 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-18 22:25:19 +0100
commitb4017955e19723e48b41b70c7ba313dcfcda5eb9 (patch)
tree138d37f4c9abc2dcecd38a6ba4e5c539b4927421 /source4/ntvfs/posix
parent1131d4c2545355ef793e468810655c0f72828368 (diff)
parentb136033421eb045b28f5928e4d2f9604cf704690 (diff)
downloadsamba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.gz
samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.tar.bz2
samba-b4017955e19723e48b41b70c7ba313dcfcda5eb9.zip
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts: source/build/smb_build/input.pm source/build/smb_build/main.pl source/build/smb_build/makefile.pm (This used to be commit bc11e3ef1c34923f5b13571926617a840ad554fe)
Diffstat (limited to 'source4/ntvfs/posix')
-rw-r--r--source4/ntvfs/posix/config.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/config.mk b/source4/ntvfs/posix/config.mk
index 6588be11ae..6879940337 100644
--- a/source4/ntvfs/posix/config.mk
+++ b/source4/ntvfs/posix/config.mk
@@ -31,7 +31,7 @@ PRIVATE_DEPENDENCIES = LIBAIO_LINUX
# Start MODULE ntvfs_posix
[MODULE::ntvfs_posix]
SUBSYSTEM = ntvfs
-OUTPUT_TYPE = INTEGRATED
+OUTPUT_TYPE = MERGED_OBJ
INIT_FUNCTION = ntvfs_posix_init
PRIVATE_PROTO_HEADER = vfs_posix_proto.h
OBJ_FILES = \