X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/fd57bbf5ac7c790f0731b1a44c7d20f469403009..ae7f13be4bda70a6bc4a8478ce043df1a752ee6e:/libguile/Makefile.am diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 36f15491a..2077c4dac 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -1,6 +1,7 @@ ## Process this file with Automake to create Makefile.in ## -## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, 2007, +## 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -93,7 +94,7 @@ guile_filter_doc_snarfage_SOURCES = c-tokenize.c c-tokenize.$(OBJEXT): c-tokenize.c $(AM_V_GEN) \ if [ "$(cross_compiling)" = "yes" ]; then \ - $(CC_FOR_BUILD) -c -o $@ $<; \ + $(CC_FOR_BUILD) -I$(top_builddir) -c -o $@ $<; \ else \ $(COMPILE) -c -o $@ $<; \ fi @@ -150,7 +151,6 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \ frames.c \ gc-malloc.c \ gc.c \ - gdbint.c \ gettext.c \ generalized-arrays.c \ generalized-vectors.c \ @@ -168,13 +168,13 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = \ keywords.c \ list.c \ load.c \ + loader.c \ macros.c \ mallocs.c \ memoize.c \ modules.c \ null-threads.c \ numbers.c \ - objcodes.c \ objprop.c \ options.c \ pairs.c \ @@ -254,6 +254,7 @@ DOT_X_FILES = \ fluids.x \ foreign.x \ fports.x \ + frames.x \ gc-malloc.x \ gc.x \ gettext.x \ @@ -267,10 +268,12 @@ DOT_X_FILES = \ hooks.x \ i18n.x \ init.x \ + instructions.x \ ioext.x \ keywords.x \ list.x \ load.x \ + loader.x \ macros.x \ mallocs.x \ memoize.x \ @@ -283,6 +286,7 @@ DOT_X_FILES = \ print.x \ procprop.x \ procs.x \ + programs.x \ promises.x \ r6rs-ports.x \ random.x \ @@ -317,14 +321,12 @@ DOT_X_FILES = \ variable.x \ vectors.x \ version.x \ + vm.x \ vports.x \ weak-set.x \ weak-table.x \ weak-vector.x -# vm-related snarfs -DOT_X_FILES += frames.x instructions.x objcodes.x programs.x vm.x - EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@ DOT_DOC_FILES = \ @@ -427,21 +429,29 @@ DOT_DOC_FILES = \ EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@ -DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i - -.c.i: - $(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@ +vm-operations.h: vm-engine.c + @echo '/* This file was generated automatically from $<; do not' > $@ + @echo ' edit. See the source file for copyright information. */' >> $@ + @echo '' >> $@ + @echo "#define FOR_EACH_VM_OPERATION(M) \\" >> $@ + $(AM_V_GEN)$(GREP) '^ *VM_DEFINE_OP' $< \ + | sed -e 's,VM_DEFINE_OP (\(.*\)).*, M (\1) \\,' >> $@ + @echo '' >> $@ BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \ scmconfig.h \ - $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) + $(DOT_I_FILES) vm-operations.h $(DOT_X_FILES) $(EXTRA_DOT_X_FILES) + +# Force the generation of `guile-procedures.texi' because the top-level +# Makefile expects it to be built. +all-local: guile-procedures.texi EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h \ memmove.c strerror.c \ dynl.c regex-posix.c \ posix.c net_db.c socket.c \ debug-malloc.c mkstemp.c \ - win32-uname.c win32-socket.c \ + win32-uname.c \ locale-categories.h ## delete guile-snarf.awk from the installation bindir, in case it's @@ -458,11 +468,11 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c \ elf.h \ srfi-14.i.c \ quicksort.i.c \ - win32-uname.h win32-socket.h \ - private-gc.h private-options.h + win32-uname.h \ + private-options.h ports-internal.h # vm instructions -noinst_HEADERS += vm-engine.c vm-i-system.c vm-i-scheme.c vm-i-loader.c +noinst_HEADERS += vm-engine.c libguile_@GUILE_EFFECTIVE_VERSION@_la_DEPENDENCIES = @LIBLOBJS@ @@ -548,8 +558,7 @@ modinclude_HEADERS = \ fports.h \ frames.h \ gc.h \ - gdb_interface.h \ - gdbint.h \ + gc-inline.h \ gettext.h \ generalized-arrays.h \ generalized-vectors.h \ @@ -568,6 +577,7 @@ modinclude_HEADERS = \ keywords.h \ list.h \ load.h \ + loader.h \ macros.h \ mallocs.h \ memoize.h \ @@ -575,7 +585,6 @@ modinclude_HEADERS = \ net_db.h \ null-threads.h \ numbers.h \ - objcodes.h \ objprop.h \ options.h \ pairs.h \ @@ -625,7 +634,7 @@ modinclude_HEADERS = \ values.h \ variable.h \ vectors.h \ - vm-engine.h \ + vm-builtins.h \ vm-expand.h \ vm.h \ vports.h \ @@ -711,6 +720,7 @@ $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h guile-snarf-docs.in error.x: cpp-E.c posix.x: cpp-SIG.c load.x: libpath.h +dynl.x: libpath.h alldotdocfiles = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi @@ -722,25 +732,9 @@ guile.texi: $(alldotdocfiles) guile$(EXEEXT) guile-procedures.texi: $(alldotdocfiles) guile$(EXEEXT) $(AM_V_GEN)$(dotdoc2texi) > $@ || { rm $@; false; } -if HAVE_MAKEINFO - -guile-procedures.txt: guile-procedures.texi - rm -f $@ - makeinfo --force -o $@ guile-procedures.texi || test -f $@ - -else - -guile-procedures.txt: guile-procedures.texi - cp guile-procedures.texi $@ - -endif - c-tokenize.c: c-tokenize.lex flex -t $(srcdir)/c-tokenize.lex > $@ || { rm $@; false; } -schemelibdir = $(pkgdatadir)/$(GUILE_EFFECTIVE_VERSION) -schemelib_DATA = guile-procedures.txt - ## Add -MG to make the .x magic work with auto-dep code. MKDEP = gcc -M -MG $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS) @@ -803,7 +797,6 @@ chknew-E chknew-SIG: \ MOSTLYCLEANFILES = \ scmconfig.h scmconfig.h.tmp -CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi \ - vm-i-*.i +CLEANFILES = libpath.h *.x *.doc guile-procedures.txt guile-procedures.texi guile.texi MAINTAINERCLEANFILES = c-tokenize.c