diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-14 10:48:52 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2010-04-14 10:48:52 +0300 |
commit | bd3884baa80c41154616dcabdf2b2dbbac7087de (patch) | |
tree | 52a988dba330f248ee563b520d391a641a447258 /libid3tag | |
parent | 432dda4caa57295dec86bee860795bd2833dfc47 (diff) | |
download | idest-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')
-rw-r--r-- | libid3tag/Makefile.am | 9 | ||||
-rw-r--r-- | libid3tag/configure.ac | 3 |
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 @@ | |||
21 | 21 | ||
22 | ## Process this file with automake to produce Makefile.in | 22 | ## Process this file with automake to produce Makefile.in |
23 | 23 | ||
24 | AUTOMAKE_OPTIONS = foreign | ||
25 | ACLOCAL_AMFLAGS = -I m4 | 24 | ACLOCAL_AMFLAGS = -I m4 |
26 | SUBDIRS = | 25 | SUBDIRS = |
27 | 26 | ||
@@ -52,26 +51,26 @@ EXTRA_libid3tag_a_SOURCES = \ | |||
52 | BUILT_SOURCES = frametype.c compat.c genre.dat | 51 | BUILT_SOURCES = frametype.c compat.c genre.dat |
53 | 52 | ||
54 | $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am | 53 | $(srcdir)/frametype.c: $(srcdir)/frametype.gperf Makefile.am |
55 | cd $(srcdir) && \ | 54 | $(AM_V_GEN)cd $(srcdir) && \ |
56 | gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ | 55 | gperf -tCcTonD -K id -N id3_frametype_lookup -s -3 -k '*' \ |
57 | frametype.gperf | \ | 56 | frametype.gperf | \ |
58 | sed -e 's/\(struct id3_frametype\);/\1/' | \ | 57 | sed -e 's/\(struct id3_frametype\);/\1/' | \ |
59 | sed -e '/\$$''Id: /s/\$$//g' >frametype.c | 58 | sed -e '/\$$''Id: /s/\$$//g' >frametype.c |
60 | 59 | ||
61 | $(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am | 60 | $(srcdir)/compat.c: $(srcdir)/compat.gperf Makefile.am |
62 | cd $(srcdir) && \ | 61 | $(AM_V_GEN)cd $(srcdir) && \ |
63 | gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ | 62 | gperf -tCcTonD -K id -N id3_compat_lookup -s -3 -k '*' \ |
64 | compat.gperf | \ | 63 | compat.gperf | \ |
65 | sed -e 's/\(struct id3_compat\);/\1/' | \ | 64 | sed -e 's/\(struct id3_compat\);/\1/' | \ |
66 | sed -e '/\$$''Id: /s/\$$//g' >compat.c | 65 | sed -e '/\$$''Id: /s/\$$//g' >compat.c |
67 | 66 | ||
68 | $(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am | 67 | $(srcdir)/genre.dat: $(srcdir)/genre.dat.in $(srcdir)/genre.dat.sed Makefile.am |
69 | cd $(srcdir) && \ | 68 | $(AM_V_GEN)cd $(srcdir) && \ |
70 | sed -n -f genre.dat.sed genre.dat.in | \ | 69 | sed -n -f genre.dat.sed genre.dat.in | \ |
71 | sed -e '/\$$''Id: /s/\$$//g' >genre.dat | 70 | sed -e '/\$$''Id: /s/\$$//g' >genre.dat |
72 | 71 | ||
73 | libtool: $(LIBTOOL_DEPS) | 72 | libtool: $(LIBTOOL_DEPS) |
74 | $(SHELL) ./config.status --recheck | 73 | $(AM_V_GEN)$(SHELL) ./config.status --recheck |
75 | 74 | ||
76 | again: | 75 | again: |
77 | $(MAKE) clean | 76 | $(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) | |||
26 | 26 | ||
27 | AC_CONFIG_SRCDIR([id3tag.h]) | 27 | AC_CONFIG_SRCDIR([id3tag.h]) |
28 | AC_CONFIG_MACRO_DIR([m4]) | 28 | AC_CONFIG_MACRO_DIR([m4]) |
29 | AM_INIT_AUTOMAKE | 29 | AM_INIT_AUTOMAKE([foreign silent-rules]) |
30 | AM_SILENT_RULES([yes]) | ||
30 | 31 | ||
31 | AM_CONFIG_HEADER([config.h]) | 32 | AM_CONFIG_HEADER([config.h]) |
32 | 33 | ||