From c865582e9c6159082a59f0bf2bea0538dc277217 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 16 Feb 2008 17:12:01 +0100 Subject: Use make to create lists of pc files and prototype headers. (This used to be commit a932a2e37d1aa86cca769398721318b3942fad83) --- source4/build/smb_build/main.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 3ed0327d6d..9690c465a7 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -56,7 +56,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}}); -- cgit From bc282d843d9326233c25f7715c8006b890f89d52 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 25 Feb 2008 18:51:39 +0100 Subject: Move configure output details out of perl code. (This used to be commit e33f357fb00cd504181562eaf2ca1d4511d5ec51) --- source4/build/smb_build/main.pl | 7 ------- 1 file changed, 7 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 9690c465a7..27ba2d36e1 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -93,11 +93,4 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir}, summary::show($OUTPUT, \%config::config); -if ($shared_libs_used) { - print < Date: Mon, 25 Feb 2008 19:11:04 +0100 Subject: Merge env.pm into makefile.pm. (This used to be commit 28bbd546195461d4b8747bc6cefd6320f8efe17d) --- source4/build/smb_build/main.pl | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 27ba2d36e1..6d4a7321a4 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/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; -- cgit From 27a0b3210f4262ddaf43ec1627c81a475121cade Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 25 Feb 2008 18:44:52 +0100 Subject: Remove workaround for some non-GNU makes. (This used to be commit 0580357fb4b10e4a751d281e209f6a87e1c88143) --- source4/build/smb_build/main.pl | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 6d4a7321a4..d2d3dc9c5c 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -92,4 +92,6 @@ cflags::create_cflags($OUTPUT, $config::config{srcdir}, summary::show($OUTPUT, \%config::config); +print "To build Samba, run $config::config{MAKE}\n"; + 1; -- cgit From d8d9a6ef040b6c3e7946e6ae2cba2b28234c8baf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 26 Feb 2008 15:11:47 +0100 Subject: Move manpage management out of the perl build system. (This used to be commit 1dd6bea507f1f5e26cccf89148280721260a4673) --- source4/build/smb_build/main.pl | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index d2d3dc9c5c..b9e1037423 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -67,7 +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}); -- cgit From 1ada7108408f567f61cfbf2b625730ba898452db Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 29 Feb 2008 14:23:38 +0100 Subject: Move public header accumulation out of the perl code. Never install generated prototype files. It's easier to break the API when using them and they're not easily readable for 3rd party users. Conflicts: source/auth/config.mk source/auth/credentials/config.mk source/auth/gensec/config.mk source/build/smb_build/config_mk.pm source/build/smb_build/main.pl source/build/smb_build/makefile.pm source/dsdb/config.mk source/lib/charset/config.mk source/lib/tdr/config.mk source/lib/util/config.mk source/libcli/config.mk source/libcli/ldap/config.mk source/librpc/config.mk source/param/config.mk source/rpc_server/config.mk source/torture/config.mk (This used to be commit 6c659689ed4081f1d7a6253c538c7f01784197ba) --- source4/build/smb_build/main.pl | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index b9e1037423..6c205a69f0 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -67,7 +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->Header($key) if defined($key->{PUBLIC_HEADERS}); $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or defined($key->{PUBLIC_PROTO_HEADER}); } -- cgit From 3017c49fb3feedf8bb147247d5410ceb70a04f4e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 29 Feb 2008 14:43:54 +0100 Subject: Remove cruft that dealt with public prototype headers. (This used to be commit 438997c17951fa7f0a9fb14be14c3b364ed3ad90) --- source4/build/smb_build/main.pl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 6c205a69f0..14f334a6ea 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -67,8 +67,7 @@ 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->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or - defined($key->{PUBLIC_PROTO_HEADER}); + $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}); } foreach my $key (values %$OUTPUT) { -- cgit From 4453348aed08e9d164454a8660081b5c177cd44b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 25 Feb 2008 18:29:04 +0100 Subject: Include CFLAGS overrides in make file. (This used to be commit 2ead1523608d9cd9a58cf55bcee2c8a39b6895e0) --- source4/build/smb_build/main.pl | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 14f334a6ea..7312749f28 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/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::cflags; use smb_build::summary; use smb_build::config; use strict; @@ -68,6 +67,7 @@ foreach my $key (values %$OUTPUT) { grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}}); $mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES}); $mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}); + $mkenv->CFlags($key); } foreach my $key (values %$OUTPUT) { @@ -84,9 +84,6 @@ foreach my $key (values %$OUTPUT) { $mkenv->write("data.mk"); header::create_smb_build_h($OUTPUT, "include/build.h"); -cflags::create_cflags($OUTPUT, $config::config{srcdir}, - $config::config{builddir}, "extra_cflags.txt"); - summary::show($OUTPUT, \%config::config); print "To build Samba, run $config::config{MAKE}\n"; -- cgit From 98db64734367da419877dd87d0548d93be23d483 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 29 Feb 2008 17:04:57 +0100 Subject: Remove duplicate message. (This used to be commit 87074881a926f6216276ebc263047c1ffb8aee10) --- source4/build/smb_build/main.pl | 2 -- 1 file changed, 2 deletions(-) (limited to 'source4/build/smb_build/main.pl') diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl index 7312749f28..c3dc46461b 100644 --- a/source4/build/smb_build/main.pl +++ b/source4/build/smb_build/main.pl @@ -86,6 +86,4 @@ header::create_smb_build_h($OUTPUT, "include/build.h"); summary::show($OUTPUT, \%config::config); -print "To build Samba, run $config::config{MAKE}\n"; - 1; -- cgit