[Libvir] [PATCH] Avoid "make syntax-check" failure.

Jim Meyering jim at meyering.net
Wed Feb 20 15:56:21 UTC 2008


There were a few trailing blanks in a generated Makefile.am file.
This patch fixes the python script not to emit the offending spaces:

	Avoid "make syntax-check" failure.
	* docs/examples/index.py: Don't emit trailing blanks.
	* docs/examples/Makefile.am: Regenerate.

Signed-off-by: Jim Meyering <meyering at redhat.com>
---
 docs/examples/Makefile.am |    6 +++---
 docs/examples/index.py    |   10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/docs/examples/Makefile.am b/docs/examples/Makefile.am
index 6b5963e..9da4e21 100644
--- a/docs/examples/Makefile.am
+++ b/docs/examples/Makefile.am
@@ -22,9 +22,9 @@ install-data-local:
 	- at INSTALL@ -m 0644 $(srcdir)/*.html $(srcdir)/*.c $(srcdir)/*.xml \
 	  $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)

-EXTRA_DIST=examples.xsl index.py examples.xml 
+EXTRA_DIST=examples.xsl index.py examples.xml

-noinst_PROGRAMS=info1 suspend 
+noinst_PROGRAMS=info1 suspend

 info1_SOURCES=info1.c
 info1_LDFLAGS=
@@ -36,7 +36,7 @@ suspend_LDFLAGS=
 suspend_DEPENDENCIES= $(DEPS)
 suspend_LDADD= $(LDADDS)

-valgrind: 
+valgrind:
 	$(MAKE) CHECKER='valgrind' tests

 tests: $(noinst_PROGRAMS)
diff --git a/docs/examples/index.py b/docs/examples/index.py
index 7ea89e1..8f386ed 100755
--- a/docs/examples/index.py
+++ b/docs/examples/index.py
@@ -245,18 +245,14 @@ install-data-local:
 	  $(srcdir)/*.xsl $(srcdir)/*.res $(DESTDIR)$(HTML_DIR)

 """
-    EXTRA_DIST=""
-    for extra in extras:
-        EXTRA_DIST = EXTRA_DIST + extra + " "
+    EXTRA_DIST= string.join(extras, ' ')
     Makefile = Makefile + "EXTRA_DIST=%s\n\n" % (EXTRA_DIST)
-    noinst_PROGRAMS=""
-    for example in examples:
-        noinst_PROGRAMS = noinst_PROGRAMS + example + " "
+    noinst_PROGRAMS= string.join(examples, ' ')
     Makefile = Makefile + "noinst_PROGRAMS=%s\n\n" % (noinst_PROGRAMS)
     for example in examples:
         Makefile = Makefile + "%s_SOURCES=%s.c\n%s_LDFLAGS=\n%s_DEPENDENCIES= $(DEPS)\n%s_LDADD= $(LDADDS)\n\n" % (example, example, example,
 	       example, example)
-    Makefile = Makefile + "valgrind: \n\t$(MAKE) CHECKER='valgrind' tests\n\n"
+    Makefile = Makefile + "valgrind:\n\t$(MAKE) CHECKER='valgrind' tests\n\n"
     Makefile = Makefile + "tests: $(noinst_PROGRAMS)\n"
     Makefile = Makefile + "\t@(echo '## examples regression tests')\n"
 #    Makefile = Makefile + "\t@(echo > .memdump)\n"
--
1.5.4.2.134.g82883




More information about the libvir-list mailing list