[gtk-doc] scangobj, make: add --verbose switch here too and adjust the makefiles

[Stefan Kost <stefkost src gnome org>]

commit c77d80d8dc4ea1d86a3bb976fd4b7f7b71412f82
Author: Stefan Kost <ensonic users sf net>
Date:   Wed Apr 13 16:45:35 2011 +0300

    scangobj,make: add --verbose switch here too and adjust the makefiles
    
    Don't show compiling the scanner when V=0.

 gtk-doc.make              |   10 +++++++++-
 gtk-doc.notmpl.make       |   10 +++++++++-
 gtkdoc-scangobj.in        |   12 ++++++++++--
 tests/gtk-doc.make        |    7 ++++++-
 tests/gtk-doc.notmpl.make |    7 ++++++-
 5 files changed, 40 insertions(+), 6 deletions(-)
---
diff --git a/gtk-doc.make b/gtk-doc.make
index 24751b7..057a32b 100644
--- a/gtk-doc.make
+++ b/gtk-doc.make
@@ -105,7 +105,15 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    echo "  DOC   Introspecting gobjects"; \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE); \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
 	        test -f $$i || touch $$i ; \
diff --git a/gtk-doc.notmpl.make b/gtk-doc.notmpl.make
index fae69bc..c2c4d62 100644
--- a/gtk-doc.notmpl.make
+++ b/gtk-doc.notmpl.make
@@ -103,7 +103,15 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    echo "  DOC   Introspecting gobjects"; \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE); \
+	    scanobj_options=""; \
+	    gtkdoc-scangobj 2>&1 --help | grep  >/dev/null "\-\-verbose"; \
+	    if test "$(?)" = "0"; then \
+	        if test "x$(V)" = "x1"; then \
+	            scanobj_options="--verbose"; \
+	        fi; \
+	    fi; \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
 	        test -f $$i || touch $$i ; \
diff --git a/gtkdoc-scangobj.in b/gtkdoc-scangobj.in
index c2087f4..82746d4 100644
--- a/gtkdoc-scangobj.in
+++ b/gtkdoc-scangobj.in
@@ -35,6 +35,7 @@ require "gtkdoc-common.pl";
 # name of documentation module
 my $MODULE;
 my $OUTPUT_DIR;
+my $VERBOSE;
 my $PRINT_VERSION;
 my $PRINT_HELP;
 my $TYPE_INIT_FUNC="g_type_init(); g_type_class_ref(G_TYPE_OBJECT)";
@@ -47,6 +48,7 @@ my $QUERY_CHILD_PROPERTIES;
 	   'type-init-func' => \$TYPE_INIT_FUNC,
 	   'query-child-properties' => \$QUERY_CHILD_PROPERTIES,
 	   'output-dir' => \$OUTPUT_DIR,
+	   'verbose' => \$VERBOSE,
 	   'version' => \$PRINT_VERSION,
 	   'help' => \$PRINT_HELP);
 
@@ -76,6 +78,7 @@ gtkdoc-scangobj version @VERSION@ - introspect g-objects
 --query-child-properties=FUNC A function that returns a list of child
                               properties for a class
 --output-dir=DIRNAME          The directory where the results are stored
+--verbose                     Print extra output while processing
 --version                     Print the version of this program
 --help                        Print this help
 EOF
@@ -1365,14 +1368,19 @@ if ($CC =~ /libtool/) {
   $o_file = "$MODULE-scan.o"
 }
 
+my $stdout="";
+if (!defined($VERBOSE) or $VERBOSE eq "0") {
+    $stdout=">/dev/null";
+}
+
 # Compiling scanner
-$command = "$CC $CFLAGS -c -o $o_file $MODULE-scan.c";
+$command = "$CC $stdout $CFLAGS -c -o $o_file $MODULE-scan.c";
 system("($command)") == 0 or die "Compilation of scanner failed: $!\n";
 
 # Linking scanner
 # FIXME: Can we turn off as-needed for the docs (or better fix it?)
 #$command = "$LD -Wl,--no-as-needed $o_file $LDFLAGS -o $MODULE-scan";
-$command = "$LD $o_file $LDFLAGS -o $MODULE-scan";
+$command = "$LD $stdout $o_file $LDFLAGS -o $MODULE-scan";
 system("($command)") == 0 or die "Linking of scanner failed: $!\n";
 
 # Running scanner $MODULE-scan ";
diff --git a/tests/gtk-doc.make b/tests/gtk-doc.make
index acad18c..3c89439 100644
--- a/tests/gtk-doc.make
+++ b/tests/gtk-doc.make
@@ -94,8 +94,13 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(EXTRA_HFILES) $(SCAN_OPTIONS)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    echo "  DOC   `date +%H:%M:%S.%N`: Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    if test "x$(V)" = "x1"; then \
+	        scanobj_options="--verbose"; \
+	    fi; \
 	    PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj --module=$(DOC_MODULE) $(SCANGOBJ_OPTIONS); \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj --module=$(DOC_MODULE) $$scanobj_options $(SCANGOBJ_OPTIONS); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
 	        test -f $$i || touch $$i ; \
diff --git a/tests/gtk-doc.notmpl.make b/tests/gtk-doc.notmpl.make
index 2d3cab0..14d317f 100644
--- a/tests/gtk-doc.notmpl.make
+++ b/tests/gtk-doc.notmpl.make
@@ -92,8 +92,13 @@ scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
 	gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(EXTRA_HFILES) $(SCAN_OPTIONS)
 	@if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \
 	    echo "  DOC   `date +%H:%M:%S.%N`: Introspecting gobjects"; \
+	    scanobj_options=""; \
+	    if test "x$(V)" = "x1"; then \
+	      scanobj_options="--verbose"; \
+	    fi; \
 	    PATH=$(abs_top_builddir):$(PATH) PERL5LIB=$(abs_top_builddir):$(PERL5LIB) \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" gtkdoc-scangobj --module=$(DOC_MODULE) $(SCANGOBJ_OPTIONS); \
+	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \
+	    gtkdoc-scangobj --module=$(DOC_MODULE) $$scanobj_options $(SCANGOBJ_OPTIONS); \
 	else \
 	    for i in $(SCANOBJ_FILES) ; do \
 	        test -f $$i || touch $$i ; \