From c8af9559dc44b578d3b49620f690652a1676e9bd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 26 Feb 2008 15:11:47 +0100 Subject: Move manpage management out of the perl build system. (This used to be commit a660ab262e7202baccf16cb8b2bc47cb8efacc34) --- source4/smbd/config.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/smbd/config.mk') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index c4d1070992..2482780756 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -27,7 +27,6 @@ PRIVATE_PROTO_HEADER = pidfile.h # Start BINARY smbd [BINARY::smbd] INSTALLDIR = SBINDIR -MANPAGE = smbd.8 OBJ_FILES = \ server.o PRIVATE_DEPENDENCIES = \ @@ -44,5 +43,7 @@ PRIVATE_DEPENDENCIES = \ ntvfs \ share \ CLUSTER + +MANPAGES += smbd/smbd.8 # End BINARY smbd ################################# -- cgit From b29d47edcf2767d7f9e9f63332079c6e8e89946c Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Mar 2008 18:25:28 +0100 Subject: Move object file lists to the Makefile. (This used to be commit a7e6d2a1832db388fdafa1279f84c9a8bbfc87d6) --- source4/smbd/config.mk | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'source4/smbd/config.mk') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 2482780756..1ef244bb59 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -12,23 +12,23 @@ PRIVATE_DEPENDENCIES = \ [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 +44,8 @@ PRIVATE_DEPENDENCIES = \ share \ CLUSTER +smbd_OBJ_FILES = smbd/server.o + MANPAGES += smbd/smbd.8 # End BINARY smbd ################################# -- cgit From 6cf92e604d5d23018426f22d9cc9edd8d2da12ae Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 4 Mar 2008 13:06:08 +0100 Subject: Fix the build. (This used to be commit 49ef8d0c197fa61dc5c524e4a0f569af72d3c0e9) --- source4/smbd/config.mk | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'source4/smbd/config.mk') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 1ef244bb59..dc8afeba78 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -1,15 +1,5 @@ # 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 PRIVATE_DEPENDENCIES = \ -- cgit From 4f0db429588e550d97db21fc0c17231c2ea2a25d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 19:41:33 +0200 Subject: Use variables for source directory in a couple more places. (This used to be commit 56bb2907c67d55967f54ce74b029f05067a187c5) --- source4/smbd/config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/smbd/config.mk') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index 006135f818..b8b87ba435 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -5,7 +5,7 @@ PRIVATE_PROTO_HEADER = service_proto.h PRIVATE_DEPENDENCIES = \ MESSAGING samba-socket -service_OBJ_FILES = $(addprefix smbd/, \ +service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service.o \ service_stream.o \ service_task.o) @@ -13,7 +13,7 @@ service_OBJ_FILES = $(addprefix smbd/, \ [SUBSYSTEM::PIDFILE] PRIVATE_PROTO_HEADER = pidfile.h -PIDFILE_OBJ_FILES = smbd/pidfile.o +PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o ################################# # Start BINARY smbd @@ -34,8 +34,8 @@ PRIVATE_DEPENDENCIES = \ share \ CLUSTER -smbd_OBJ_FILES = smbd/server.o +smbd_OBJ_FILES = $(smbdsrcdir)/server.o -MANPAGES += smbd/smbd.8 +MANPAGES += $(smbdsrcdir)/smbd.8 # End BINARY smbd ################################# -- cgit From 4c8756f147f8b9a2806fd76e4cb06bb99d391516 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 22:30:08 +0200 Subject: Create prototype headers from Makefile directory, without smb_build in the middle. (This used to be commit f4a77b96f9c17d853348b70794026e5b9e384942) --- source4/smbd/config.mk | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/smbd/config.mk') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index b8b87ba435..f5f88ffa7d 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -1,7 +1,6 @@ # server subsystem [SUBSYSTEM::service] -PRIVATE_PROTO_HEADER = service_proto.h PRIVATE_DEPENDENCIES = \ MESSAGING samba-socket @@ -10,11 +9,14 @@ service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service_stream.o \ service_task.o) +$(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c)) + [SUBSYSTEM::PIDFILE] -PRIVATE_PROTO_HEADER = pidfile.h PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o +$(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c)) + ################################# # Start BINARY smbd [BINARY::smbd] -- cgit From 4c70cda986c86fe536327321d04c29eca81b6409 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 May 2008 23:02:47 +0200 Subject: Fix a couple (well, little more than that..) of typos. (This used to be commit a6b52119940a900fb0de3864b8bca94e2965cc24) --- source4/smbd/config.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smbd/config.mk') diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk index f5f88ffa7d..e60f444456 100644 --- a/source4/smbd/config.mk +++ b/source4/smbd/config.mk @@ -9,13 +9,13 @@ service_OBJ_FILES = $(addprefix $(smbdsrcdir)/, \ service_stream.o \ service_task.o) -$(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c)) +$(eval $(call proto_header_template,$(smbdsrcdir)/service_proto.h,$(service_OBJ_FILES:.o=.c))) [SUBSYSTEM::PIDFILE] PIDFILE_OBJ_FILES = $(smbdsrcdir)/pidfile.o -$(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c)) +$(eval $(call proto_header_template,$(smbdsrcdir)/pidfile.h,$(PIDFILE_OBJ_FILES:.o=.c))) ################################# # Start BINARY smbd -- cgit