Merge remote-tracking branch 'origin/stable-2.0'
[bpt/guile.git] / libguile / Makefile.am
index 2bdf71f..df0c7ce 100644 (file)
@@ -135,6 +135,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        debug.c                                 \
        deprecated.c                            \
        deprecation.c                           \
+       dynstack.c                              \
        dynwind.c                               \
        eq.c                                    \
        error.c                                 \
@@ -152,7 +153,6 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        frames.c                                \
        gc-malloc.c                             \
        gc.c                                    \
-       gdbint.c                                \
        gettext.c                               \
        generalized-arrays.c                    \
        generalized-vectors.c                   \
@@ -170,13 +170,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                                 \
@@ -222,7 +222,9 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        version.c                               \
        vm.c                                    \
        vports.c                                \
-       weaks.c
+       weak-set.c                              \
+       weak-table.c                            \
+       weak-vector.c
 
 DOT_X_FILES =                                  \
        alist.x                                 \
@@ -254,6 +256,7 @@ DOT_X_FILES =                                       \
        fluids.x                                \
        foreign.x                               \
        fports.x                                \
+       frames.x                                \
        gc-malloc.x                             \
        gc.x                                    \
        gettext.x                               \
@@ -267,10 +270,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 +288,7 @@ DOT_X_FILES =                                       \
        print.x                                 \
        procprop.x                              \
        procs.x                                 \
+       programs.x                              \
        promises.x                              \
        r6rs-ports.x                            \
        random.x                                \
@@ -317,11 +323,11 @@ DOT_X_FILES =                                     \
        variable.x                              \
        vectors.x                               \
        version.x                               \
+       vm.x                                    \
        vports.x                                \
-       weaks.x
-
-# vm-related snarfs
-DOT_X_FILES += frames.x instructions.x objcodes.x programs.x vm.x
+       weak-set.x                              \
+       weak-table.x                            \
+       weak-vector.x
 
 EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 
@@ -419,18 +425,24 @@ DOT_DOC_FILES =                           \
        vectors.doc                             \
        version.doc                             \
        vports.doc                              \
-       weaks.doc
+       weak-set.doc                            \
+       weak-table.doc                          \
+       weak-vector.doc
 
 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.
@@ -450,9 +462,9 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h                \
 install-exec-hook:
        rm -f $(DESTDIR)$(bindir)/guile-snarf.awk
 
-install-data-hook: libguile-2.0-gdb.scm
+install-data-hook: libguile-2.2-gdb.scm
        @$(MKDIR_P) $(DESTDIR)$(libdir)
-## We want to install libguile-2.0-gdb.scm as SOMETHING-gdb.scm.
+## We want to install libguile-2.2-gdb.scm as SOMETHING-gdb.scm.
 ## SOMETHING is the full name of the final library.  We want to ignore
 ## symlinks, the .la file, and any previous -gdb.py file.  This is
 ## inherently fragile, but there does not seem to be a better option,
@@ -486,13 +498,14 @@ uninstall-hook:
 ## Perhaps we can deal with them normally once the merge seems to be
 ## working.
 noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c            \
+                 elf.h                                         \
                  srfi-14.i.c                                   \
                  quicksort.i.c                                  \
                  win32-uname.h                                 \
-                private-gc.h private-options.h ports-internal.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@
 
@@ -562,6 +575,7 @@ modinclude_HEADERS =                                \
        deprecated.h                            \
        deprecation.h                           \
        dynl.h                                  \
+       dynstack.h                              \
        dynwind.h                               \
        eq.h                                    \
        error.h                                 \
@@ -578,8 +592,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                   \
@@ -598,6 +611,7 @@ modinclude_HEADERS =                                \
        keywords.h                              \
        list.h                                  \
        load.h                                  \
+       loader.h                                \
        macros.h                                \
        mallocs.h                               \
        memoize.h                               \
@@ -605,7 +619,6 @@ modinclude_HEADERS =                                \
        net_db.h                                \
        null-threads.h                          \
        numbers.h                               \
-       objcodes.h                              \
        objprop.h                               \
        options.h                               \
        pairs.h                                 \
@@ -655,11 +668,13 @@ modinclude_HEADERS =                              \
        values.h                                \
        variable.h                              \
        vectors.h                               \
-       vm-engine.h                             \
+       vm-builtins.h                           \
        vm-expand.h                             \
        vm.h                                    \
        vports.h                                \
-       weaks.h
+       weak-set.h                              \
+       weak-table.h                            \
+       weak-vector.h
 
 nodist_modinclude_HEADERS = version.h scmconfig.h
 
@@ -675,7 +690,7 @@ EXTRA_DIST = ChangeLog-scm ChangeLog-threads                                \
     cpp-E.syms cpp-E.c cpp-SIG.syms cpp-SIG.c                          \
     c-tokenize.lex                                                     \
     scmconfig.h.top libgettext.h unidata_to_charset.pl libguile.map    \
-    libguile-2.0-gdb.scm
+    libguile-2.2-gdb.scm
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
@@ -743,8 +758,7 @@ load.x: libpath.h
 dynl.x: libpath.h
 
 alldotdocfiles    = $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES)
-snarf2checkedtexi = GUILE_INSTALL_LOCALE=1 GUILE_AUTO_COMPILE=0 \
-       $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
+snarf2checkedtexi = GUILE_AUTO_COMPILE=0 $(top_builddir)/meta/uninstalled-env guild snarf-check-and-output-texi
 dotdoc2texi       = cat $(alldotdocfiles) | $(snarf2checkedtexi)
 
 guile.texi: $(alldotdocfiles) guile$(EXEEXT)
@@ -818,7 +832,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