mirror of https://github.com/djcb/mu.git
cosmetic
This commit is contained in:
parent
9e1ce98da7
commit
dbc162ef9b
|
@ -382,5 +382,5 @@ if test "x$ac_cv_header_wordexp_h" != "xyes"; then
|
|||
fi
|
||||
|
||||
echo
|
||||
echo "Now, type 'gmake' to build mu (or 'gmake check' to run the unit tests, too)"
|
||||
echo "Now, type 'make' (or 'gmake') to build mu"
|
||||
echo
|
||||
|
|
|
@ -20,7 +20,10 @@ include $(top_srcdir)/gtest.mk
|
|||
# with separate builddir)
|
||||
SUBDIRS= . mu scripts examples tests
|
||||
|
||||
AM_CPPFLAGS=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFLAGS}
|
||||
AM_CPPFLAGS= \
|
||||
-I. -I${top_builddir} -I${top_srcdir}/lib \
|
||||
${GUILE_CFLAGS} \
|
||||
${GLIB_CFLAGS}
|
||||
|
||||
# don't use -Werror, as it might break on other compilers
|
||||
# use -Wno-unused-parameters, because some callbacks may not
|
||||
|
@ -28,28 +31,28 @@ AM_CPPFLAGS=-I. -I${top_builddir} -I${top_srcdir}/lib ${GUILE_CFLAGS} ${GLIB_CFL
|
|||
AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement
|
||||
AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
|
||||
|
||||
lib_LTLIBRARIES= \
|
||||
lib_LTLIBRARIES= \
|
||||
libguile-mu.la
|
||||
|
||||
libguile_mu_la_SOURCES= \
|
||||
mu-guile.c \
|
||||
mu-guile.h \
|
||||
mu-guile-message.c \
|
||||
libguile_mu_la_SOURCES= \
|
||||
mu-guile.c \
|
||||
mu-guile.h \
|
||||
mu-guile-message.c \
|
||||
mu-guile-message.h
|
||||
|
||||
libguile_mu_la_LIBADD= \
|
||||
${top_builddir}/lib/libmu.la \
|
||||
libguile_mu_la_LIBADD= \
|
||||
${top_builddir}/lib/libmu.la \
|
||||
${GUILE_LIBS}
|
||||
|
||||
libguile_mu_la_LDFLAGS= -export-dynamic
|
||||
|
||||
XFILES= \
|
||||
mu-guile.x \
|
||||
XFILES= \
|
||||
mu-guile.x \
|
||||
mu-guile-message.x
|
||||
|
||||
info_TEXINFOS= \
|
||||
info_TEXINFOS= \
|
||||
mu-guile.texi
|
||||
mu_guile_TEXINFOS= \
|
||||
mu_guile_TEXINFOS= \
|
||||
fdl.texi
|
||||
|
||||
BUILT_SOURCES=$(XFILES)
|
||||
|
|
|
@ -308,21 +308,26 @@ gboolean
|
|||
mu_script_guile_run (MuScriptInfo *msi, const char *muhome,
|
||||
const char **args, GError **err)
|
||||
{
|
||||
char *mainargs, *expr;
|
||||
const char * argv[] = {
|
||||
"guile", "-l", NULL, "-c", NULL, NULL
|
||||
};
|
||||
const char *s;
|
||||
char *mainargs, *expr;
|
||||
char **argv;
|
||||
|
||||
g_return_val_if_fail (msi, FALSE);
|
||||
g_return_val_if_fail (muhome, FALSE);
|
||||
|
||||
argv = g_new0 (char*, 6);
|
||||
argv[0] = g_strdup("guile");
|
||||
argv[1] = g_strdup("-l");
|
||||
|
||||
if (access (mu_script_info_path (msi), R_OK) != 0) {
|
||||
mu_util_g_set_error (err, MU_ERROR_FILE_CANNOT_READ,
|
||||
"failed to read script: %s",
|
||||
strerror(errno));
|
||||
return FALSE;
|
||||
}
|
||||
argv[2] = (char*)mu_script_info_path (msi);
|
||||
}
|
||||
|
||||
s = mu_script_info_path (msi);
|
||||
argv[2] = g_strdup (s ? s : "");
|
||||
|
||||
mainargs = mu_str_quoted_from_strv (args);
|
||||
expr = g_strdup_printf (
|
||||
|
@ -332,12 +337,13 @@ mu_script_guile_run (MuScriptInfo *msi, const char *muhome,
|
|||
mainargs ? mainargs : "");
|
||||
|
||||
g_free (mainargs);
|
||||
argv[3] = g_strdup("-c");
|
||||
argv[4] = expr;
|
||||
|
||||
scm_boot_guile (5, argv, guile_shell, NULL);
|
||||
|
||||
/* never reached but let's be correct(TM)*/
|
||||
g_free (expr);
|
||||
g_strfreev (argv);
|
||||
return TRUE;
|
||||
}
|
||||
#else /*!BUILD_GUILE*/
|
||||
|
|
Loading…
Reference in New Issue