[SCM] Samba Shared Repository - branch v4-0-test updated - release-4-0-0alpha2-747-gd746fcd

[Jelmer Vernooij]

The branch, v4-0-test has been updated
       via  d746fcde1006b4b7b33aa65bef9d2fea3ebc9162 (commit)
       via  742e50aeb54d779d383cbf73132224bad3b09777 (commit)
       via  fc9b9853124c8d172172f88e1e4939db5970df25 (commit)
       via  eff9c9cedd7410c3c089d090e3f83f8cc10f1831 (commit)
       via  54e7d10fe0eb4837b00b9b049fbd59a56ee85bea (commit)
       via  95967e8bfbdce2e073a3fc938f1271da40b543d3 (commit)
      from  df5b712001c16acf275d9a79fd765cf8976508d6 (commit)

http://gitweb.samba.org/?samba.git;a=shortlog;h=v4-0-test


- Log -----------------------------------------------------------------
commit d746fcde1006b4b7b33aa65bef9d2fea3ebc9162
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 19:28:59 2008 +0100

    Use make variables in cflags file (now supported by cflags.pl)

commit 742e50aeb54d779d383cbf73132224bad3b09777
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 19:10:21 2008 +0100

    Support including files in the cflags.pl script.

commit fc9b9853124c8d172172f88e1e4939db5970df25
Merge: eff9c9cedd7410c3c089d090e3f83f8cc10f1831 df5b712001c16acf275d9a79fd765cf8976508d6
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 18:26:28 2008 +0100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
    
    Conflicts:
    
    	source/Makefile
    	source/rules.mk

commit eff9c9cedd7410c3c089d090e3f83f8cc10f1831
Merge: 54e7d10fe0eb4837b00b9b049fbd59a56ee85bea eb04de69c0e319e18b148191946808f81e1cc8c4
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 13:26:59 2008 +0100

    Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial

commit 54e7d10fe0eb4837b00b9b049fbd59a56ee85bea
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 12:39:47 2008 +0100

    Fix typo.

commit 95967e8bfbdce2e073a3fc938f1271da40b543d3
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Feb 11 01:42:29 2008 +0100

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

-----------------------------------------------------------------------

Summary of changes:
 source/build/m4/public.m4        |    8 ++++----
 source/build/smb_build/cflags.pm |    2 ++
 source/script/cflags.pl          |   35 +++++++++++++++++++++++++----------
 3 files changed, 31 insertions(+), 14 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/build/m4/public.m4 b/source/build/m4/public.m4
index e8fbe4b..d045cf4 100644
--- a/source/build/m4/public.m4
+++ b/source/build/m4/public.m4
@@ -33,7 +33,7 @@ SMB_INFO_SUBSYSTEMS="$SMB_INFO_SUBSYSTEMS
 @<:@SUBSYSTEM::$1@:>@
 OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
-CFLAGS = $4
+CFLAGS = \$($1_CFLAGS)
 ENABLE = YES
 # End Subsystem $1
 ###################################
@@ -58,7 +58,7 @@ OBJ_FILES = \$($1_OBJ_FILES)
 PRIVATE_DEPENDENCIES = $3
 VERSION = $4
 SO_VERSION = $5 
-CFLAGS = $6
+CFLAGS = \$($1_CFLAGS)
 LDFLAGS = \$($1_LDFLAGS)
 PC_NAME = $8
 ENABLE = YES
@@ -152,8 +152,8 @@ SMB_INFO_EXT_LIBS="$SMB_INFO_EXT_LIBS
 # Start Ext Lib $1
 @<:@EXT_LIB::$1@:>@
 LIBS = \$($1_LIBS)
-CFLAGS = $3
-CPPFLAGS = $4
+CFLAGS = \$($1_CFLAGS)
+CPPFLAGS = \$($1_CPPFLAGS)
 LDFLAGS = \$($1_LDFLAGS)
 PC_NAME = $6
 # End Ext Lib $1
diff --git a/source/build/smb_build/cflags.pm b/source/build/smb_build/cflags.pm
index ad6cd42..a4ab90a 100755
--- a/source/build/smb_build/cflags.pm
+++ b/source/build/smb_build/cflags.pm
@@ -23,6 +23,8 @@ sub create_cflags($$$$) {
 
 	open(CFLAGS_TXT,">$file") || die ("Can't open `$file'\n");
 
+	print CFLAGS_TXT "include mkconfig.mk\n";
+
 	my $src_ne_build = ($srcdir ne $builddir) ? 1 : 0;
 
 	foreach my $key (values %{$CTX}) {
diff --git a/source/script/cflags.pl b/source/script/cflags.pl
index 7f435d4..37b5aa7 100755
--- a/source/script/cflags.pl
+++ b/source/script/cflags.pl
@@ -8,20 +8,35 @@ use strict;
 
 my $target = shift;
 
-sub check_flags($)
+my $vars = {};
+
+sub check_flags($$);
+sub check_flags($$)
 {
-	my ($name)=@_;
-	open (IN, "extra_cflags.txt");
-	while (<IN> =~ /^([^:]+): (.*)$/) {
-		next unless (grep(/^$target$/, (split / /, $1)));
-		$_ = $2;
-		s/^CFLAGS\+=//;
-		print "$_ ";
+	my ($path, $name)=@_;
+	open (IN, $path);
+	foreach my $line (<IN>) {
+		if ($line =~ /^include (.*)$/) {
+			check_flags($1, $name);
+		} elsif ($line =~ /^([A-Za-z0-9_]+) =(.*)$/) {
+			$vars->{$1} = $2;
+		} elsif ($line =~ /^([^:]+): (.*)$/) {
+			next unless (grep(/^$target$/, (split / /, $1)));
+			my $data = $2;
+			$data =~ s/^CFLAGS\+=//;
+			foreach my $key (keys %$vars) {
+				my $val = $vars->{$key};
+				$data =~ s/\$\($key\)/$val/g;
+			}
+			# Remove undefined variables
+			$data =~ s/\$\([A-Za-z0-9_]+\)//g;
+			print "$data ";
+		}
 	}
 	close(IN);
-	print "\n";
 }
 
-check_flags($target);
+check_flags("extra_cflags.txt", $target);
+print "\n";
 
 exit 0;


-- 
Samba Shared Repository