summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-03 13:41:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:39 -0500
commit25bb00fbcd409572e1c19c05fdc42c883936780b (patch)
treee6096ae728e2a5645e39ede037de0cae39cd12ab /source4/build
parent097ffed015826ff31b5f89742deed8f4d21b88f3 (diff)
downloadsamba-25bb00fbcd409572e1c19c05fdc42c883936780b.tar.gz
samba-25bb00fbcd409572e1c19c05fdc42c883936780b.tar.bz2
samba-25bb00fbcd409572e1c19c05fdc42c883936780b.zip
r12693: Move core data structures out of smb.h into core.h
torture prototypes in seperate header (This used to be commit 73610639b23ca3743077193fa0b1de7c7f65944d)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/config_mk.pm7
-rw-r--r--source4/build/smb_build/smb_build_h.pm12
3 files changed, 12 insertions, 8 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 487556b513..0657eb2bc8 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -8,3 +8,4 @@
- improve (un)install scripts (rewrite in perl?)
- proper #include dependencies
- determine dependencies from #include lines ?
+- clean up include/smb.h
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 6a8426974f..7827315541 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -30,7 +30,9 @@ my $section_types = {
"MANPAGE" => "string",
"PUBLIC_PROTO_HEADER" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PRIVATE_PROTO_HEADER" => "string",
+
+ "PUBLIC_HEADERS" => "list",
},
"MODULE" => {
"SUBSYSTEM" => "string",
@@ -58,7 +60,8 @@ my $section_types = {
"MANPAGE" => "string",
"INSTALLDIR" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PRIVATE_PROTO_HEADER" => "string",
+ "PUBLIC_HEADERS" => "string"
},
"LIBRARY" => {
"MAJOR_VERSION" => "string",
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index 998e1a5990..3b178c8226 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -1,5 +1,5 @@
# SMB Build System
-# - create output for smb_build.h
+# - create output for build.h
#
# Copyright (C) Stefan (metze) Metzmacher 2004
# Released under the GNU GPL
@@ -20,7 +20,7 @@ sub _add_define_section($)
return $output;
}
-sub _prepare_smb_build_h($)
+sub _prepare_build_h($)
{
my $depend = shift;
my @defines = ();
@@ -65,7 +65,7 @@ sub _prepare_smb_build_h($)
}
#
- # loop over all SMB_BUILD_H define sections
+ # loop over all BUILD_H define sections
#
foreach (@defines) { $output .= _add_define_section($_); }
@@ -73,10 +73,10 @@ sub _prepare_smb_build_h($)
}
###########################################################
-# This function creates include/smb_build.h from the SMB_BUILD
+# This function creates include/build.h from the SMB_BUILD
# context
#
-# create_smb_build_h($SMB_BUILD_CTX)
+# create_build_h($SMB_BUILD_CTX)
#
# $SMB_BUILD_CTX - the global SMB_BUILD context
#
@@ -87,7 +87,7 @@ sub create_smb_build_h($$)
open(SMB_BUILD_H,">$file") || die ("Can't open `$file'\n");
print SMB_BUILD_H "/* autogenerated by build/smb_build/main.pl */\n";
- print SMB_BUILD_H _prepare_smb_build_h($CTX);
+ print SMB_BUILD_H _prepare_build_h($CTX);
close(SMB_BUILD_H);
print __FILE__.": creating $file\n";