gnome-build r481 - in trunk: . src/backends/libgbf_am src/backends/libgbf_am/GBF

[jhs svn gnome org]

Author: jhs
Date: Tue Jan 22 14:23:03 2008
New Revision: 481
URL: http://svn.gnome.org/viewvc/gnome-build?rev=481&view=rev

Log:
2008-01-22  Philipp Kerling <k philipp gmail com>

        Reviewed by Johannes Schmid <jhs gnome org>

        * src/backends/libgbf_am/gbf-am-parse.in:
        Removed check_LTLIBRARIES restriction, added expanding vars in
        SUBDIRS (#450604)

        * src/backends/libgbf_am/GBF/AmFiles.pm:
        Changed variable detection rule to also match ${VAR} (#450604)



Modified:
   trunk/ChangeLog
   trunk/src/backends/libgbf_am/GBF/AmFiles.pm
   trunk/src/backends/libgbf_am/gbf-am-parse.in

Modified: trunk/src/backends/libgbf_am/GBF/AmFiles.pm
==============================================================================
--- trunk/src/backends/libgbf_am/GBF/AmFiles.pm	(original)
+++ trunk/src/backends/libgbf_am/GBF/AmFiles.pm	Tue Jan 22 14:23:03 2008
@@ -1622,10 +1622,10 @@
     my ($var_name, $repl);
 
     # Expand normal macros
-    while ($source =~ /\$\((\w*)\)/) {
+    while ($source =~ /\$[({](\w*)[)}]/) {
 	$var_name = $1;
 	$repl = &empty_if_undef ($expansion_set{$var_name}{contents});
-	$source =~ s/\$\($var_name\)/$repl/;
+	$source =~ s/\$[({]$var_name[)}]/$repl/;
     }
 
     # Expand substitution macros $(macro:search=replace)

Modified: trunk/src/backends/libgbf_am/gbf-am-parse.in
==============================================================================
--- trunk/src/backends/libgbf_am/gbf-am-parse.in	(original)
+++ trunk/src/backends/libgbf_am/gbf-am-parse.in	Tue Jan 22 14:23:03 2008
@@ -618,12 +618,6 @@
 {
     my ($prefix, $primary, $group) = @_;
 
-    # Check if it is one of the special cases
-    if ($prefix eq "check" && $primary eq "LTLIBRARIES") {
-	&report_error (200, gettext("Shared libraries cannot have the 'check' prefix"));
-	return "";
-    };
-
     if ($prefix eq "EXTRA" || $prefix eq "noinst" || $prefix eq "check") {
 	return $prefix;
     };
@@ -961,6 +955,10 @@
 	# Expand EXTRA_DIST
 	$group->{config}{extra_dist} = 
 	    &trim (&expand_one_var ($group->{config}{extra_dist}, %macros));
+	
+	# Expand subdirs
+	$group->{config}{subdirs} =
+	    &trim (&expand_one_var ($group->{config}{subdirs}, %macros));
     };
 }