diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-25 18:29:04 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-29 15:00:55 +0100 |
commit | 4453348aed08e9d164454a8660081b5c177cd44b (patch) | |
tree | 27aca9ee02383714021b861df4dadaead3944888 /source4/build/smb_build/main.pl | |
parent | 3017c49fb3feedf8bb147247d5410ceb70a04f4e (diff) | |
download | samba-4453348aed08e9d164454a8660081b5c177cd44b.tar.gz samba-4453348aed08e9d164454a8660081b5c177cd44b.tar.bz2 samba-4453348aed08e9d164454a8660081b5c177cd44b.zip |
Include CFLAGS overrides in make file.
(This used to be commit 2ead1523608d9cd9a58cf55bcee2c8a39b6895e0)
Diffstat (limited to 'source4/build/smb_build/main.pl')
-rw-r--r-- | source4/build/smb_build/main.pl | 5 |
1 files changed, 1 insertions, 4 deletions
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"; |