From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Thu, 16 Dec 2010 18:55:28 +0000 (+0100)
Subject: Fix canon7.test failure.
X-Git-Tag: ng-0.5a~299^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb7f5039ab30dace3e73aaac9e2af62926660da1;p=thirdparty%2Fautomake.git

Fix canon7.test failure.

* tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
(lib.h, libd.c, libs.c): Use const for constant strings.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index 5717b219d..9386d80d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-16  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix canon7.test failure.
+	* tests/canon7.test (_foo_bar_SOURCES): Add foobar.c.
+	(lib.h, libd.c, libs.c): Use const for constant strings.
+
 2010-12-11  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
 	Improve and extend tests on canonicalization.
diff --git a/tests/canon7.test b/tests/canon7.test
index 9b3d8d067..3f25d6ff5 100755
--- a/tests/canon7.test
+++ b/tests/canon7.test
@@ -43,7 +43,7 @@ dummy_dynamic_SOURCES = $(dummy_static_SOURCES)
 dummy_static_LDADD = $(noinst_LIBRARIES)
 dummy_dynamic_LDADD = $(noinst_LTLIBRARIES)
 
-_foo_bar_SOURCES = libs.c
+_foo_bar_SOURCES = libs.c foobar.c
 libb_az_baz_a_SOURCES = libs.c
 lib_zardoz___la_SOURCES = libd.c
 
@@ -76,9 +76,9 @@ int main(void)
 }
 END
 
-echo 'char *dummy_func(void);' > lib.h
-echo 'char *dummy_func(void) { return "Dynamic"; }' > libd.c
-echo 'char *dummy_func(void) { return "Static"; }' > libs.c
+echo 'const char *dummy_func(void);' > lib.h
+echo 'const char *dummy_func(void) { return "Dynamic"; }' > libd.c
+echo 'const char *dummy_func(void) { return "Static"; }' > libs.c
 
 libtoolize
 $ACLOCAL