* Makefile.am (libguile_la_SOURCES, DOT_X_FILES, DOT_DOC_FILES,

EXTRA_libguile_la_SOURCES): Changed ramap.c and unif.c from being
'extra' to being regular sources.
(noinst_HEADERS): Added quicksort.i.c.
* quicksort.i.c: New file.

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index 62a8055..f1dad4c 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -92,61 +92,56 @@ guile_LDFLAGS = @DLPREOPEN@ $(GUILE_CFLAGS)
 
 libguile_la_CFLAGS = $(GUILE_CFLAGS)
 
-libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c     \
-    chars.c continuations.c convert.c debug.c deprecation.c deprecated.c    \
-    discouraged.c dynwind.c environments.c eq.c error.c eval.c             \
-    evalext.c extensions.c                                                 \
-    feature.c fluids.c fports.c        futures.c                                   \
-    gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c gc-freelist.c        \
-       gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c gh_init.c       \
-    gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c guardians.c hash.c    \
-    hashtab.c hooks.c i18n.c init.c inline.c ioext.c keywords.c                    \
-    lang.c list.c                                                          \
-    load.c macros.c mallocs.c modules.c numbers.c objects.c objprop.c      \
-    options.c pairs.c ports.c print.c procprop.c procs.c properties.c      \
-    random.c rdelim.c read.c root.c rw.c scmsigs.c script.c simpos.c smob.c \
-    sort.c srcprop.c stackchk.c stacks.c stime.c strings.c srfi-4.c        \
-    srfi-13.c srfi-14.c                                                            \
-    strorder.c strports.c struct.c symbols.c threads.c throw.c values.c            \
-    variable.c vectors.c version.c vports.c weaks.c
-
-DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x  \
-    continuations.x debug.x deprecation.x deprecated.x discouraged.x    \
-    dynl.x dynwind.x                                                    \
-    environments.x eq.x                                                         \
-    error.x eval.x evalext.x extensions.x feature.x fluids.x fports.x   \
-    futures.x                                                           \
-    gc.x  gc-mark.x gc-segment.x gc-malloc.x gc-card.x goops.x          \
-    gsubr.x guardians.x hash.x hashtab.x hooks.x i18n.x init.x ioext.x  \
-    keywords.x lang.x list.x load.x macros.x mallocs.x modules.x        \
-    numbers.x objects.x objprop.x options.x pairs.x ports.x print.x     \
-    procprop.x procs.x properties.x random.x rdelim.x read.x root.x rw.x \
-    scmsigs.x script.x simpos.x smob.x sort.x srcprop.x                         \
-    stackchk.x stacks.x stime.x strings.x srfi-4.x srfi-13.x srfi-14.x  \
-    strorder.x strports.x                                               \
-    struct.x symbols.x threads.x throw.x values.x variable.x vectors.x  \
-    version.x vports.x weaks.x
+libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
+    chars.c continuations.c convert.c debug.c deprecation.c            \
+    deprecated.c discouraged.c dynwind.c environments.c eq.c error.c   \
+    eval.c evalext.c extensions.c feature.c fluids.c fports.c          \
+    futures.c gc.c gc-mark.c gc-segment.c gc-malloc.c gc-card.c                \
+    gc-freelist.c gc_os_dep.c gdbint.c gh_data.c gh_eval.c gh_funcs.c  \
+    gh_init.c gh_io.c gh_list.c gh_predicates.c goops.c gsubr.c                \
+    guardians.c hash.c hashtab.c hooks.c i18n.c init.c inline.c                \
+    ioext.c keywords.c lang.c list.c load.c macros.c mallocs.c         \
+    modules.c numbers.c objects.c objprop.c options.c pairs.c ports.c  \
+    print.c procprop.c procs.c properties.c random.c rdelim.c read.c   \
+    root.c rw.c scmsigs.c script.c simpos.c smob.c sort.c srcprop.c    \
+    stackchk.c stacks.c stime.c strings.c srfi-4.c srfi-13.c srfi-14.c \
+    strorder.c strports.c struct.c symbols.c threads.c throw.c         \
+    values.c variable.c vectors.c version.c vports.c weaks.c ramap.c   \
+    unif.c
+
+DOT_X_FILES = alist.x arbiters.x async.x backtrace.x boolean.x chars.x \
+    continuations.x debug.x deprecation.x deprecated.x discouraged.x   \
+    dynl.x dynwind.x environments.x eq.x error.x eval.x evalext.x      \
+    extensions.x feature.x fluids.x fports.x futures.x gc.x gc-mark.x  \
+    gc-segment.x gc-malloc.x gc-card.x goops.x gsubr.x guardians.x     \
+    hash.x hashtab.x hooks.x i18n.x init.x ioext.x keywords.x lang.x   \
+    list.x load.x macros.x mallocs.x modules.x numbers.x objects.x     \
+    objprop.x options.x pairs.x ports.x print.x procprop.x procs.x     \
+    properties.x random.x rdelim.x read.x root.x rw.x scmsigs.x                \
+    script.x simpos.x smob.x sort.x srcprop.x stackchk.x stacks.x      \
+    stime.x strings.x srfi-4.x srfi-13.x srfi-14.x strorder.x          \
+    strports.x struct.x symbols.x threads.x throw.x values.x           \
+    variable.x vectors.x version.x vports.x weaks.x ramap.x unif.x
 
 EXTRA_DOT_X_FILES = @EXTRA_DOT_X_FILES@
 
-DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc             \
-    boolean.doc chars.doc continuations.doc debug.doc deprecation.doc      \
-    deprecated.doc discouraged.doc dynl.doc dynwind.doc                            \
-    environments.doc eq.doc                                                \
-    error.doc eval.doc evalext.doc                                         \
-    extensions.doc feature.doc fluids.doc fports.doc futures.doc           \
-    gc.doc goops.doc                                                       \
-    gsubr.doc gc-mark.doc gc-segment.doc gc-malloc.doc gc-card.doc         \
-    guardians.doc hash.doc hashtab.doc hooks.doc i18n.doc init.doc         \
-    ioext.doc keywords.doc lang.doc list.doc load.doc macros.doc           \
-    mallocs.doc modules.doc numbers.doc objects.doc objprop.doc                    \
-    options.doc pairs.doc ports.doc print.doc procprop.doc                 \
-    procs.doc properties.doc random.doc rdelim.doc read.doc root.doc rw.doc \
-    scmsigs.doc script.doc simpos.doc smob.doc sort.doc                            \
-    srcprop.doc stackchk.doc stacks.doc stime.doc strings.doc srfi-4.doc    \
-    srfi-13.doc srfi-14.doc                                                \
-    strorder.doc strports.doc struct.doc symbols.doc threads.doc throw.doc  \
-    values.doc variable.doc vectors.doc version.doc vports.doc weaks.doc
+DOT_DOC_FILES = alist.doc arbiters.doc async.doc backtrace.doc         \
+    boolean.doc chars.doc continuations.doc debug.doc deprecation.doc  \
+    deprecated.doc discouraged.doc dynl.doc dynwind.doc                        \
+    environments.doc eq.doc error.doc eval.doc evalext.doc             \
+    extensions.doc feature.doc fluids.doc fports.doc futures.doc       \
+    gc.doc goops.doc gsubr.doc gc-mark.doc gc-segment.doc              \
+    gc-malloc.doc gc-card.doc guardians.doc hash.doc hashtab.doc       \
+    hooks.doc i18n.doc init.doc ioext.doc keywords.doc lang.doc                \
+    list.doc load.doc macros.doc mallocs.doc modules.doc numbers.doc   \
+    objects.doc objprop.doc options.doc pairs.doc ports.doc print.doc  \
+    procprop.doc procs.doc properties.doc random.doc rdelim.doc                \
+    read.doc root.doc rw.doc scmsigs.doc script.doc simpos.doc         \
+    smob.doc sort.doc srcprop.doc stackchk.doc stacks.doc stime.doc    \
+    strings.doc srfi-4.doc srfi-13.doc srfi-14.doc strorder.doc                \
+    strports.doc struct.doc symbols.doc threads.doc throw.doc          \
+    values.doc variable.doc vectors.doc version.doc vports.doc         \
+    weaks.doc ramap.doc unif.doc
 
 EXTRA_DOT_DOC_FILES = @EXTRA_DOT_DOC_FILES@
 
@@ -158,7 +153,7 @@ EXTRA_libguile_la_SOURCES = _scm.h          \
     inet_aton.c memmove.c putenv.c strerror.c  \
     dynl.c regex-posix.c                       \
     filesys.c posix.c net_db.c socket.c                \
-    ramap.c unif.c debug-malloc.c mkstemp.c    \
+    debug-malloc.c mkstemp.c   \
     win32-uname.c win32-dirent.c win32-socket.c
 
 ## delete guile-snarf.awk from the installation bindir, in case it's
@@ -174,6 +169,7 @@ install-exec-hook:
 noinst_HEADERS = convert.i.c                                   \
                  conv-integer.i.c conv-uinteger.i.c            \
                  srfi-4.i.c                                    \
+                 quicksort.i.c                                  \
                  win32-uname.h win32-dirent.h win32-socket.h   \
                 private-gc.h