* sources.am, Makefile.in: Rebuilt.

	* scripts/makemake.tcl: Accept -verbose command-line option.
	(is_verbose): New global.
	(verbose): Use it.
	(classify_source_file): Don't special case '.' for 'package'
	type.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@114051 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 15 insertions, 4 deletions

diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl
index ebd5ad5b273..4eadeabab13 100755
--- a/libjava/scripts/makemake.tcl
+++ b/libjava/scripts/makemake.tcl
@@ -7,9 +7,15 @@ proc makearray {name} {
   unset ary(_)
 }
 
+global is_verbose
+set is_verbose 0
+
 # Verbose printer.
 proc verbose {text} {
-# puts stderr $text
+  global is_verbose
+  if {$is_verbose} {
+    puts stderr $text
+  }
 }
 
 # This maps a name to its style:
@@ -160,9 +166,9 @@ proc classify_source_file {basedir file} {
   set pkg $file
   while {1} {
     if {[info exists package_map($pkg)]} {
-      # If the entry for '.' is 'package', then set up a new entry for
-      # the file's package.
-      if {$pkg == "." && $package_map($pkg) == "package"} {
+      # If the entry is 'package', then set up a new entry for the
+      # file's package.
+      if {$package_map($pkg) == "package"} {
 	set pkg [file dirname $file]
 	set package_map($pkg) package
       }
@@ -353,6 +359,11 @@ proc pp_var {name valueList {pre ""} {post ""}} {
   puts ""
 }
 
+global argv
+if {[llength $argv] > 0 && [lindex $argv 0] == "-verbose"} {
+  set is_verbose 1
+}
+
 # Read the proper .omit files.
 read_omit_file standard.omit.in
 read_omit_file classpath/lib/standard.omit