* Makefile.am: Added evalext.c, evalext.h, macros.c, macros.h.

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 4524b6e..872ccfb 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -36,11 +36,11 @@ guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
 
 libguile_la_SOURCES = \
     alist.c arbiters.c async.c backtrace.c boolean.c chars.c \
-    continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c \
+    continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c \
     feature.c filesys.c fluids.c fports.c gc.c gdbint.c genio.c \
     gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c \
     gh_predicates.c gsubr.c hash.c hashtab.c init.c ioext.c kw.c \
-    list.c load.c mallocs.c markers.c net_db.c numbers.c objects.c \
+    list.c load.c macros.c mallocs.c markers.c net_db.c numbers.c objects.c \
     objprop.c options.c pairs.c ports.c posix.c print.c procprop.c \
     procs.c ramap.c read.c readline.c root.c scmsigs.c script.c \
     simpos.c smob.c socket.c srcprop.c stackchk.c stacks.c stime.c \
@@ -50,11 +50,11 @@ libguile_la_SOURCES = \
 BUILT_SOURCES = \
     cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     alist.x arbiters.x async.x backtrace.x boolean.x chars.x \
-    continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x \
+    continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x \
     feature.x filesys.x fluids.x fports.x gc.x gdbint.x genio.x \
     gh_data.x gh_eval.x gh_funcs.x gh_init.x gh_io.x gh_list.x \
     gh_predicates.x gsubr.x hash.x hashtab.x init.x ioext.x iselect.x \
-    kw.x list.x load.x mallocs.x markers.x net_db.x numbers.x \
+    kw.x list.x load.x macros.x mallocs.x markers.x net_db.x numbers.x \
     objects.x objprop.x options.x pairs.x ports.x posix.x print.x \
     procprop.x procs.x ramap.x read.x readline.x regex-posix.x root.x \
     scmsigs.x script.x simpos.x smob.x socket.x srcprop.x stackchk.x \
@@ -86,10 +86,10 @@ pkginclude_HEADERS = gh.h
 modincludedir = $(includedir)/libguile
 modinclude_HEADERS = \
     __scm.h alist.h arbiters.h async.h backtrace.h boolean.h chars.h \
-    continuations.h debug.h dynl.h dynwind.h eq.h error.h eval.h \
+    continuations.h debug.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \
     feature.h filesys.h fports.h gc.h gdb_interface.h gdbint.h genio.h \
     gsubr.h hash.h hashtab.h init.h ioext.h kw.h list.h load.h \
-    mallocs.h markers.h net_db.h numbers.h objects.h objprop.h \
+    macros.h mallocs.h markers.h net_db.h numbers.h objects.h objprop.h \
     options.h pairs.h ports.h posix.h regex-posix.h print.h procprop.h \
     procs.h ramap.h read.h readline.h root.h scmsigs.h script.h \
     simpos.h smob.h socket.h srcprop.h stackchk.h stacks.h stime.h \

diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 3578130..bf75aa8 100644 (file)
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -102,11 +102,11 @@ guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL}
 
 libguile_la_SOURCES = \
     alist.c arbiters.c async.c backtrace.c boolean.c chars.c \
-    continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c \
+    continuations.c debug.c dynl.c dynwind.c eq.c error.c eval.c evalext.c \
     feature.c filesys.c fluids.c fports.c gc.c gdbint.c genio.c \
     gh_data.c gh_eval.c gh_funcs.c gh_init.c gh_io.c gh_list.c \
     gh_predicates.c gsubr.c hash.c hashtab.c init.c ioext.c kw.c \
-    list.c load.c mallocs.c markers.c net_db.c numbers.c objects.c \
+    list.c load.c macros.c mallocs.c markers.c net_db.c numbers.c objects.c \
     objprop.c options.c pairs.c ports.c posix.c print.c procprop.c \
     procs.c ramap.c read.c readline.c root.c scmsigs.c script.c \
     simpos.c smob.c socket.c srcprop.c stackchk.c stacks.c stime.c \
@@ -116,11 +116,11 @@ libguile_la_SOURCES = \
 BUILT_SOURCES = \
     cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     alist.x arbiters.x async.x backtrace.x boolean.x chars.x \
-    continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x \
+    continuations.x debug.x dynl.x dynwind.x eq.x error.x eval.x evalext.x \
     feature.x filesys.x fluids.x fports.x gc.x gdbint.x genio.x \
     gh_data.x gh_eval.x gh_funcs.x gh_init.x gh_io.x gh_list.x \
     gh_predicates.x gsubr.x hash.x hashtab.x init.x ioext.x iselect.x \
-    kw.x list.x load.x mallocs.x markers.x net_db.x numbers.x \
+    kw.x list.x load.x macros.x mallocs.x markers.x net_db.x numbers.x \
     objects.x objprop.x options.x pairs.x ports.x posix.x print.x \
     procprop.x procs.x ramap.x read.x readline.x regex-posix.x root.x \
     scmsigs.x script.x simpos.x smob.x socket.x srcprop.x stackchk.x \
@@ -148,10 +148,10 @@ pkginclude_HEADERS = gh.h
 modincludedir = $(includedir)/libguile
 modinclude_HEADERS = \
     __scm.h alist.h arbiters.h async.h backtrace.h boolean.h chars.h \
-    continuations.h debug.h dynl.h dynwind.h eq.h error.h eval.h \
+    continuations.h debug.h dynl.h dynwind.h eq.h error.h eval.h evalext.h \
     feature.h filesys.h fports.h gc.h gdb_interface.h gdbint.h genio.h \
     gsubr.h hash.h hashtab.h init.h ioext.h kw.h list.h load.h \
-    mallocs.h markers.h net_db.h numbers.h objects.h objprop.h \
+    macros.h mallocs.h markers.h net_db.h numbers.h objects.h objprop.h \
     options.h pairs.h ports.h posix.h regex-posix.h print.h procprop.h \
     procs.h ramap.h read.h readline.h root.h scmsigs.h script.h \
     simpos.h smob.h socket.h srcprop.h stackchk.h stacks.h stime.h \
@@ -198,16 +198,16 @@ LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 libguile_la_OBJECTS =  alist.lo arbiters.lo async.lo backtrace.lo \
 boolean.lo chars.lo continuations.lo debug.lo dynl.lo dynwind.lo eq.lo \
-error.lo eval.lo feature.lo filesys.lo fluids.lo fports.lo gc.lo \
-gdbint.lo genio.lo gh_data.lo gh_eval.lo gh_funcs.lo gh_init.lo \
+error.lo eval.lo evalext.lo feature.lo filesys.lo fluids.lo fports.lo \
+gc.lo gdbint.lo genio.lo gh_data.lo gh_eval.lo gh_funcs.lo gh_init.lo \
 gh_io.lo gh_list.lo gh_predicates.lo gsubr.lo hash.lo hashtab.lo \
-init.lo ioext.lo kw.lo list.lo load.lo mallocs.lo markers.lo net_db.lo \
-numbers.lo objects.lo objprop.lo options.lo pairs.lo ports.lo posix.lo \
-print.lo procprop.lo procs.lo ramap.lo read.lo readline.lo root.lo \
-scmsigs.lo script.lo simpos.lo smob.lo socket.lo srcprop.lo stackchk.lo \
-stacks.lo stime.lo strings.lo strop.lo strorder.lo strports.lo \
-struct.lo symbols.lo tag.lo throw.lo unif.lo variable.lo vectors.lo \
-version.lo vports.lo weaks.lo
+init.lo ioext.lo kw.lo list.lo load.lo macros.lo mallocs.lo markers.lo \
+net_db.lo numbers.lo objects.lo objprop.lo options.lo pairs.lo ports.lo \
+posix.lo print.lo procprop.lo procs.lo ramap.lo read.lo readline.lo \
+root.lo scmsigs.lo script.lo simpos.lo smob.lo socket.lo srcprop.lo \
+stackchk.lo stacks.lo stime.lo strings.lo strop.lo strorder.lo \
+strports.lo struct.lo symbols.lo tag.lo throw.lo unif.lo variable.lo \
+vectors.lo version.lo vports.lo weaks.lo
 PROGRAMS =  $(bin_PROGRAMS)
 
 guile_OBJECTS =  guile.o
@@ -241,24 +241,25 @@ GZIP = --best
 DEP_FILES =  .deps/alist.P .deps/alloca.P .deps/arbiters.P .deps/async.P \
 .deps/backtrace.P .deps/boolean.P .deps/chars.P .deps/continuations.P \
 .deps/cpp_err_symbols .deps/cpp_sig_symbols .deps/debug.P .deps/dynl.P \
-.deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P .deps/feature.P \
-.deps/filesys.P .deps/fluids.P .deps/fports.P .deps/gc.P .deps/gdbint.P \
-.deps/genio.P .deps/gh_data.P .deps/gh_eval.P .deps/gh_funcs.P \
-.deps/gh_init.P .deps/gh_io.P .deps/gh_list.P .deps/gh_predicates.P \
-.deps/gh_test_c.P .deps/gh_test_repl.P .deps/gsubr.P .deps/guile.P \
-.deps/hash.P .deps/hashtab.P .deps/inet_aton.P .deps/init.P \
-.deps/ioext.P .deps/iselect.P .deps/kw.P .deps/list.P .deps/load.P \
-.deps/mallocs.P .deps/markers.P .deps/net_db.P .deps/numbers.P \
-.deps/objects.P .deps/objprop.P .deps/options.P .deps/pairs.P \
-.deps/ports.P .deps/posix.P .deps/print.P .deps/procprop.P \
-.deps/procs.P .deps/putenv.P .deps/ramap.P .deps/read.P \
-.deps/readline.P .deps/regex-posix.P .deps/root.P .deps/scmsigs.P \
-.deps/script.P .deps/simpos.P .deps/smob.P .deps/socket.P \
-.deps/srcprop.P .deps/stackchk.P .deps/stacks.P .deps/stime.P \
-.deps/strerror.P .deps/strings.P .deps/strop.P .deps/strorder.P \
-.deps/strports.P .deps/struct.P .deps/symbols.P .deps/tag.P \
-.deps/threads.P .deps/throw.P .deps/unif.P .deps/variable.P \
-.deps/vectors.P .deps/version.P .deps/vports.P .deps/weaks.P
+.deps/dynwind.P .deps/eq.P .deps/error.P .deps/eval.P .deps/evalext.P \
+.deps/feature.P .deps/filesys.P .deps/fluids.P .deps/fports.P \
+.deps/gc.P .deps/gdbint.P .deps/genio.P .deps/gh_data.P .deps/gh_eval.P \
+.deps/gh_funcs.P .deps/gh_init.P .deps/gh_io.P .deps/gh_list.P \
+.deps/gh_predicates.P .deps/gh_test_c.P .deps/gh_test_repl.P \
+.deps/gsubr.P .deps/guile.P .deps/hash.P .deps/hashtab.P \
+.deps/inet_aton.P .deps/init.P .deps/ioext.P .deps/iselect.P .deps/kw.P \
+.deps/list.P .deps/load.P .deps/macros.P .deps/mallocs.P \
+.deps/markers.P .deps/net_db.P .deps/numbers.P .deps/objects.P \
+.deps/objprop.P .deps/options.P .deps/pairs.P .deps/ports.P \
+.deps/posix.P .deps/print.P .deps/procprop.P .deps/procs.P \
+.deps/putenv.P .deps/ramap.P .deps/read.P .deps/readline.P \
+.deps/regex-posix.P .deps/root.P .deps/scmsigs.P .deps/script.P \
+.deps/simpos.P .deps/smob.P .deps/socket.P .deps/srcprop.P \
+.deps/stackchk.P .deps/stacks.P .deps/stime.P .deps/strerror.P \
+.deps/strings.P .deps/strop.P .deps/strorder.P .deps/strports.P \
+.deps/struct.P .deps/symbols.P .deps/tag.P .deps/threads.P \
+.deps/throw.P .deps/unif.P .deps/variable.P .deps/vectors.P \
+.deps/version.P .deps/vports.P .deps/weaks.P
 SOURCES = $(libguile_la_SOURCES) $(EXTRA_libguile_la_SOURCES) $(guile_SOURCES) $(gh_test_c_SOURCES) $(gh_test_repl_SOURCES)
 OBJECTS = $(libguile_la_OBJECTS) $(guile_OBJECTS) $(gh_test_c_OBJECTS) $(gh_test_repl_OBJECTS)
 
@@ -269,7 +270,7 @@ all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) $(HEADERS) scmconfig
 $(srcdir)/Makefile.in: @MAINT@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
        cd $(top_srcdir) && $(AUTOMAKE) --foreign libguile/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        cd $(top_builddir) \
          && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -550,7 +551,7 @@ maintainer-clean-depend:
 %.lo: %.c
        @echo '$(LTCOMPILE) -c $<'; \
        $(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
-       @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o:/' \
+       @-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
          < .deps/$(*F).p > .deps/$(*F).P
        @-rm -f .deps/$(*F).p
 info: