From 549436debe91d30b0599d576756543c78a804c3c Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Sat, 19 Apr 1997 13:25:03 +0000 Subject: [PATCH] Move most of the guts of shell command processing into libguile, so guile.c can be very small (and eventuallly auto-generated. (I mean, generated mechanically, not self-generated. Hmm.)) * guile.c, script.c, script.h: New source files. * init.c (scm_boot_guile_1): Call scm_init_script. * libguile.h: #include "script.h". * Makefile.am (bin_PROGRAMS, guile_SOURCES, guile_LDADD): New targets, for new executable. (libguile_la_SOURCES): Mention script.c. (modinclude_HEADERS): Add script.h. * configure.in: Always check for -lm, -lsocket, -lnsl, whether or not dynamic linking is enabled. This is because we're generating executables now. Move CY_AC_WITH_THREADS call after those, so the values of cy_cv_threads_libs captures the libs chosen above. * Makefile.in, configure, aclocal.m4: Regenerated. * Makefile.am (EXTRA_DIST): Don't distribute gscm.c or gscm.h. We don't maintain this interface any more, and it just confuses people. * alloca.c: #include , not . * Makefile.am (EXTRA_libguile_la_SOURCES): Mention alloca.c, so it'll get included in disties. --- libguile/Makefile.am | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 802c5d6ea..718245ab3 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -8,6 +8,10 @@ AUTOMAKE_OPTIONS = foreign INCLUDES = -I.. -I$(srcdir)/.. lib_LTLIBRARIES = libguile.la +bin_PROGRAMS = guile + +guile_SOURCES = guile.c +guile_LDADD = libguile.la ${THREAD_LIBS} libguile_la_SOURCES = \ alist.c append.c appinit.c arbiters.c async.c boolean.c chars.c \ @@ -17,13 +21,14 @@ libguile_la_SOURCES = \ hashtab.c init.c ioext.c kw.c list.c load.c mallocs.c markers.c \ mbstrings.c net_db.c numbers.c objprop.c options.c pairs.c ports.c \ posix.c print.c procprop.c procs.c ramap.c read.c root.c scmsigs.c \ - sequences.c simpos.c smob.c socket.c stackchk.c stime.c strings.c \ - strop.c strorder.c strports.c struct.c symbols.c tag.c throw.c unif.c \ - variable.c vectors.c version.c vports.c weaks.c + script.c sequences.c simpos.c smob.c socket.c stackchk.c stime.c \ + strings.c strop.c strorder.c strports.c struct.c symbols.c tag.c \ + throw.c unif.c variable.c vectors.c version.c vports.c weaks.c + EXTRA_libguile_la_SOURCES = _scm.h \ backtrace.c stacks.c debug.c srcprop.c \ strerror.c inet_aton.c putenv.c \ - threads.c + threads.c alloca.c ## This is kind of nasty... there are ".c" files that we don't want to ## compile, since they are #included in threads.c. So instead we list @@ -48,7 +53,7 @@ modinclude_HEADERS = __scm.h alist.h append.h arbiters.h async.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 mbstrings.h net_db.h \ numbers.h objprop.h options.h pairs.h ports.h posix.h print.h \ - procprop.h procs.h ramap.h read.h root.h scmhob.h scmsigs.h \ + procprop.h procs.h ramap.h read.h root.h scmhob.h scmsigs.h script.h \ sequences.h simpos.h smob.h socket.h srcprop.h stackchk.h stacks.h \ stime.h strings.h strop.h strorder.h strports.h struct.h symbols.h \ tag.h tags.h throw.h unif.h variable.h vectors.h version.h vports.h \ @@ -68,7 +73,7 @@ gh_test_c_LDADD = ${check_ldadd} gh_test_repl_SOURCES = gh_test_repl.c gh_test_repl_LDADD = ${check_ldadd} -EXTRA_DIST = gscm.c gscm.h ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \ +EXTRA_DIST = ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \ dynl-vms.c DYNAMIC-LINKING PLUGIN/REQ PLUGIN/guile.config \ PLUGIN/guile.libs.in cpp_signal.c cpp_errno.c cpp_err_symbols.in \ cpp_sig_symbols.in cpp_cnvt.awk \