Avoid autogenerating the Makefile but rather include a data.mk file

[samba.git] / source / build / smb_build / config_mk.pm

diff --git a/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 61e436942d5e468fc061dabf63b2d038f38b2b2f..aa075490bce071bccec5935626372cbdd89b0c40 100644 (file)
--- a/source/build/smb_build/config_mk.pm
+++ b/source/build/smb_build/config_mk.pm
@@ -18,6 +18,7 @@ my $section_types = {
                "CFLAGS"                => "list",
                "CPPFLAGS"              => "list",
                "LDFLAGS"               => "list",
+               "PC_NAME" => "string",
                },
        "PYTHON" => {
                SWIG_FILE => "string",
@@ -26,6 +27,7 @@ my $section_types = {
                "OBJ_FILES" => "list",
                "ENABLE"                => "bool",
                "LDFLAGS"               => "list",
+               "CFLAGS"                => "list",
        },
        "SUBSYSTEM" => {
                "OBJ_FILES"             => "list",
@@ -87,6 +89,9 @@ my $section_types = {
                "VERSION"               => "string",
                "SO_VERSION"            => "string",
                "LIBRARY_REALNAME" => "string",
+
+               "PC_NAME" => "string",
+               "PC_FILE" => "string",
                
                "INIT_FUNCTION_TYPE"    => "string",
                "INIT_FUNCTION_SENTINEL" => "string",
@@ -94,8 +99,6 @@ my $section_types = {
 
                "OBJ_FILES"             => "list",
 
-               "DESCRIPTION"           => "string",
-
                "PRIVATE_DEPENDENCIES"  => "list",
                "PUBLIC_DEPENDENCIES"   => "list",
 
@@ -215,7 +218,6 @@ sub run_config_mk($$$$)
        # corresponding input files. The curlies are so you can match the
        # BEGIN/END pairs in a text editor.
        $makefile .= "# BEGIN{ $parsing_file\n";
-       $makefile .= "dir = $basedir\n";
 
        foreach (@lines) {
                $linenum++;