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 /src/Makefile.am | |
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 'src/Makefile.am')
-rw-r--r-- | src/Makefile.am | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 332296e..c0f22e5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,3 +26,3 @@ idest_SOURCES=\ slist.c -BUILT_SOURCES=cmdline.h guile.x +BUILT_SOURCES=cmdline.h EXTRA_DIST=cmdline.opt getopt.m4 @@ -30,3 +30,3 @@ INCLUDES=-I$(top_srcdir)/gnu -I$(top_builddir)/gnu -I$(top_srcdir)/libid3tag @GU LDADD=../gnu/libgnu.a ../libid3tag/libid3tag.a -lz @GUILE_LIBS@ -SUFFIXES=.opt .c .h .x +SUFFIXES=.opt .c .h @@ -36,7 +36,6 @@ SUFFIXES=.opt .c .h .x DOT_X_FILES = guile.x - -snarfcppopts = -I../ $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) - -.c.x: - guile-snarf -o $@ $< $(snarfcppopts) - +CLEANFILES= +DISTCLEANFILES= +sitedir = @GUILE_SITE@/$(PACKAGE) +site_DATA= +include ../gint/gint.mk |