Move public header accumulation out of the perl code.

[jelmer/samba4-debian.git] / source / build / smb_build / main.pl

diff --git a/source/build/smb_build/main.pl b/source/build/smb_build/main.pl
index 3ed0327d6d7fef90c7adff22d1abe16dd359cef3..6c205a69f0202fc54cd385a2ec4940d3e5b7e1c2 100644 (file)
--- a/source/build/smb_build/main.pl
+++ b/source/build/smb_build/main.pl
@@ -10,7 +10,6 @@ use smb_build::header;
 use smb_build::input;
 use smb_build::config_mk;
 use smb_build::output;
-use smb_build::env;
 use smb_build::cflags;
 use smb_build::summary;
 use smb_build::config;
@@ -56,7 +55,7 @@ foreach my $key (values %$OUTPUT) {
        $mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
        $mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
        if (defined($key->{PC_FILE})) {
-               push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}");
+               $mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n");
        } 
        $mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
                                        grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
@@ -68,8 +67,6 @@ foreach my $key (values %$OUTPUT) {
                                                                   $key->{TYPE} eq "PYTHON") and
                                        grep(/SHARED_LIBRARY/, @{$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});
 }
@@ -93,11 +90,6 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir},
 
 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
-}
+print "To build Samba, run $config::config{MAKE}\n";
 
 1;