summaryrefslogtreecommitdiffabout
path: root/src/Makefile.am
authorSergey Poznyakoff <gray@gnu.org>2015-11-07 15:34:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2015-11-07 15:34:53 (GMT)
commit6cecc808e5552f3220b97033306e42ce152908bb (patch) (side-by-side diff)
tree778eb3e631cc6e556f1ec31ab584446951da8885 /src/Makefile.am
parent638c48ec020909e52a2081b4b9dc6908592e1bab (diff)
downloadidest-6cecc808e5552f3220b97033306e42ce152908bb.tar.gz
idest-6cecc808e5552f3220b97033306e42ce152908bb.tar.bz2
Include gnulib as a submodule. Fix testsuite.
Guile 2.x outputs spurious diagnostics to stderr when compiling input files. The only way to disable it is to disable compilation by setting environment variable GUILE_AUTO_COMPILE to 0. However, even if compilation is disabled, Guile still checks whether the compiled file exists and complains on stderr if it is older than the input file. This diagnostics begins with ;;;. Delete this using sed prior to comparing stderr with the expected text. * .gitmodules: Add gnulib * gnulib: New module. * bootstrap: Update from gnulib * gint: Upgrade. * scheme/idest/batch/setlyrics.scm: Fix typo. * src/Makefile.am: Use AM_CPPFLAGS instead of obsolete includes. * tests/atlocal.in: Set GUILE_AUTO_COMPILE=0 * tests/testsuite.at (WITH_GUILE): New macro. * tests/delcomm.at: Use WITH_GUILE. * tests/fmt-shortlist.at: Likewise. * tests/framelist00.at: Likewise. * tests/framelist01.at: Likewise. * tests/framelist02.at: Likewise. * tests/list1.at: Likewise. * tests/list2.at: Likewise. * tests/lyrics00.at: Likewise. * tests/pic00.at: Likewise. * tests/pic01.at: Likewise. * tests/script00.at: Likewise. * tests/script01.at: Likewise. * tests/script02.at: Likewise. * tests/script03.at: Likewise. * tests/script04.at: Likewise. * tests/script05.at: Likewise. * tests/script06.at: Likewise. * tests/script07.at: Likewise. * tests/script08.at: Likewise. * tests/setlyrics.at: Likewise. * tests/setpic.at: Likewise. * tests/settitle.at: Likewise. * tests/shortlist.at: Likewise.
Diffstat (limited to 'src/Makefile.am') (more/less context) (ignore whitespace changes)
-rw-r--r--src/Makefile.am13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index bd06dbf..2c34303 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,14 @@ idest_SOURCES=\
slist.c
BUILT_SOURCES=cmdline.h frametab.c
EXTRA_DIST=cmdline.opt getopt.m4
-INCLUDES=-I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/libid3tag @GUILE_INCLUDES@
+AM_CPPFLAGS = \
+ -DGUILE_SITE=\"@GUILE_SITE@\"\
+ -DPKG_SITE=\"$(sitedir)\"\
+ -DVERSION_SITE=\"$(sitedir)/$(VERSION)\"\
+ -I$(top_srcdir)/gnu\
+ -I$(top_builddir)/gnu\
+ -I$(top_srcdir)/libid3tag\
+ @GUILE_INCLUDES@
LDADD=../gnu/libgnu.a ../libid3tag/libid3tag.a -lz @GUILE_LIBS@
SUFFIXES=.opt .c .h
@@ -49,7 +56,3 @@ sitedir = @GUILE_SITE@/$(PACKAGE)
site_DATA=
include ../gint/gint.mk
-AM_CPPFLAGS=\
- -DGUILE_SITE=\"@GUILE_SITE@\"\
- -DPKG_SITE=\"$(sitedir)\"\
- -DVERSION_SITE=\"$(sitedir)/$(VERSION)\"

Return to:

Send suggestions and report system problems to the System administrator.