Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

[kai/samba-autobuild/.git] / source4 / smbd / config.mk

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 6cbfa160459c052aea873a435e2a6690de341f45..006135f818a763f321aa7597b76b5d0fd4147707 100644 (file)
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -1,34 +1,24 @@
 # server subsystem
 
-################################################
-# Start MODULE service_auth
-[MODULE::service_auth]
-INIT_FUNCTION = server_service_auth_init
-SUBSYSTEM = service
-PRIVATE_DEPENDENCIES = \
-               auth
-# End MODULE server_auth
-################################################
-
 [SUBSYSTEM::service]
 PRIVATE_PROTO_HEADER = service_proto.h
-OBJ_FILES = \
-               service.o \
-               service_stream.o \
-               service_task.o
 PRIVATE_DEPENDENCIES = \
                MESSAGING samba-socket
 
+service_OBJ_FILES = $(addprefix smbd/, \
+               service.o \
+               service_stream.o \
+               service_task.o)
+
 [SUBSYSTEM::PIDFILE]
-OBJ_FILES = pidfile.o
 PRIVATE_PROTO_HEADER = pidfile.h
 
+PIDFILE_OBJ_FILES = smbd/pidfile.o
+
 #################################
 # Start BINARY smbd
 [BINARY::smbd]
 INSTALLDIR = SBINDIR
-OBJ_FILES = \
-               server.o
 PRIVATE_DEPENDENCIES = \
                process_model \
                service \
@@ -44,6 +34,8 @@ PRIVATE_DEPENDENCIES = \
                share \
                CLUSTER
 
+smbd_OBJ_FILES = smbd/server.o
+
 MANPAGES += smbd/smbd.8
 # End BINARY smbd
 #################################