diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 16:24:07 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 16:24:07 +0200 |
| commit | cceac63aaab26a72e2f3fd150dd1e4e83a0e5279 (patch) | |
| tree | 6203cca724fc5f17f068e3fd4d0b403fdff3f8f9 /source4/smbd/config.mk | |
| parent | 7c7880695b02df4cbe0faab959846c63d0cc0536 (diff) | |
| parent | 72fce654072b2d7317ff21c95558bd365701d5dd (diff) | |
| download | samba-cceac63aaab26a72e2f3fd150dd1e4e83a0e5279.tar.gz samba-cceac63aaab26a72e2f3fd150dd1e4e83a0e5279.tar.bz2 samba-cceac63aaab26a72e2f3fd150dd1e4e83a0e5279.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-wsgi
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit d27de633656f8a699222df77c4c58326890889a2)
Diffstat (limited to 'source4/smbd/config.mk')
| -rw-r--r-- | source4/smbd/config.mk | 32 |
1 files changed, 13 insertions, 19 deletions
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 6cbfa16045..e60f444456 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -1,34 +1,26 @@ # server subsystem -################################################ -# Start MODULE service_auth -[MODULE::service_auth] -INIT_FUNCTION = server_service_auth_init -SUBSYSTEM = service +[SUBSYSTEM::service] PRIVATE_DEPENDENCIES = \ - auth -# End MODULE server_auth -################################################ + MESSAGING samba-socket -[SUBSYSTEM::service] -PRIVATE_PROTO_HEADER = service_proto.h -OBJ_FILES = \ +service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service.o \ service_stream.o \ - service_task.o -PRIVATE_DEPENDENCIES = \ - MESSAGING samba-socket + service_task.o) + +$(eval $(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c))) [SUBSYSTEM::PIDFILE] -OBJ_FILES = pidfile.o -PRIVATE_PROTO_HEADER = pidfile.h + +PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o + +$(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c))) ################################# # Start BINARY smbd [BINARY::smbd] INSTALLDIR = SBINDIR -OBJ_FILES = \ - server.o PRIVATE_DEPENDENCIES = \ process_model \ service \ @@ -44,6 +36,8 @@ PRIVATE_DEPENDENCIES = \ share \ CLUSTER -MANPAGES += smbd/smbd.8 +smbd_OBJ_FILES = $(smbdsrcdir)/server.o + +MANPAGES += $(smbdsrcdir)/smbd.8 # End BINARY smbd ################################# |