r14572: Give libraries saner names, remove some .pc files, make some things

[bbaumbach/samba-autobuild/.git] / source4 / build / smb_build / config_mk.pm

diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 56960f044c6646c9977141a87805c4342b3c8039..41e90c33b7a3517da82e7641302a088dc3af3d07 100644 (file)
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -25,7 +25,6 @@ my $section_types = {
                "REQUIRED_SUBSYSTEMS"   => "list",
 
                "ENABLE"                => "bool",
-               "NOPROTO"               => "bool",
 
                "MANPAGE"               => "string",
 
@@ -35,6 +34,7 @@ my $section_types = {
                "PUBLIC_HEADERS"        => "list",
 
                "EXTRA_CFLAGS"          => "string",
+               "STANDARD_VISIBILITY"   => "string"
                },
        "MODULE" => {
                "SUBSYSTEM"             => "string",
@@ -45,9 +45,8 @@ my $section_types = {
                "REQUIRED_SUBSYSTEMS"   => "list",
 
                "ENABLE"                => "bool",
-               "NOPROTO"               => "bool",
 
-               "OUTPUT_TYPE" => "string",
+               "OUTPUT_TYPE"           => "string",
 
                "MANPAGE"               => "string",
                "PRIVATE_PROTO_HEADER"  => "string",
@@ -60,21 +59,21 @@ my $section_types = {
                "REQUIRED_SUBSYSTEMS"   => "list",
 
                "ENABLE"                => "bool",
-               "NOPROTO"               => "bool",
 
                "MANPAGE"               => "string",
                "INSTALLDIR"            => "string",
                "PRIVATE_PROTO_HEADER"  => "string",
-               "PUBLIC_HEADERS" => "string", 
+               "PUBLIC_PROTO_HEADER"   => "string",
+               "PUBLIC_HEADERS"        => "list", 
 
-               "EXTRA_CFLAGS"          => "string"
+               "EXTRA_CFLAGS"          => "string",
+               "STANDARD_VISIBILITY"   => "string"
                },
        "LIBRARY" => {
-               "MAJOR_VERSION"         => "string",
-               "MINOR_VERSION"         => "string",
-               "RELEASE_VERSION"       => "string",
+               "VERSION"               => "string",
+               "SO_VERSION"            => "string",
                
-               "INIT_FUNCTION_TYPE" => "string",
+               "INIT_FUNCTION_TYPE"    => "string",
 
                "OBJ_FILES"             => "list",
 
@@ -83,7 +82,6 @@ my $section_types = {
                "REQUIRED_SUBSYSTEMS"   => "list",
 
                "ENABLE"                => "bool",
-               "NOPROTO"               => "bool",
 
                "MANPAGE"               => "string",
 
@@ -92,7 +90,8 @@ my $section_types = {
                "PUBLIC_PROTO_HEADER"   => "string",
                "PRIVATE_PROTO_HEADER"  => "string",
 
-               "EXTRA_CFLAGS"          => "string"
+               "EXTRA_CFLAGS"          => "string",
+               "STANDARD_VISIBILITY"   => "string"
                }
 };
 
@@ -140,7 +139,7 @@ sub run_config_mk($$$)
                        $prev = "";
                }
 
-               if ($line =~ /^\[([a-zA-Z0-9_:]+)\][\t ]*$/) 
+               if ($line =~ /^\[([-a-zA-Z0-9_:]+)\][\t ]*$/) 
                {
                        $section = $1;
                        $infragment = 0;