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

[samba.git] / source4 / build / smb_build / main.pl

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 7500a8c81be43e20c147e714c1770fe5e88860bb..ff540215f75e257619b97b993891aeee2f94dd84 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -19,6 +19,9 @@ use strict;
 my $INPUT = {};
 my $mkfile = smb_build::config_mk::run_config_mk($INPUT, $config::config{srcdir}, $config::config{builddir}, "main.mk");
 
+my $subsys_output_type;
+$subsys_output_type = ["STATIC_LIBRARY"];
+
 my $library_output_type;
 if ($config::config{USESHARED} eq "true") {
        $library_output_type = ["SHARED_LIBRARY", "STATIC_LIBRARY"];
@@ -35,10 +38,12 @@ if ($config::config{USESHARED} eq "true") {
        $module_output_type = ["INTEGRATED"];
 }
 
-my $DEPEND = smb_build::input::check($INPUT, \%config::enabled, 
-       ["STATIC_LIBRARY"], $library_output_type, $module_output_type);
+my $DEPEND = smb_build::input::check($INPUT, \%config::enabled,
+                                    $subsys_output_type,
+                                    $library_output_type,
+                                    $module_output_type);
 my $OUTPUT = output::create_output($DEPEND, \%config::config);
-$config::config{SUBSYSTEM_OUTPUT_TYPE} = ["STATIC_LIBRARY"];
+$config::config{SUBSYSTEM_OUTPUT_TYPE} = $subsys_output_type;
 $config::config{LIBRARY_OUTPUT_TYPE} = $library_output_type;
 $config::config{MODULE_OUTPUT_TYPE} = $module_output_type;
 my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
@@ -49,25 +54,45 @@ foreach my $key (values %$OUTPUT) {
        $mkenv->Integrated($key) if grep(/INTEGRATED/, @{$key->{OUTPUT_TYPE}});
 }
 
+my $shared_libs_used = 0;
+
 foreach my $key (values %$OUTPUT) {
        next unless defined $key->{OUTPUT_TYPE};
 
        $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
-       $mkenv->PkgConfig($key) if $key->{TYPE} eq "LIBRARY" 
-                                   and defined($key->{VERSION});
-       $mkenv->SharedLibrary($key) if grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
+       if (defined($key->{PC_FILE})) {
+               push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}");
+       } 
+       $mkenv->SharedLibrary($key) if ($key->{TYPE} eq "LIBRARY") and
+                                       grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
+       if ($key->{TYPE} eq "LIBRARY" and 
+           ${$key->{OUTPUT_TYPE}}[0] eq "SHARED_LIBRARY") {
+               $shared_libs_used = 1;
+       }
+       $mkenv->SharedModule($key) if ($key->{TYPE} eq "MODULE" or 
+                                                                  $key->{TYPE} eq "PYTHON") and
+                                       grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
        $mkenv->Binary($key) if grep(/BINARY/, @{$key->{OUTPUT_TYPE}});
+       $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
        $mkenv->Manpage($key) if defined($key->{MANPAGE});
        $mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
        $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or 
-                                                                defined($key->{PUBLIC_PROTO_HEADER});
+                                        defined($key->{PUBLIC_PROTO_HEADER});
 }
 
-$mkenv->write("Makefile");
+$mkenv->write("data.mk");
 header::create_smb_build_h($OUTPUT, "include/build.h");
 
-cflags::create_cflags($OUTPUT, "extra_cflags.txt");
+cflags::create_cflags($OUTPUT, $config::config{srcdir},
+                   $config::config{builddir}, "extra_cflags.txt");
 
 summary::show($OUTPUT, \%config::config);
 
+if ($shared_libs_used) {
+       print <<EOF;
+To run binaries without installing, set the following environment variable:
+       $config::config{LIB_PATH_VAR}=$config::config{builddir}/bin/shared
+EOF
+}
+
 1;