diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 19:50:13 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:04 -0500 |
commit | 620d759f49f4b648d0fa4a84e67f1cecbbdd0f06 (patch) | |
tree | 15a768135a197cdd7b3acd369c029ce9248e9012 /source4/smbd | |
parent | 710ea949886dd57c66dc6d397e0ea41c89736107 (diff) | |
download | samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.gz samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.tar.bz2 samba-620d759f49f4b648d0fa4a84e67f1cecbbdd0f06.zip |
r15298: Fix the build using a few hacks in the build system.
Recursive dependencies are now forbidden (the build system
will bail out if there are any).
I've split up auth_sam.c into auth_sam.c and sam.c. Andrew,
please rename sam.c / move its contents to whatever/wherever you think suits
best.
(This used to be commit 6646384aaf3e7fa2aa798c3e564b94b0617ec4d0)
Diffstat (limited to 'source4/smbd')
-rw-r--r-- | source4/smbd/config.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 3033ed1bb0..8238fe5384 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -14,7 +14,7 @@ PUBLIC_DEPENDENCIES = \ # Start MODULE service_smb [MODULE::service_smb] INIT_FUNCTION = server_service_smb_init -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED SUBSYSTEM = service PUBLIC_DEPENDENCIES = \ SMB_SERVER @@ -26,7 +26,7 @@ PUBLIC_DEPENDENCIES = \ [MODULE::service_rpc] INIT_FUNCTION = server_service_rpc_init SUBSYSTEM = service -OUTPUT_TYPE = MERGEDOBJ +OUTPUT_TYPE = INTEGRATED PUBLIC_DEPENDENCIES = \ dcerpc_server # End MODULE server_rpc @@ -129,6 +129,10 @@ PRIVATE_DEPENDENCIES = \ LIBSAMBA-UTIL \ PIDFILE \ POPT_SAMBA \ - LIBPOPT + LIBPOPT \ + gensec \ + registry \ + ntptr \ + ntvfs # End BINARY smbd ################################# |