summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-12-26 18:03:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:47:45 -0500
commitd8e35f882879e189f55b3bca818dd44cc5f0c6fa (patch)
treee9a9696ef8406b06cdaa2dee0dfcc2d01d594d76 /source4/build
parent448483199fb436309735f5203b3282fca2c517ec (diff)
downloadsamba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.gz
samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.bz2
samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.zip
r12498: Eliminate INIT_OBJ_FILES and ADD_OBJ_FILES. We were not using
the difference between these at all, and in the future the fact that INIT_OBJ_FILES include smb_build.h will be sufficient to have recompiles at the right time. (This used to be commit b24f2583edee38abafa58578d8b5c4b43e517def)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/m4/public.m49
-rw-r--r--source4/build/smb_build/TODO5
-rw-r--r--source4/build/smb_build/config_mk.pm6
3 files changed, 5 insertions, 15 deletions
diff --git a/source4/build/m4/public.m4 b/source4/build/m4/public.m4
index 89ea0f3853..5ce976f1ab 100644
--- a/source4/build/m4/public.m4
+++ b/source4/build/m4/public.m4
@@ -4,7 +4,7 @@ dnl Copyright (C) 2004 Stefan Metzmacher
dnl Copyright (C) 2004-2005 Jelmer Vernooij
dnl Published under the GPL
dnl
-dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
+dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
dnl
dnl SMB_EXT_LIB_ENABLE(name,default_build)
dnl
@@ -18,7 +18,7 @@ dnl #######################################################
dnl ### And now the implementation ###
dnl #######################################################
-dnl SMB_SUBSYSTEM(name,init_obj_files,add_obj_files,required_subsystems)
+dnl SMB_SUBSYSTEM(name,obj_files,required_subsystems)
AC_DEFUN([SMB_SUBSYSTEM],
[
if test -z "$[SMB_SUBSYSTEM_NOPROTO_][$1]"; then
@@ -29,9 +29,8 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
###################################
# Start Subsystem $1
@<:@SUBSYSTEM::$1@:>@
-INIT_OBJ_FILES = $2
-ADD_OBJ_FILES = $3
-REQUIRED_SUBSYSTEMS = $4
+OBJ_FILES = $2
+REQUIRED_SUBSYSTEMS = $3
ENABLE = YES
# End Subsystem $1
###################################
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index f98a3d2bb5..0d9b1bab1d 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -3,12 +3,9 @@
- get rid of include/structs.h
- install Samba-specific headers in $INCLUDEDIR/samba-4.0. talloc.h, tdb.h and
ldb.h belong in $INCLUDEDIR
-- init functions may be called more then once as different libraries
- (in Samba or other projects) can use the same (3rd) library.
- add register function to smbtorture
- init functions per shared library / binary
- - add init functions + use lists of function pointers
- - rpc_ndr
+ - rpc_ndr
- list not automatically generated
- utility function for 'init mutex'
- install shared modules
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 3d55718541..ddc928c8e2 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -21,8 +21,6 @@ my $section_types = {
},
"SUBSYSTEM" => {
"INIT_FUNCTION" => "string",
- "INIT_OBJ_FILES" => "list",
- "ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list",
"REQUIRED_SUBSYSTEMS" => "list",
@@ -36,8 +34,6 @@ my $section_types = {
"SUBSYSTEM" => "string",
"INIT_FUNCTION" => "string",
- "INIT_OBJ_FILES" => "list",
- "ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list",
"REQUIRED_SUBSYSTEMS" => "list",
@@ -64,8 +60,6 @@ my $section_types = {
"RELEASE_VERSION" => "string",
"INIT_FUNCTION" => "string",
- "INIT_OBJ_FILES" => "list",
- "ADD_OBJ_FILES" => "list",
"OBJ_FILES" => "list",
"DESCRIPTION" => "string",