temporarily disable elisp exception tests
[bpt/guile.git] / libguile / Makefile.am
index ce437e4..e4420be 100644 (file)
@@ -1,7 +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, 2013 Free Software Foundation, Inc.
+##     2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##
@@ -92,11 +92,12 @@ guile_filter_doc_snarfage_SOURCES = c-tokenize.c
 ## Override default rule; this should be compiled for BUILD host.
 ## For some reason, OBJEXT does not include the dot
 c-tokenize.$(OBJEXT): c-tokenize.c
-       $(AM_V_GEN) \
-       if [ "$(cross_compiling)" = "yes" ]; then \
-               $(CC_FOR_BUILD) -I$(top_builddir) -c -o $@ $<; \
-       else \
-               $(COMPILE) -c -o $@ $<; \
+       $(AM_V_GEN)                                                     \
+       if [ "$(cross_compiling)" = "yes" ]; then                       \
+               $(CC_FOR_BUILD) -DCROSS_COMPILING=1 -I$(top_builddir)   \
+                  -c -o "$@" "$<";                                     \
+       else                                                            \
+               $(COMPILE) -c -o "$@" "$<";                             \
        fi
 
 ## Override default rule; this should run on BUILD host.
@@ -147,11 +148,11 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                           \
        finalizers.c                            \
        fluids.c                                \
        foreign.c                               \
+       foreign-object.c                        \
        fports.c                                \
        frames.c                                \
        gc-malloc.c                             \
        gc.c                                    \
-       gdbint.c                                \
        gettext.c                               \
        generalized-arrays.c                    \
        generalized-vectors.c                   \
@@ -169,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                                 \
@@ -214,6 +215,7 @@ libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES =                             \
        threads.c                               \
        throw.c                                 \
        trees.c                                 \
+       unicode.c                               \
        uniform.c                               \
        values.c                                \
        variable.c                              \
@@ -255,6 +257,7 @@ DOT_X_FILES =                                       \
        fluids.x                                \
        foreign.x                               \
        fports.x                                \
+       frames.x                                \
        gc-malloc.x                             \
        gc.x                                    \
        gettext.x                               \
@@ -268,10 +271,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                               \
@@ -284,6 +289,7 @@ DOT_X_FILES =                                       \
        print.x                                 \
        procprop.x                              \
        procs.x                                 \
+       programs.x                              \
        promises.x                              \
        r6rs-ports.x                            \
        random.x                                \
@@ -313,19 +319,18 @@ DOT_X_FILES =                                     \
        threads.x                               \
        throw.x                                 \
        trees.x                                 \
+       unicode.x                               \
        uniform.x                               \
        values.x                                \
        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 =                                \
@@ -416,6 +421,7 @@ DOT_DOC_FILES =                             \
        threads.doc                             \
        throw.doc                               \
        trees.doc                               \
+       unicode.doc                             \
        uniform.doc                             \
        values.doc                              \
        variable.doc                            \
@@ -428,11 +434,6 @@ 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.  */' >> $@
@@ -464,6 +465,37 @@ EXTRA_libguile_@GUILE_EFFECTIVE_VERSION@_la_SOURCES = _scm.h               \
 install-exec-hook:
        rm -f $(DESTDIR)$(bindir)/guile-snarf.awk
 
+install-data-hook: libguile-2.2-gdb.scm
+       @$(MKDIR_P) $(DESTDIR)$(libdir)
+## 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,
+## because libtool hides the real names from us.  (Trick courtesy of
+## GNU libstdc++.)
+       @here=`pwd`; cd $(DESTDIR)$(libdir);                    \
+         for file in libguile-@GUILE_EFFECTIVE_VERSION@*; do   \
+           case $$file in                                      \
+             *-gdb.scm) ;;                                     \
+             *.la) ;;                                          \
+             *) if test -h $$file; then                        \
+                  continue;                                    \
+                fi;                                            \
+                libname=$$file;;                               \
+           esac;                                               \
+         done;                                                 \
+       cd $$here;                                              \
+       echo " $(INSTALL_DATA) $<                               \
+$(DESTDIR)$(libdir)/$$libname-gdb.scm";                                \
+       $(INSTALL_DATA) "$<"                                    \
+           "$(DESTDIR)$(libdir)/$$libname-gdb.scm"
+
+# Remove the GDB support file and the Info 'dir' file that
+# 'install-info' 5.x installs.
+uninstall-hook:
+       -rm "$(DESTDIR)$(libdir)/libguile-@GUILE_EFFECTIVE_VERSION@"*-gdb.scm
+       -rm -f "$(DESTDIR)$(infodir)/dir"
+
 ## This is kind of nasty... there are ".c" files that we don't want to
 ## compile, since they are #included.  So instead we list them here.
 ## Perhaps we can deal with them normally once the merge seems to be
@@ -473,10 +505,10 @@ noinst_HEADERS = conv-integer.i.c conv-uinteger.i.c               \
                  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@
 
@@ -559,11 +591,11 @@ modinclude_HEADERS =                              \
        filesys.h                               \
        fluids.h                                \
        foreign.h                               \
+       foreign-object.h                        \
        fports.h                                \
        frames.h                                \
        gc.h                                    \
-       gdb_interface.h                         \
-       gdbint.h                                \
+       gc-inline.h                             \
        gettext.h                               \
        generalized-arrays.h                    \
        generalized-vectors.h                   \
@@ -582,6 +614,7 @@ modinclude_HEADERS =                                \
        keywords.h                              \
        list.h                                  \
        load.h                                  \
+       loader.h                                \
        macros.h                                \
        mallocs.h                               \
        memoize.h                               \
@@ -589,7 +622,6 @@ modinclude_HEADERS =                                \
        net_db.h                                \
        null-threads.h                          \
        numbers.h                               \
-       objcodes.h                              \
        objprop.h                               \
        options.h                               \
        pairs.h                                 \
@@ -635,10 +667,12 @@ modinclude_HEADERS =                              \
        throw.h                                 \
        trees.h                                 \
        validate.h                              \
+       unicode.h                               \
        uniform.h                               \
        values.h                                \
        variable.h                              \
        vectors.h                               \
+       vm-builtins.h                           \
        vm-expand.h                             \
        vm.h                                    \
        vports.h                                \
@@ -654,12 +688,13 @@ bin_SCRIPTS = guile-snarf
 # and people feel like maintaining them.  For now, this is not the case.
 noinst_SCRIPTS = guile-snarf-docs
 
-EXTRA_DIST = ChangeLog-scm ChangeLog-threads           \
-    ChangeLog-1996-1999 ChangeLog-2000 ChangeLog-2008  \
-    guile-func-name-check                              \
-    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
+EXTRA_DIST = ChangeLog-scm ChangeLog-threads                           \
+    ChangeLog-1996-1999 ChangeLog-2000 ChangeLog-2008                  \
+    guile-func-name-check                                              \
+    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.2-gdb.scm
 #    $(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES) \
 #    guile-procedures.txt guile.texi
 
@@ -708,7 +743,7 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        $(AM_V_GEN)mv libpath.tmp libpath.h
 
 
-snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
+snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS)
 
 SUFFIXES = .x .doc
 
@@ -801,7 +836,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