mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Fixes to make guile-vm compile in guile source tree

Browse source 
* INSTALL: Updated.
* m4/gnulib-cache.m4: Regenerated.

* Makefile.am: Spelling fix.

* guilec.mk:
* src/Makefile.am:
* src/vm.c: Update to actually work inside a guile source tree.

* libguile/Makefile.am: Don't error on warnings in the flex-generated
  c-tokenize function.
This commit is contained in:
Andy Wingo 2008-08-02 12:17:27 +02:00
parent e610dc3851
commit d351811347
7 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
INSTALL
View file

@ -2,7 +2,7 @@ Installation Instructions
************************* *************************
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006 Free Software Foundation, Inc. 2006, 2007 Free Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it. unlimited permission to copy, distribute and modify it.
@ -67,6 +67,9 @@ The simplest way to compile this package is:
all sorts of other programs in order to regenerate files that came all sorts of other programs in order to regenerate files that came
with the distribution. with the distribution.
6. Often, you can also type `make uninstall' to remove the installed
files again.
Compilers and Options Compilers and Options
===================== =====================

2
Makefile.am
View file

@ -26,7 +26,7 @@ AUTOMAKE_OPTIONS = 1.10
SUBDIRS = lib oop libguile ice-9 guile-config guile-readline emacs \ SUBDIRS = lib oop libguile ice-9 guile-config guile-readline emacs \
scripts srfi doc examples test-suite benchmark-suite lang am \ scripts srfi doc examples test-suite benchmark-suite lang am \
src modules testsuite src module testsuite
bin_SCRIPTS = guile-tools bin_SCRIPTS = guile-tools

5
guilec.mk
View file

@ -7,4 +7,7 @@ CLEANFILES = $(GOBJECTS)
SUFFIXES = .scm .go SUFFIXES = .scm .go
.scm.go: .scm.go:
$(GUILEC) $< GUILE_LOAD_PATH=\$(top_srcdir)/module \
LD_LIBRARY_PATH=\$(top_builddir)/src/.libs \
$(top_builddir)/pre-inst-guile-env \
guile -s \$(top_builddir)/src/guilec $<

2
libguile/Makefile.am
View file

@ -77,7 +77,7 @@ c-tokenize.$(OBJEXT): c-tokenize.c
if [ "$(cross_compiling)" = "yes" ]; then \ if [ "$(cross_compiling)" = "yes" ]; then \
$(CC_FOR_BUILD) $(DEFS) $(INCLUDES) -c -o $@ $<; \ $(CC_FOR_BUILD) $(DEFS) $(INCLUDES) -c -o $@ $<; \
else \ else \
$(COMPILE) -c -o $@ $<; \ $(filter-out -Werror,$(COMPILE)) -c -o $@ $<; \
fi fi
## Override default rule; this should run on BUILD host. ## Override default rule; this should run on BUILD host.

2
m4/gnulib-cache.m4
View file

@ -1,4 +1,4 @@
# Copyright (C) 2004-2007 Free Software Foundation, Inc. # Copyright (C) 2002-2008 Free Software Foundation, Inc.
# #
# This file is free software, distributed under the terms of the GNU # This file is free software, distributed under the terms of the GNU
# General Public License. As a special exception to the GNU General # General Public License. As a special exception to the GNU General

14
src/Makefile.am
View file

@ -1,11 +1,12 @@
bin_PROGRAMS = guile-vm bin_PROGRAMS = guile-vm
bin_SCRIPTS = guilec guile-disasm bin_SCRIPTS = guilec guile-disasm
guile_vm_SOURCES = guile-vm.c guile_vm_SOURCES = guile-vm.c
guile_vm_LDADD = libguile-vm.la guile_vm_LDADD = libguile-vm.la ../libguile/libguile.la
guile_vm_LDFLAGS = $(GUILE_LDFLAGS)
AM_CFLAGS = -Wall -g AM_CFLAGS = -Wall -g
CFLAGS:=$(filter-out -Wmissing-prototypes,$(CFLAGS))
lib_LTLIBRARIES = libguile-vm.la lib_LTLIBRARIES = libguile-vm.la
libguile_vm_la_SOURCES = \ libguile_vm_la_SOURCES = \
envs.c frames.c instructions.c objcodes.c programs.c vm.c \ envs.c frames.c instructions.c objcodes.c programs.c vm.c \
@ -17,15 +18,14 @@ EXTRA_DIST = vm_engine.c vm_system.c vm_scheme.c vm_loader.c \
BUILT_SOURCES = vm_system.i vm_scheme.i vm_loader.i \ BUILT_SOURCES = vm_system.i vm_scheme.i vm_loader.i \
envs.x frames.x instructions.x objcodes.x programs.x vm.x envs.x frames.x instructions.x objcodes.x programs.x vm.x
INCLUDES = $(GUILE_CFLAGS) INCLUDES =
CLEANFILES = guilec guile-disasm CLEANFILES = guilec guile-disasm
DISTCLEANFILES = $(BUILT_SOURCES) DISTCLEANFILES = $(BUILT_SOURCES)
MAINTAINERCLEANFILES = Makefile.in config.h.in stamp-h.in
ETAGS_ARGS = --regex='/SCM_\(SYMBOL\|VCELL\).*\"\([^\"]\)*\"/\3/' \ ETAGS_ARGS = --regex='/SCM_\(SYMBOL\|VCELL\).*\"\([^\"]\)*\"/\3/' \
--regex='/SCM_DEFINE[ \t]*(\([^,]*\),[^,]*/\1/' --regex='/SCM_DEFINE[ \t]*(\([^,]*\),[^,]*/\1/'
SNARF = guile-snarf SNARF = $(top_builddir)/pre-inst-guile-env guile-snarf
SUFFIXES = .i .x SUFFIXES = .i .x
.c.i: .c.i:
@ -46,7 +46,7 @@ SUFFIXES = .i .x
%: %.in %: %.in
sed "s!@guile@!$(GUILE)!" $^ > $@ sed "s!@guile@!$(bindir)/guile!" $^ > $@
@chmod 755 $@ @chmod 755 $@
$(BUILT_SOURCES): config.h vm_expand.h $(BUILT_SOURCES): vm_expand.h

2
src/vm.c
View file

@ -305,7 +305,7 @@ SCM_DEFINE (scm_vm_version, "vm-version", 0, 0, 0,
"") "")
#define FUNC_NAME s_scm_vm_version #define FUNC_NAME s_scm_vm_version
{ {
return scm_from_locale_string (VERSION); return scm_from_locale_string (PACKAGE_VERSION);
} }
#undef FUNC_NAME #undef FUNC_NAME