summaryrefslogtreecommitdiffabout
path: root/libid3tag
authorSergey Poznyakoff <gray@gnu.org.ua>2010-04-14 07:48:52 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2010-04-14 07:48:52 (GMT)
commitbd3884baa80c41154616dcabdf2b2dbbac7087de (patch) (side-by-side diff)
tree52a988dba330f248ee563b520d391a641a447258 /libid3tag
parent432dda4caa57295dec86bee860795bd2833dfc47 (diff)
downloadidest-bd3884baa80c41154616dcabdf2b2dbbac7087de.tar.gz
idest-bd3884baa80c41154616dcabdf2b2dbbac7087de.tar.bz2
Migrate Guile support to GINT.
* gint: Add submodule. * am/guile.m4: Remove. * Makefile.am (ACLOCAL_AMFLAGS): Look for includes in gint, instead of am. (SUBDIRS): Add gint. * bootstrap.conf: Init submodule. * configure.ac: Integrate gint. Set version number 1.1.90. * src/Makefile.am: Integrate gint. * src/guile.c (struct scheme_exec_data)<result>: Remove. (scheme_safe_exec_body): Return the result of ed->handler call, not SCM_BOOL_F. (guile_safe_exec): Use scm_c_catch instead of the deprecated scm_internal_lazy_catch. (guile_apply_main): Likewise. * NEWS: Update. * libid3tag/Makefile.am (AUTOMAKE_OPTIONS): Remove. Now set in configure.ac. Add AM_V_GEN marker to actions in all rules. * libid3tag/configure.ac (AM_INIT_AUTOMAKE): Pass options here. Use silent rules by default.
Diffstat (limited to 'libid3tag') (more/less context) (ignore whitespace changes)
-rw-r--r--libid3tag/Makefile.am9
-rw-r--r--libid3tag/configure.ac3
2 files changed, 6 insertions, 6 deletions
diff --git a/libid3tag/Makefile.am b/libid3tag/Makefile.am
index 44096eb..21da890 100644
--- a/libid3tag/Makefile.am
+++ b/libid3tag/Makefile.am
@@ -21,7 +21,6 @@
## Process this file with automake to produce Makefile.in
-AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I m4
SUBDIRS =
@@ -52,26 +51,26 @@ EXTRA_libid3tag_a_SOURCES = \
BUILT_SOURCES = frametype.c compat.c genre.dat
$(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am
- cd $(srcdir) && \
+ $(AM_V_GEN)cd $(srcdir) && \
gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \
frametype.gperf | \
sed -e 's/\(struct id3_frametype\);/\1/' | \
sed -e '/\$$''Id: /s/\$$//g' >frametype.c
$(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am
- cd $(srcdir) && \
+ $(AM_V_GEN)cd $(srcdir) && \
gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \
compat.gperf | \
sed -e 's/\(struct id3_compat\);/\1/' | \
sed -e '/\$$''Id: /s/\$$//g' >compat.c
$(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am
- cd $(srcdir) && \
+ $(AM_V_GEN)cd $(srcdir) && \
sed -n -f genre.dat.sed genre.dat.in | \
sed -e '/\$$''Id: /s/\$$//g' >genre.dat
libtool: $(LIBTOOL_DEPS)
- $(SHELL) ./config.status --recheck
+ $(AM_V_GEN)$(SHELL) ./config.status --recheck
again:
$(MAKE) clean
diff --git a/libid3tag/configure.ac b/libid3tag/configure.ac
index 11f6b4a..5f530d0 100644
--- a/libid3tag/configure.ac
+++ b/libid3tag/configure.ac
@@ -26,7 +26,8 @@ AC_PREREQ(2.53)
AC_CONFIG_SRCDIR([id3tag.h])
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE([foreign silent-rules])
+AM_SILENT_RULES([yes])
AM_CONFIG_HEADER([config.h])

Return to:

Send suggestions and report system problems to the System administrator.