From a0599745350ad81ec4133991049cb0dba3a9c2cd Mon Sep 17 00:00:00 2001 From: Mikael Djurfeldt Date: Fri, 21 Apr 2000 14:16:44 +0000 Subject: [PATCH] * Makefile.am (DEFS): Added. automake adds -I options to DEFS, and we don't want that. (INCLUDES): Removed all -I options except for the root source directory and the root build directory. * *.*: Change includes so that they always use the "prefixes" libguile/, qt/, guile-readline/, or libltdl/. (Thanks to Tim Mooney.) --- guile-readline/ChangeLog | 10 +++ guile-readline/Makefile.am | 4 +- guile-readline/readline.c | 4 +- libguile/ChangeLog | 10 +++ libguile/Makefile.am | 4 +- libguile/_scm.h | 28 +++---- libguile/alist.c | 12 +-- libguile/alloca.c | 2 +- libguile/arbiters.c | 12 +-- libguile/async.c | 16 ++-- libguile/backtrace.c | 24 +++--- libguile/boolean.c | 8 +- libguile/chars.c | 8 +- libguile/continuations.c | 14 ++-- libguile/coop-defs.h | 2 +- libguile/coop-threads.c | 10 +-- libguile/coop-threads.h | 4 +- libguile/coop.c | 6 +- libguile/debug-malloc.c | 6 +- libguile/debug.c | 46 +++++------ libguile/dynl.c | 16 ++-- libguile/dynwind.c | 16 ++-- libguile/eq.c | 24 +++--- libguile/error.c | 16 ++-- libguile/eval.c | 50 ++++++------ libguile/evalext.c | 16 ++-- libguile/feature.c | 20 ++--- libguile/filesys.c | 20 ++--- libguile/fluids.c | 20 ++--- libguile/fports.c | 12 +-- libguile/gc.c | 36 ++++----- libguile/gdbint.c | 26 +++---- libguile/gh_data.c | 2 +- libguile/gh_eval.c | 2 +- libguile/gh_funcs.c | 2 +- libguile/gh_init.c | 2 +- libguile/gh_io.c | 2 +- libguile/gh_list.c | 2 +- libguile/gh_predicates.c | 2 +- libguile/gh_test_c.c | 2 +- libguile/gh_test_repl.c | 2 +- libguile/gsubr.c | 10 +-- libguile/guardians.c | 16 ++-- libguile/guile.c | 4 +- libguile/hash.c | 14 ++-- libguile/hashtab.c | 18 ++--- libguile/init.c | 152 ++++++++++++++++++------------------- libguile/ioext.c | 26 +++---- libguile/iselect.c | 10 +-- libguile/keywords.c | 18 ++--- libguile/lang.c | 12 +-- libguile/list.c | 10 +-- libguile/load.c | 28 +++---- libguile/macros.c | 12 +-- libguile/mallocs.c | 8 +- libguile/modules.c | 10 +-- libguile/net_db.c | 14 ++-- libguile/numbers.c | 24 +++--- libguile/objects.c | 32 ++++---- libguile/objprop.c | 14 ++-- libguile/options.c | 8 +- libguile/pairs.c | 6 +- libguile/ports.c | 20 ++--- libguile/posix.c | 22 +++--- libguile/print.c | 42 +++++----- libguile/procprop.c | 26 +++---- libguile/procs.c | 14 ++-- libguile/ramap.c | 26 +++---- libguile/random.c | 18 ++--- libguile/read.c | 34 ++++----- libguile/regex-posix.c | 22 +++--- libguile/root.c | 24 +++--- libguile/scmsigs.c | 14 ++-- libguile/script.c | 12 +-- libguile/simpos.c | 12 +-- libguile/smob.c | 8 +- libguile/socket.c | 18 ++--- libguile/sort.c | 22 +++--- libguile/srcprop.c | 24 +++--- libguile/stackchk.c | 10 +-- libguile/stacks.c | 28 +++---- libguile/stime.c | 14 ++-- libguile/strings.c | 10 +-- libguile/strop.c | 14 ++-- libguile/strorder.c | 10 +-- libguile/strports.c | 20 ++--- libguile/struct.c | 24 +++--- libguile/symbols.c | 26 +++---- libguile/tag.c | 10 +-- libguile/threads.c | 12 +-- libguile/throw.c | 32 ++++---- libguile/unif.c | 30 ++++---- libguile/variable.c | 18 ++--- libguile/vectors.c | 18 ++--- libguile/version.c | 10 +-- libguile/vports.c | 20 ++--- libguile/weaks.c | 10 +-- qt/ChangeLog | 10 +++ qt/Makefile.am | 4 + qt/qt.c | 4 +- 100 files changed, 848 insertions(+), 810 deletions(-) diff --git a/guile-readline/ChangeLog b/guile-readline/ChangeLog index 5014a0b01..a934d2282 100644 --- a/guile-readline/ChangeLog +++ b/guile-readline/ChangeLog @@ -1,3 +1,13 @@ +2000-04-21 Mikael Djurfeldt + + * *.*: Change includes so that they always use the "prefixes" + libguile/, qt/, guile-readline/, or libltdl/. + + * Makefile.am (DEFS): Added. automake adds -I options to DEFS, + and we don't want that. + (INCLUDES): Removed all -I options except for the root source + directory and the root build directory. + 2000-04-04 Dirk Herrmann * readline.c (scm_readline): Must unpack SCM values to access diff --git a/guile-readline/Makefile.am b/guile-readline/Makefile.am index 28b6b5cc8..c1028ee85 100644 --- a/guile-readline/Makefile.am +++ b/guile-readline/Makefile.am @@ -21,10 +21,12 @@ AUTOMAKE_OPTIONS = foreign +## Prevent automake from adding extra -I options +DEFS = @DEFS@ ## Check for headers in $(srcdir)/.., so that #include ## will find MUMBLE.h in this dir when we're ## building. -INCLUDES = -I.. -I$(srcdir)/.. -I$(srcdir)/../libguile ${THREAD_CPPFLAGS} +INCLUDES = -I.. -I$(srcdir)/.. GUILE_SNARF = ../libguile/guile-snarf diff --git a/guile-readline/readline.c b/guile-readline/readline.c index faadb9b05..7577aec50 100644 --- a/guile-readline/readline.c +++ b/guile-readline/readline.c @@ -35,7 +35,7 @@ #include #include "libguile/validate.h" -#include "readline.h" +#include "guile-readline/readline.h" scm_option scm_readline_opts[] = { { SCM_OPTION_BOOLEAN, "history-file", 1, @@ -503,7 +503,7 @@ match_paren (int x, int k) void scm_init_readline () { -#include "readline.x" +#include "guile-readline/readline.x" scm_readline_completion_function_var = scm_sysintern ("*readline-completion-function*", SCM_BOOL_F); rl_getc_function = current_input_getc; diff --git a/libguile/ChangeLog b/libguile/ChangeLog index 703f9d624..2aecf5f8e 100644 --- a/libguile/ChangeLog +++ b/libguile/ChangeLog @@ -1,5 +1,15 @@ 2000-04-21 Mikael Djurfeldt + * *.*: Change includes so that they always use the "prefixes" + libguile/, qt/, guile-readline/, or libltdl/. + (Thanks to Tim Mooney.) + + * Makefile.am (INCLUDES): Removed THREAD_CPPFLAGS and INCLTDL. + (DEFS): Added. automake adds -I options to DEFS, and we don't + want that. + Removed all -I options except for the root source directory and + the root build directory. + * numbers.c (scm_odd_p, scm_even_p): Use SCM_WRONG_TYPE_ARG instead of SCM_ASSERT (0, ...). (Some compilers will complain about control reaching end of function otherwise, and, besides, diff --git a/libguile/Makefile.am b/libguile/Makefile.am index 7573f75f6..90544c93b 100644 --- a/libguile/Makefile.am +++ b/libguile/Makefile.am @@ -21,10 +21,12 @@ AUTOMAKE_OPTIONS = foreign +## Prevent automake from adding extra -I options +DEFS = @DEFS@ ## Check for headers in $(srcdir)/.., so that #include ## will find MUMBLE.h in this dir when we're ## building. -INCLUDES = -I.. -I$(srcdir)/.. ${THREAD_CPPFLAGS} $(INCLTDL) +INCLUDES = -I.. -I$(srcdir)/.. ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(G?PROC\|G?PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' \ --regex='/[ \t]*SCM_[G]?DEFINE1?[ \t]*(\([^,]*\),[^,]*/\1/' diff --git a/libguile/_scm.h b/libguile/_scm.h index 6ed63c033..c61717036 100644 --- a/libguile/_scm.h +++ b/libguile/_scm.h @@ -44,7 +44,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include "libguile/__scm.h" /* "What's the difference between _scm.h and __scm.h?" @@ -60,21 +60,21 @@ /* Include headers for those files central to the implementation. The rest should be explicitly #included in the C files themselves. */ -#include "error.h" /* Everyone signals errors. */ -#include "print.h" /* Everyone needs to print. */ -#include "pairs.h" /* Everyone conses. */ -#include "list.h" /* Everyone makes lists. */ -#include "gc.h" /* Everyone allocates. */ -#include "gsubr.h" /* Everyone defines global functions. */ -#include "procs.h" /* Same. */ -#include "numbers.h" /* Everyone deals with fixnums. */ -#include "symbols.h" /* For length, chars, values, miscellany. */ -#include "boolean.h" /* Everyone wonders about the truth. */ -#ifdef USE_THREADS -#include "threads.h" /* The cooperative thread package does +#include "libguile/error.h" /* Everyone signals errors. */ +#include "libguile/print.h" /* Everyone needs to print. */ +#include "libguile/pairs.h" /* Everyone conses. */ +#include "libguile/list.h" /* Everyone makes lists. */ +#include "libguile/gc.h" /* Everyone allocates. */ +#include "libguile/gsubr.h" /* Everyone defines global functions. */ +#include "libguile/procs.h" /* Same. */ +#include "libguile/numbers.h" /* Everyone deals with fixnums. */ +#include "libguile/symbols.h" /* For length, chars, values, miscellany. */ +#include "libguile/boolean.h" /* Everyone wonders about the truth. */ +#ifdef USE_THREADS +#include "libguile/threads.h" /* The cooperative thread package does switching at async ticks. */ #endif -#include "snarf.h" /* Everyone snarfs. */ +#include "libguile/snarf.h" /* Everyone snarfs. */ /* On VMS, GNU C's errno.h contains a special hack to get link attributes * for errno correct for linking to the C RTL. diff --git a/libguile/alist.c b/libguile/alist.c index 31936db85..c04446aa6 100644 --- a/libguile/alist.c +++ b/libguile/alist.c @@ -44,12 +44,12 @@ #include -#include "_scm.h" -#include "eq.h" -#include "list.h" +#include "libguile/_scm.h" +#include "libguile/eq.h" +#include "libguile/list.h" -#include "validate.h" -#include "alist.h" +#include "libguile/validate.h" +#include "libguile/alist.h" @@ -391,7 +391,7 @@ SCM_DEFINE (scm_assoc_remove_x, "assoc-remove!", 2, 0, 0, void scm_init_alist () { -#include "alist.x" +#include "libguile/alist.x" } diff --git a/libguile/alloca.c b/libguile/alloca.c index 1f9b29d07..b93fbe51e 100644 --- a/libguile/alloca.c +++ b/libguile/alloca.c @@ -36,7 +36,7 @@ #endif #ifdef emacs -#include "blockinput.h" +#include "libguile/blockinput.h" #endif /* If compiling with GCC 2, this file's not needed. */ diff --git a/libguile/arbiters.c b/libguile/arbiters.c index 85afed64d..414cbffa6 100644 --- a/libguile/arbiters.c +++ b/libguile/arbiters.c @@ -45,12 +45,12 @@ #include -#include "_scm.h" -#include "ports.h" -#include "smob.h" +#include "libguile/_scm.h" +#include "libguile/ports.h" +#include "libguile/smob.h" -#include "validate.h" -#include "arbiters.h" +#include "libguile/validate.h" +#include "libguile/arbiters.h" /* {Arbiters} @@ -128,7 +128,7 @@ scm_init_arbiters () { scm_tc16_arbiter = scm_make_smob_type_mfpe ("arbiter", 0, scm_markcdr, NULL, prinarb, NULL); -#include "arbiters.x" +#include "libguile/arbiters.x" } /* diff --git a/libguile/async.c b/libguile/async.c index 718a9a126..906a22acd 100644 --- a/libguile/async.c +++ b/libguile/async.c @@ -46,14 +46,14 @@ #include #include -#include "_scm.h" -#include "eval.h" -#include "throw.h" -#include "root.h" -#include "smob.h" +#include "libguile/_scm.h" +#include "libguile/eval.h" +#include "libguile/throw.h" +#include "libguile/root.h" +#include "libguile/smob.h" -#include "validate.h" -#include "async.h" +#include "libguile/validate.h" +#include "libguile/async.h" #ifdef HAVE_STRING_H #include @@ -498,7 +498,7 @@ scm_init_async () a_thunk = scm_make_gsubr ("%gc-thunk", 0, 0, 0, scm_sys_gc_async_thunk); scm_gc_async = scm_system_async (a_thunk); -#include "async.x" +#include "libguile/async.x" } /* diff --git a/libguile/backtrace.c b/libguile/backtrace.c index 487cefa10..c5c9efa93 100644 --- a/libguile/backtrace.c +++ b/libguile/backtrace.c @@ -50,23 +50,23 @@ #include #include -#include "_scm.h" +#include "libguile/_scm.h" #ifdef HAVE_UNISTD_H #include #endif -#include "stacks.h" -#include "srcprop.h" -#include "struct.h" -#include "strports.h" -#include "throw.h" -#include "fluids.h" -#include "ports.h" -#include "strings.h" +#include "libguile/stacks.h" +#include "libguile/srcprop.h" +#include "libguile/struct.h" +#include "libguile/strports.h" +#include "libguile/throw.h" +#include "libguile/fluids.h" +#include "libguile/ports.h" +#include "libguile/strings.h" -#include "validate.h" -#include "backtrace.h" +#include "libguile/validate.h" +#include "libguile/backtrace.h" /* {Error reporting and backtraces} * (A first approximation.) @@ -639,7 +639,7 @@ scm_init_backtrace () SCM f = scm_make_fluid (); scm_the_last_stack_fluid = scm_sysintern ("the-last-stack", f); -#include "backtrace.x" +#include "libguile/backtrace.x" } /* diff --git a/libguile/boolean.c b/libguile/boolean.c index 39774dfaf..3e953a913 100644 --- a/libguile/boolean.c +++ b/libguile/boolean.c @@ -45,10 +45,10 @@ #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "validate.h" -#include "boolean.h" +#include "libguile/validate.h" +#include "libguile/boolean.h" @@ -76,7 +76,7 @@ SCM_DEFINE (scm_boolean_p, "boolean?", 1, 0, 0, void scm_init_boolean () { -#include "boolean.x" +#include "libguile/boolean.x" } diff --git a/libguile/chars.c b/libguile/chars.c index a7d8d195a..0ab7c6540 100644 --- a/libguile/chars.c +++ b/libguile/chars.c @@ -46,10 +46,10 @@ #include #include -#include "_scm.h" -#include "validate.h" +#include "libguile/_scm.h" +#include "libguile/validate.h" -#include "chars.h" +#include "libguile/chars.h" SCM_DEFINE (scm_char_p, "char?", 1, 0, 0, @@ -397,7 +397,7 @@ int scm_n_charnames = sizeof (scm_charnames) / sizeof (char *); void scm_init_chars () { -#include "chars.x" +#include "libguile/chars.x" } diff --git a/libguile/continuations.c b/libguile/continuations.c index 1f93da312..0d027c39c 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -45,15 +45,15 @@ #include -#include "_scm.h" -#include "root.h" -#include "stackchk.h" +#include "libguile/_scm.h" +#include "libguile/root.h" +#include "libguile/stackchk.h" #ifdef DEBUG_EXTENSIONS -#include "debug.h" +#include "libguile/debug.h" #endif -#include "dynwind.h" +#include "libguile/dynwind.h" -#include "continuations.h" +#include "libguile/continuations.h" @@ -235,7 +235,7 @@ scm_call_continuation (SCM cont, SCM val) void scm_init_continuations () { -#include "continuations.x" +#include "libguile/continuations.x" } diff --git a/libguile/coop-defs.h b/libguile/coop-defs.h index a863d5218..4939580a7 100644 --- a/libguile/coop-defs.h +++ b/libguile/coop-defs.h @@ -62,7 +62,7 @@ # endif #ifdef GUILE_ISELECT -#include "iselect.h" +#include "libguile/iselect.h" #endif #ifdef GUILE_PTHREAD_COMPAT diff --git a/libguile/coop-threads.c b/libguile/coop-threads.c index 86194bd70..c2f5696ed 100644 --- a/libguile/coop-threads.c +++ b/libguile/coop-threads.c @@ -44,17 +44,17 @@ -#include "validate.h" -#include "coop-threads.h" -#include "root.h" -#include "strings.h" +#include "libguile/validate.h" +#include "libguile/coop-threads.h" +#include "libguile/root.h" +#include "libguile/strings.h" /* A counter of the current number of threads */ size_t scm_thread_count = 0; /* This is included rather than compiled separately in order to simplify the configuration mechanism. */ -#include "coop.c" +#include "libguile/coop.c" /* A count-down counter used to determine when to switch contexts */ diff --git a/libguile/coop-threads.h b/libguile/coop-threads.h index 5dd0fcbda..7519ea2f5 100644 --- a/libguile/coop-threads.h +++ b/libguile/coop-threads.h @@ -55,8 +55,8 @@ #include -#include "coop-defs.h" -#include "../qt/qt.h" +#include "libguile/coop-defs.h" +#include "qt/qt.h" /* This code is based on a sample thread libraru by David Keppel. Portions of this file fall under the following copyright: */ diff --git a/libguile/coop.c b/libguile/coop.c index 5635c3bb1..a79c416f0 100644 --- a/libguile/coop.c +++ b/libguile/coop.c @@ -40,7 +40,7 @@ * If you do not wish that, delete this exception notice. */ -/* $Id: coop.c,v 1.24 2000-04-10 12:38:19 mdj Exp $ */ +/* $Id: coop.c,v 1.25 2000-04-21 14:16:30 mdj Exp $ */ /* Cooperative thread library, based on QuickThreads */ @@ -50,8 +50,8 @@ #include -#include -#include "eval.h" +#include "qt/qt.h" +#include "libguile/eval.h" /* #define COOP_STKSIZE (0x10000) */ #define COOP_STKSIZE (scm_eval_stack) diff --git a/libguile/debug-malloc.c b/libguile/debug-malloc.c index 5c9fcebac..608cc2a02 100644 --- a/libguile/debug-malloc.c +++ b/libguile/debug-malloc.c @@ -45,9 +45,9 @@ #include #include -#include "_scm.h" -#include "alist.h" -#include "strings.h" +#include "libguile/_scm.h" +#include "libguile/alist.h" +#include "libguile/strings.h" #include "debug-malloc.h" diff --git a/libguile/debug.c b/libguile/debug.c index 237c018fc..f9db1da3d 100644 --- a/libguile/debug.c +++ b/libguile/debug.c @@ -48,26 +48,26 @@ #include -#include "_scm.h" -#include "eval.h" -#include "stackchk.h" -#include "throw.h" -#include "macros.h" -#include "smob.h" -#include "procprop.h" -#include "srcprop.h" -#include "alist.h" -#include "continuations.h" -#include "strports.h" -#include "read.h" -#include "feature.h" -#include "dynwind.h" -#include "modules.h" -#include "ports.h" -#include "root.h" - -#include "validate.h" -#include "debug.h" +#include "libguile/_scm.h" +#include "libguile/eval.h" +#include "libguile/stackchk.h" +#include "libguile/throw.h" +#include "libguile/macros.h" +#include "libguile/smob.h" +#include "libguile/procprop.h" +#include "libguile/srcprop.h" +#include "libguile/alist.h" +#include "libguile/continuations.h" +#include "libguile/strports.h" +#include "libguile/read.h" +#include "libguile/feature.h" +#include "libguile/dynwind.h" +#include "libguile/modules.h" +#include "libguile/ports.h" +#include "libguile/root.h" + +#include "libguile/validate.h" +#include "libguile/debug.h" /* {Run time control of the debugging evaluator} @@ -248,8 +248,8 @@ scm_make_memoized (SCM exp, SCM env) * - constant: SCM_IM_DISPATCH */ -#include "variable.h" -#include "procs.h" +#include "libguile/variable.h" +#include "libguile/procs.h" SCM_DEFINE (scm_make_gloc, "make-gloc", 1, 1, 0, (SCM var, SCM env), @@ -641,7 +641,7 @@ scm_init_debug () #endif scm_add_feature ("debug-extensions"); -#include "debug.x" +#include "libguile/debug.x" } /* diff --git a/libguile/dynl.c b/libguile/dynl.c index ffda7debc..701fa4d3a 100644 --- a/libguile/dynl.c +++ b/libguile/dynl.c @@ -65,14 +65,14 @@ maybe_drag_in_eprintf () #endif #include -#include "_scm.h" -#include "dynl.h" -#include "smob.h" -#include "keywords.h" -#include "ports.h" -#include "strings.h" +#include "libguile/_scm.h" +#include "libguile/dynl.h" +#include "libguile/smob.h" +#include "libguile/keywords.h" +#include "libguile/ports.h" +#include "libguile/strings.h" -#include "validate.h" +#include "libguile/validate.h" /* Converting a list of SCM strings into a argv-style array. You must have ints disabled for the whole lifetime of the created argv (from @@ -558,7 +558,7 @@ scm_init_dynamic_linking () scm_set_smob_mark (scm_tc16_dynamic_obj, mark_dynl_obj); scm_set_smob_print (scm_tc16_dynamic_obj, print_dynl_obj); sysdep_dynl_init (); -#include "dynl.x" +#include "libguile/dynl.x" kw_global = scm_make_keyword_from_dash_symbol (sym_global); } diff --git a/libguile/dynwind.c b/libguile/dynwind.c index e2f3aa351..7a3f5437d 100644 --- a/libguile/dynwind.c +++ b/libguile/dynwind.c @@ -45,14 +45,14 @@ #include -#include "_scm.h" -#include "eval.h" -#include "alist.h" -#include "fluids.h" -#include "ports.h" -#include "smob.h" +#include "libguile/_scm.h" +#include "libguile/eval.h" +#include "libguile/alist.h" +#include "libguile/fluids.h" +#include "libguile/ports.h" +#include "libguile/smob.h" -#include "dynwind.h" +#include "libguile/dynwind.h" /* {Dynamic wind} @@ -273,7 +273,7 @@ scm_init_dynwind () { tc16_guards = scm_make_smob_type_mfpe ("guards", 0, NULL, scm_free0, printguards, NULL); -#include "dynwind.x" +#include "libguile/dynwind.x" } /* diff --git a/libguile/eq.c b/libguile/eq.c index 0d054e931..b7d0188ce 100644 --- a/libguile/eq.c +++ b/libguile/eq.c @@ -44,18 +44,18 @@ #include -#include "_scm.h" -#include "ramap.h" -#include "stackchk.h" -#include "strorder.h" -#include "async.h" -#include "root.h" -#include "smob.h" -#include "unif.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/ramap.h" +#include "libguile/stackchk.h" +#include "libguile/strorder.h" +#include "libguile/async.h" +#include "libguile/root.h" +#include "libguile/smob.h" +#include "libguile/unif.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "eq.h" +#include "libguile/validate.h" +#include "libguile/eq.h" SCM_DEFINE1 (scm_eq_p, "eq?", scm_tc7_rpsubr, (SCM x, SCM y), @@ -204,7 +204,7 @@ SCM_DEFINE1 (scm_equal_p, "equal?", scm_tc7_rpsubr, void scm_init_eq () { -#include "eq.x" +#include "libguile/eq.x" } diff --git a/libguile/error.c b/libguile/error.c index bb5ae8bb8..c22913963 100644 --- a/libguile/error.c +++ b/libguile/error.c @@ -46,13 +46,13 @@ #include -#include "_scm.h" -#include "pairs.h" -#include "strings.h" -#include "throw.h" +#include "libguile/_scm.h" +#include "libguile/pairs.h" +#include "libguile/strings.h" +#include "libguile/throw.h" -#include "validate.h" -#include "error.h" +#include "libguile/validate.h" +#include "libguile/error.h" #ifdef HAVE_STRING_H #include @@ -325,8 +325,8 @@ scm_wta (SCM arg, const char *pos, const char *s_subr) void scm_init_error () { -#include "cpp_err_symbols.c" -#include "error.x" +#include "libguile/cpp_err_symbols.c" +#include "libguile/error.x" } diff --git a/libguile/eval.c b/libguile/eval.c index 182c86df0..54618fb2f 100644 --- a/libguile/eval.c +++ b/libguile/eval.c @@ -59,7 +59,7 @@ #ifndef DEVAL /* We need this to get the definitions for HAVE_ALLOCA_H, etc. */ -#include "scmconfig.h" +#include "libguile/scmconfig.h" /* AIX requires this to be the first thing in the file. The #pragma directive is indented so pre-ANSI compilers will ignore it, rather @@ -79,29 +79,29 @@ char *alloca (); #endif #include -#include "_scm.h" -#include "debug.h" -#include "alist.h" -#include "eq.h" -#include "continuations.h" -#include "throw.h" -#include "smob.h" -#include "macros.h" -#include "procprop.h" -#include "hashtab.h" -#include "hash.h" -#include "srcprop.h" -#include "stackchk.h" -#include "objects.h" -#include "async.h" -#include "feature.h" -#include "modules.h" -#include "ports.h" -#include "root.h" -#include "vectors.h" - -#include "validate.h" -#include "eval.h" +#include "libguile/_scm.h" +#include "libguile/debug.h" +#include "libguile/alist.h" +#include "libguile/eq.h" +#include "libguile/continuations.h" +#include "libguile/throw.h" +#include "libguile/smob.h" +#include "libguile/macros.h" +#include "libguile/procprop.h" +#include "libguile/hashtab.h" +#include "libguile/hash.h" +#include "libguile/srcprop.h" +#include "libguile/stackchk.h" +#include "libguile/objects.h" +#include "libguile/async.h" +#include "libguile/feature.h" +#include "libguile/modules.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/eval.h" SCM (*scm_memoize_method) (SCM, SCM); @@ -3904,7 +3904,7 @@ scm_init_eval () scm_sym_trace = SCM_CAR (scm_sysintern ("trace", SCM_UNDEFINED)); #endif -#include "eval.x" +#include "libguile/eval.x" scm_add_feature ("delay"); } diff --git a/libguile/evalext.c b/libguile/evalext.c index b9ddc8e31..4d6885bbc 100644 --- a/libguile/evalext.c +++ b/libguile/evalext.c @@ -44,14 +44,14 @@ -#include "_scm.h" -#include "eval.h" -#include "macros.h" -#include "modules.h" -#include "root.h" +#include "libguile/_scm.h" +#include "libguile/eval.h" +#include "libguile/macros.h" +#include "libguile/modules.h" +#include "libguile/root.h" -#include "validate.h" -#include "evalext.h" +#include "libguile/validate.h" +#include "libguile/evalext.h" SCM_SYMBOL (scm_sym_setter, "setter"); @@ -158,7 +158,7 @@ void scm_init_evalext () { scm_make_synt (scm_s_set_x, scm_makmmacro, scm_m_generalized_set_x); -#include "evalext.x" +#include "libguile/evalext.x" } /* diff --git a/libguile/feature.c b/libguile/feature.c index 6f3f5f2cd..7c2598105 100644 --- a/libguile/feature.c +++ b/libguile/feature.c @@ -45,17 +45,17 @@ #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "eval.h" -#include "ports.h" -#include "procprop.h" -#include "root.h" -#include "smob.h" -#include "strings.h" +#include "libguile/eval.h" +#include "libguile/ports.h" +#include "libguile/procprop.h" +#include "libguile/root.h" +#include "libguile/smob.h" +#include "libguile/strings.h" -#include "validate.h" -#include "feature.h" +#include "libguile/validate.h" +#include "libguile/feature.h" #ifdef HAVE_STRING_H #include @@ -348,7 +348,7 @@ scm_init_feature() scm_set_smob_mark (scm_tc16_hook, scm_markcdr); scm_set_smob_print (scm_tc16_hook, print_hook); -#include "feature.x" +#include "libguile/feature.x" } /* diff --git a/libguile/filesys.c b/libguile/filesys.c index 72e0bb1e4..bb20f5b78 100644 --- a/libguile/filesys.c +++ b/libguile/filesys.c @@ -44,16 +44,16 @@ #include -#include "_scm.h" -#include "smob.h" -#include "feature.h" -#include "fports.h" -#include "iselect.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/smob.h" +#include "libguile/feature.h" +#include "libguile/fports.h" +#include "libguile/iselect.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "filesys.h" +#include "libguile/validate.h" +#include "libguile/filesys.h" #ifdef HAVE_IO_H @@ -1462,7 +1462,7 @@ scm_sysintern ("F_SETOWN", scm_long2num (F_SETOWN)); scm_sysintern ("FD_CLOEXEC", scm_long2num (FD_CLOEXEC)); #endif -#include "filesys.x" +#include "libguile/filesys.x" } /* diff --git a/libguile/fluids.c b/libguile/fluids.c index 712afa988..29e732660 100644 --- a/libguile/fluids.c +++ b/libguile/fluids.c @@ -43,17 +43,17 @@ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */ -#include "_scm.h" -#include "print.h" -#include "smob.h" -#include "dynwind.h" -#include "fluids.h" -#include "alist.h" -#include "eval.h" -#include "ports.h" +#include "libguile/_scm.h" +#include "libguile/print.h" +#include "libguile/smob.h" +#include "libguile/dynwind.h" +#include "libguile/fluids.h" +#include "libguile/alist.h" +#include "libguile/eval.h" +#include "libguile/ports.h" #define INITIAL_FLUIDS 10 -#include "validate.h" +#include "libguile/validate.h" static volatile int n_fluids; long scm_tc16_fluid; @@ -260,7 +260,7 @@ scm_init_fluids () { scm_tc16_fluid = scm_make_smob_type_mfpe ("fluid", 0, NULL, NULL, print_fluid, NULL); -#include "fluids.x" +#include "libguile/fluids.x" } /* diff --git a/libguile/fports.c b/libguile/fports.c index 8e48412bf..210e7922d 100644 --- a/libguile/fports.c +++ b/libguile/fports.c @@ -46,11 +46,11 @@ #include #include -#include "_scm.h" -#include "strings.h" +#include "libguile/_scm.h" +#include "libguile/strings.h" -#include "validate.h" -#include "fports.h" +#include "libguile/validate.h" +#include "libguile/fports.h" #ifdef HAVE_STRING_H #include @@ -66,7 +66,7 @@ scm_sizet fwrite (); #include -#include "iselect.h" +#include "libguile/iselect.h" /* default buffer size, used if the O/S won't supply a value. */ static const int default_buffer_size = 1024; @@ -730,7 +730,7 @@ scm_make_fptob () void scm_init_fports () { -#include "fports.x" +#include "libguile/fports.x" scm_sysintern ("_IOFBF", SCM_MAKINUM (_IOFBF)); scm_sysintern ("_IOLBF", SCM_MAKINUM (_IOLBF)); scm_sysintern ("_IONBF", SCM_MAKINUM (_IONBF)); diff --git a/libguile/gc.c b/libguile/gc.c index 3752248f3..6cdc26e93 100644 --- a/libguile/gc.c +++ b/libguile/gc.c @@ -46,25 +46,25 @@ #include -#include "_scm.h" -#include "stime.h" -#include "stackchk.h" -#include "struct.h" -#include "weaks.h" -#include "guardians.h" -#include "smob.h" -#include "unif.h" -#include "async.h" -#include "ports.h" -#include "root.h" -#include "strings.h" -#include "vectors.h" - -#include "validate.h" -#include "gc.h" +#include "libguile/_scm.h" +#include "libguile/stime.h" +#include "libguile/stackchk.h" +#include "libguile/struct.h" +#include "libguile/weaks.h" +#include "libguile/guardians.h" +#include "libguile/smob.h" +#include "libguile/unif.h" +#include "libguile/async.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/gc.h" #ifdef GUILE_DEBUG_MALLOC -#include "debug-malloc.h" +#include "libguile/debug-malloc.h" #endif #ifdef HAVE_MALLOC_H @@ -2735,7 +2735,7 @@ scm_init_storage (scm_sizet init_heap_size_1, scm_sizet init_heap_size_2) void scm_init_gc () { -#include "gc.x" +#include "libguile/gc.x" } /* diff --git a/libguile/gdbint.c b/libguile/gdbint.c index ce07314de..3c2c90450 100644 --- a/libguile/gdbint.c +++ b/libguile/gdbint.c @@ -47,24 +47,24 @@ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */ -#include "_scm.h" +#include "libguile/_scm.h" #include #ifdef HAVE_UNISTD_H #include #endif -#include "tag.h" -#include "strports.h" -#include "read.h" -#include "eval.h" -#include "chars.h" -#include "modules.h" -#include "ports.h" -#include "root.h" -#include "strings.h" - -#include "gdbint.h" +#include "libguile/tag.h" +#include "libguile/strports.h" +#include "libguile/read.h" +#include "libguile/eval.h" +#include "libguile/chars.h" +#include "libguile/modules.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/strings.h" + +#include "libguile/gdbint.h" /* {Support for debugging with gdb} * @@ -77,7 +77,7 @@ #define GDB_TYPE SCM -#include "gdb_interface.h" +#include "libguile/gdb_interface.h" diff --git a/libguile/gh_data.c b/libguile/gh_data.c index 39a56a1b8..8fddb8148 100644 --- a/libguile/gh_data.c +++ b/libguile/gh_data.c @@ -43,7 +43,7 @@ #include -#include +#include "libguile/gh.h" #ifdef HAVE_STRING_H #include #endif diff --git a/libguile/gh_eval.c b/libguile/gh_eval.c index 007e6a033..0d0a1fa9e 100644 --- a/libguile/gh_eval.c +++ b/libguile/gh_eval.c @@ -44,7 +44,7 @@ #include -#include +#include "libguile/gh.h" typedef SCM (*gh_eval_t) (void *data, SCM jmpbuf); diff --git a/libguile/gh_funcs.c b/libguile/gh_funcs.c index 8400334f4..8ce009432 100644 --- a/libguile/gh_funcs.c +++ b/libguile/gh_funcs.c @@ -45,7 +45,7 @@ #include -#include +#include "libguile/gh.h" /* allows you to define new scheme primitives written in C */ SCM diff --git a/libguile/gh_init.c b/libguile/gh_init.c index 5b373b870..7b5efee3f 100644 --- a/libguile/gh_init.c +++ b/libguile/gh_init.c @@ -44,7 +44,7 @@ #include -#include +#include "libguile/gh.h" typedef void (*main_prog_t) (int argc, char **argv); typedef void (*repl_prog_t) (int argc, char **argv); diff --git a/libguile/gh_io.c b/libguile/gh_io.c index 28d8103a6..01e196e50 100644 --- a/libguile/gh_io.c +++ b/libguile/gh_io.c @@ -42,7 +42,7 @@ #include -#include +#include "libguile/gh.h" void gh_display (SCM x) diff --git a/libguile/gh_list.c b/libguile/gh_list.c index 5d85e5570..9ca1d0cae 100644 --- a/libguile/gh_list.c +++ b/libguile/gh_list.c @@ -44,7 +44,7 @@ #include -#include +#include "libguile/gh.h" /* returns the length of a list */ unsigned long diff --git a/libguile/gh_predicates.c b/libguile/gh_predicates.c index f7f2ad9be..20a1ab113 100644 --- a/libguile/gh_predicates.c +++ b/libguile/gh_predicates.c @@ -44,7 +44,7 @@ #include -#include +#include "libguile/gh.h" /* type predicates: tell you if an SCM object has a given type */ int diff --git a/libguile/gh_test_c.c b/libguile/gh_test_c.c index 9b4e37eb9..076041a30 100644 --- a/libguile/gh_test_c.c +++ b/libguile/gh_test_c.c @@ -44,7 +44,7 @@ #include #include -#include +#include "libguile/gh.h" SCM c_factorial (SCM s_n); SCM c_sin (SCM s_x); diff --git a/libguile/gh_test_repl.c b/libguile/gh_test_repl.c index 7fd3939aa..670d33511 100644 --- a/libguile/gh_test_repl.c +++ b/libguile/gh_test_repl.c @@ -46,7 +46,7 @@ #include #include -#include +#include "libguile/gh.h" SCM c_factorial (SCM s_n); SCM c_sin (SCM s_x); diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 43db9c76c..eae4283c2 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -45,12 +45,12 @@ #include -#include "_scm.h" -#include "procprop.h" -#include "root.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/procprop.h" +#include "libguile/root.h" +#include "libguile/vectors.h" -#include "gsubr.h" +#include "libguile/gsubr.h" /* * gsubr.c diff --git a/libguile/guardians.c b/libguile/guardians.c index 73348f898..ceae65136 100644 --- a/libguile/guardians.c +++ b/libguile/guardians.c @@ -57,14 +57,14 @@ #include #include -#include "_scm.h" -#include "ports.h" -#include "print.h" -#include "smob.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/ports.h" +#include "libguile/print.h" +#include "libguile/smob.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "guardians.h" +#include "libguile/validate.h" +#include "libguile/guardians.h" static long scm_tc16_guardian; @@ -327,7 +327,7 @@ scm_init_guardian() g_mark, NULL, g_print, NULL); guard1 = scm_make_subr_opt ("guardian", scm_tc7_subr_2o, guard, 0); -#include "guardians.x" +#include "libguile/guardians.x" } /* diff --git a/libguile/guile.c b/libguile/guile.c index 2439be08e..27be7a9dd 100644 --- a/libguile/guile.c +++ b/libguile/guile.c @@ -49,10 +49,10 @@ #include #ifdef HAVE_CONFIG_H -#include +#include #endif #ifdef DYNAMIC_LINKING -#include +#include #endif /* Debugger interface (don't change the order of the following lines) */ diff --git a/libguile/hash.c b/libguile/hash.c index b65f98a1f..80f6b8cd8 100644 --- a/libguile/hash.c +++ b/libguile/hash.c @@ -45,13 +45,13 @@ #include -#include "_scm.h" -#include "chars.h" -#include "ports.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/ports.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "hash.h" +#include "libguile/validate.h" +#include "libguile/hash.h" #ifndef floor @@ -248,7 +248,7 @@ SCM_DEFINE (scm_hash, "hash", 2, 0, 0, void scm_init_hash () { -#include "hash.x" +#include "libguile/hash.x" } diff --git a/libguile/hashtab.c b/libguile/hashtab.c index 66b2c6621..2f6a6f68d 100644 --- a/libguile/hashtab.c +++ b/libguile/hashtab.c @@ -45,14 +45,14 @@ #include -#include "_scm.h" -#include "alist.h" -#include "hash.h" -#include "eval.h" -#include "vectors.h" - -#include "validate.h" -#include "hashtab.h" +#include "libguile/_scm.h" +#include "libguile/alist.h" +#include "libguile/hash.h" +#include "libguile/eval.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/hashtab.h" @@ -563,7 +563,7 @@ scm_internal_hash_fold (SCM (*fn) (), void *closure, SCM init, SCM table) void scm_init_hashtab () { -#include "hashtab.x" +#include "libguile/hashtab.x" } /* diff --git a/libguile/init.c b/libguile/init.c index 109f54af4..76e5a97a8 100644 --- a/libguile/init.c +++ b/libguile/init.c @@ -50,92 +50,92 @@ #include #include -#include "_scm.h" +#include "libguile/_scm.h" /* Everybody has an init function. */ -#include "alist.h" -#include "arbiters.h" -#include "async.h" -#include "backtrace.h" -#include "boolean.h" -#include "chars.h" -#include "continuations.h" +#include "libguile/alist.h" +#include "libguile/arbiters.h" +#include "libguile/async.h" +#include "libguile/backtrace.h" +#include "libguile/boolean.h" +#include "libguile/chars.h" +#include "libguile/continuations.h" #ifdef DEBUG_EXTENSIONS -#include "debug.h" +#include "libguile/debug.h" #endif #ifdef GUILE_DEBUG_MALLOC -#include "debug-malloc.h" +#include "libguile/debug-malloc.h" #endif -#include "dynl.h" -#include "dynwind.h" -#include "eq.h" -#include "error.h" -#include "eval.h" -#include "evalext.h" -#include "feature.h" -#include "filesys.h" -#include "fluids.h" -#include "fports.h" -#include "gc.h" -#include "gdbint.h" -#include "gsubr.h" -#include "hash.h" -#include "hashtab.h" +#include "libguile/dynl.h" +#include "libguile/dynwind.h" +#include "libguile/eq.h" +#include "libguile/error.h" +#include "libguile/eval.h" +#include "libguile/evalext.h" +#include "libguile/feature.h" +#include "libguile/filesys.h" +#include "libguile/fluids.h" +#include "libguile/fports.h" +#include "libguile/gc.h" +#include "libguile/gdbint.h" +#include "libguile/gsubr.h" +#include "libguile/hash.h" +#include "libguile/hashtab.h" #ifdef GUILE_ISELECT -#include "iselect.h" +#include "libguile/iselect.h" #endif -#include "ioext.h" -#include "keywords.h" -#include "lang.h" -#include "list.h" -#include "load.h" -#include "macros.h" -#include "mallocs.h" -#include "modules.h" -#include "net_db.h" -#include "numbers.h" -#include "objects.h" -#include "objprop.h" -#include "options.h" -#include "pairs.h" -#include "ports.h" -#include "posix.h" +#include "libguile/ioext.h" +#include "libguile/keywords.h" +#include "libguile/lang.h" +#include "libguile/list.h" +#include "libguile/load.h" +#include "libguile/macros.h" +#include "libguile/mallocs.h" +#include "libguile/modules.h" +#include "libguile/net_db.h" +#include "libguile/numbers.h" +#include "libguile/objects.h" +#include "libguile/objprop.h" +#include "libguile/options.h" +#include "libguile/pairs.h" +#include "libguile/ports.h" +#include "libguile/posix.h" #ifdef HAVE_REGCOMP -#include "regex-posix.h" +#include "libguile/regex-posix.h" #endif -#include "print.h" -#include "procprop.h" -#include "procs.h" -#include "ramap.h" -#include "random.h" -#include "read.h" -#include "scmsigs.h" -#include "script.h" -#include "simpos.h" -#include "smob.h" -#include "socket.h" -#include "sort.h" -#include "srcprop.h" -#include "stackchk.h" -#include "stacks.h" -#include "stime.h" -#include "strings.h" -#include "strop.h" -#include "strorder.h" -#include "strports.h" -#include "struct.h" -#include "symbols.h" -#include "tag.h" -#include "throw.h" -#include "unif.h" -#include "variable.h" -#include "vectors.h" -#include "version.h" -#include "vports.h" -#include "weaks.h" -#include "guardians.h" - -#include "init.h" +#include "libguile/print.h" +#include "libguile/procprop.h" +#include "libguile/procs.h" +#include "libguile/ramap.h" +#include "libguile/random.h" +#include "libguile/read.h" +#include "libguile/scmsigs.h" +#include "libguile/script.h" +#include "libguile/simpos.h" +#include "libguile/smob.h" +#include "libguile/socket.h" +#include "libguile/sort.h" +#include "libguile/srcprop.h" +#include "libguile/stackchk.h" +#include "libguile/stacks.h" +#include "libguile/stime.h" +#include "libguile/strings.h" +#include "libguile/strop.h" +#include "libguile/strorder.h" +#include "libguile/strports.h" +#include "libguile/struct.h" +#include "libguile/symbols.h" +#include "libguile/tag.h" +#include "libguile/throw.h" +#include "libguile/unif.h" +#include "libguile/variable.h" +#include "libguile/vectors.h" +#include "libguile/version.h" +#include "libguile/vports.h" +#include "libguile/weaks.h" +#include "libguile/guardians.h" + +#include "libguile/init.h" #ifdef HAVE_STRING_H #include diff --git a/libguile/ioext.c b/libguile/ioext.c index a529169e9..796ac091d 100644 --- a/libguile/ioext.c +++ b/libguile/ioext.c @@ -46,18 +46,18 @@ #include -#include "_scm.h" -#include "ports.h" -#include "read.h" -#include "fports.h" -#include "unif.h" -#include "chars.h" -#include "feature.h" -#include "root.h" -#include "strings.h" - -#include "validate.h" -#include "ioext.h" +#include "libguile/_scm.h" +#include "libguile/ports.h" +#include "libguile/read.h" +#include "libguile/fports.h" +#include "libguile/unif.h" +#include "libguile/chars.h" +#include "libguile/feature.h" +#include "libguile/root.h" +#include "libguile/strings.h" + +#include "libguile/validate.h" +#include "libguile/ioext.h" #include @@ -530,7 +530,7 @@ scm_init_ioext () { scm_add_feature ("i/o-extensions"); -#include "ioext.x" +#include "libguile/ioext.x" } diff --git a/libguile/iselect.c b/libguile/iselect.c index 682e9c77a..fabd7f802 100644 --- a/libguile/iselect.c +++ b/libguile/iselect.c @@ -43,14 +43,14 @@ #include #include -#include "_scm.h" -#include "async.h" +#include "libguile/_scm.h" +#include "libguile/async.h" -#include "iselect.h" +#include "libguile/iselect.h" #ifdef GUILE_ISELECT -#include "coop-threads.h" +#include "libguile/coop-threads.h" #ifdef MISSING_BZERO_DECL extern void bzero (void *, size_t); @@ -621,7 +621,7 @@ scm_init_iselect () timeout0.tv_usec = 0; #endif init_bc (0x80, 0, 0); -#include "iselect.x" +#include "libguile/iselect.x" } #endif /* GUILE_ISELECT */ diff --git a/libguile/keywords.c b/libguile/keywords.c index e4388d0d6..c1ecadafc 100644 --- a/libguile/keywords.c +++ b/libguile/keywords.c @@ -45,14 +45,14 @@ #include -#include "_scm.h" -#include "ports.h" -#include "root.h" -#include "smob.h" -#include "vectors.h" - -#include "validate.h" -#include "keywords.h" +#include "libguile/_scm.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/smob.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/keywords.h" static int @@ -138,7 +138,7 @@ scm_init_keywords () scm_markcdr, NULL, prin_keyword, NULL); scm_tc16_kw = scm_tc16_keyword; scm_keyword_obarray = scm_make_vector (SCM_MAKINUM (256), SCM_EOL); -#include "keywords.x" +#include "libguile/keywords.x" } diff --git a/libguile/lang.c b/libguile/lang.c index 3b93462a9..0672d0b70 100644 --- a/libguile/lang.c +++ b/libguile/lang.c @@ -44,13 +44,13 @@ -#include "_scm.h" +#include "libguile/_scm.h" -#include "eval.h" -#include "macros.h" -#include "root.h" +#include "libguile/eval.h" +#include "libguile/macros.h" +#include "libguile/root.h" -#include "validate.h" +#include "libguile/validate.h" #include "lang.h" @@ -150,7 +150,7 @@ SCM_DEFINE1 (scm_nil_eq, "nil-eq", scm_tc7_rpsubr, void scm_init_lang () { -#include "lang.x" +#include "libguile/lang.x" scm_make_synt ("nil-while", scm_makacro, scm_m_while); } diff --git a/libguile/list.c b/libguile/list.c index 28c890532..35e6bdc1f 100644 --- a/libguile/list.c +++ b/libguile/list.c @@ -44,11 +44,11 @@ #include -#include "_scm.h" -#include "eq.h" +#include "libguile/_scm.h" +#include "libguile/eq.h" -#include "validate.h" -#include "list.h" +#include "libguile/validate.h" +#include "libguile/list.h" #ifdef __STDC__ #include @@ -782,7 +782,7 @@ SCM_DEFINE (scm_delete1_x, "delete1!", 2, 0, 0, void scm_init_list () { -#include "list.x" +#include "libguile/list.x" } /* diff --git a/libguile/load.c b/libguile/load.c index 20b555500..97b686a6b 100644 --- a/libguile/load.c +++ b/libguile/load.c @@ -45,19 +45,19 @@ #include -#include "_scm.h" -#include "libpath.h" -#include "fports.h" -#include "read.h" -#include "eval.h" -#include "throw.h" -#include "alist.h" -#include "dynwind.h" -#include "root.h" -#include "strings.h" - -#include "validate.h" -#include "load.h" +#include "libguile/_scm.h" +#include "libguile/libpath.h" +#include "libguile/fports.h" +#include "libguile/read.h" +#include "libguile/eval.h" +#include "libguile/throw.h" +#include "libguile/alist.h" +#include "libguile/dynwind.h" +#include "libguile/root.h" +#include "libguile/strings.h" + +#include "libguile/validate.h" +#include "libguile/load.h" #include #include @@ -507,7 +507,7 @@ scm_init_load () init_build_info (); -#include "load.x" +#include "libguile/load.x" } /* diff --git a/libguile/macros.c b/libguile/macros.c index 87ec8abd9..f02090161 100644 --- a/libguile/macros.c +++ b/libguile/macros.c @@ -44,12 +44,12 @@ -#include "_scm.h" -#include "root.h" -#include "smob.h" +#include "libguile/_scm.h" +#include "libguile/root.h" +#include "libguile/smob.h" -#include "validate.h" -#include "macros.h" +#include "libguile/validate.h" +#include "libguile/macros.h" long scm_tc16_macro; @@ -181,7 +181,7 @@ scm_init_macros () { scm_tc16_macro = scm_make_smob_type_mfpe ("macro", 0, scm_markcdr, NULL, NULL, NULL); -#include "macros.x" +#include "libguile/macros.x" } /* diff --git a/libguile/mallocs.c b/libguile/mallocs.c index 65bff6fcb..5b96d9815 100644 --- a/libguile/mallocs.c +++ b/libguile/mallocs.c @@ -23,11 +23,11 @@ #include -#include "_scm.h" -#include "ports.h" -#include "smob.h" +#include "libguile/_scm.h" +#include "libguile/ports.h" +#include "libguile/smob.h" -#include "mallocs.h" +#include "libguile/mallocs.h" #ifdef HAVE_MALLOC_H #include diff --git a/libguile/modules.c b/libguile/modules.c index 3fc576bcd..b484528be 100644 --- a/libguile/modules.c +++ b/libguile/modules.c @@ -44,12 +44,12 @@ -#include "_scm.h" +#include "libguile/_scm.h" -#include "eval.h" -#include "procprop.h" +#include "libguile/eval.h" +#include "libguile/procprop.h" -#include "modules.h" +#include "libguile/modules.h" static SCM the_root_module; static SCM root_module_lookup_closure; @@ -179,7 +179,7 @@ scm_system_module_env_p (SCM env) void scm_init_modules () { -#include "modules.x" +#include "libguile/modules.x" } void diff --git a/libguile/net_db.c b/libguile/net_db.c index 26e8b21f8..49a8169b4 100644 --- a/libguile/net_db.c +++ b/libguile/net_db.c @@ -52,13 +52,13 @@ #include -#include "_scm.h" -#include "feature.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/feature.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "net_db.h" +#include "libguile/validate.h" +#include "libguile/net_db.h" #ifdef HAVE_STRING_H #include @@ -568,7 +568,7 @@ scm_init_net_db () #endif scm_add_feature ("net-db"); -#include "net_db.x" +#include "libguile/net_db.x" } /* diff --git a/libguile/numbers.c b/libguile/numbers.c index 1c897447a..d73cadc63 100644 --- a/libguile/numbers.c +++ b/libguile/numbers.c @@ -46,17 +46,17 @@ #include #include -#include "_scm.h" -#include "unif.h" -#include "feature.h" -#include "ports.h" -#include "root.h" -#include "smob.h" -#include "strings.h" -#include "vectors.h" - -#include "validate.h" -#include "numbers.h" +#include "libguile/_scm.h" +#include "libguile/unif.h" +#include "libguile/feature.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/smob.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/numbers.h" #define DIGITS '0':case '1':case '2':case '3':case '4':\ case '5':case '6':case '7':case '8':case '9' @@ -4656,7 +4656,7 @@ scm_init_numbers () scm_dblprec = scm_dblprec - 1; } #endif /* DBL_DIG */ -#include "numbers.x" +#include "libguile/numbers.x" } /* diff --git a/libguile/objects.c b/libguile/objects.c index 03330eb4f..083a18b43 100644 --- a/libguile/objects.c +++ b/libguile/objects.c @@ -49,21 +49,21 @@ * libguile. See the comments in objects.h. */ -#include "_scm.h" - -#include "struct.h" -#include "procprop.h" -#include "chars.h" -#include "keywords.h" -#include "smob.h" -#include "eval.h" -#include "alist.h" -#include "ports.h" -#include "strings.h" -#include "vectors.h" - -#include "validate.h" -#include "objects.h" +#include "libguile/_scm.h" + +#include "libguile/struct.h" +#include "libguile/procprop.h" +#include "libguile/chars.h" +#include "libguile/keywords.h" +#include "libguile/smob.h" +#include "libguile/eval.h" +#include "libguile/alist.h" +#include "libguile/ports.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/objects.h" SCM scm_metaclass_standard; @@ -490,7 +490,7 @@ scm_init_objects () SCM_SET_CLASS_DESTRUCTOR (et, scm_struct_free_entity); scm_sysintern ("", et); -#include "objects.x" +#include "libguile/objects.x" } /* diff --git a/libguile/objprop.c b/libguile/objprop.c index 1da9c1b99..1a485b2d6 100644 --- a/libguile/objprop.c +++ b/libguile/objprop.c @@ -45,13 +45,13 @@ #include -#include "_scm.h" -#include "hashtab.h" -#include "alist.h" -#include "root.h" -#include "weaks.h" +#include "libguile/_scm.h" +#include "libguile/hashtab.h" +#include "libguile/alist.h" +#include "libguile/root.h" +#include "libguile/weaks.h" -#include "objprop.h" +#include "libguile/objprop.h" /* {Object Properties} @@ -121,7 +121,7 @@ void scm_init_objprop () { scm_object_whash = scm_make_weak_key_hash_table (SCM_MAKINUM (511)); -#include "objprop.x" +#include "libguile/objprop.x" } diff --git a/libguile/options.c b/libguile/options.c index c59f18759..a727403dc 100644 --- a/libguile/options.c +++ b/libguile/options.c @@ -48,10 +48,10 @@ #include -#include "_scm.h" -#include "strings.h" +#include "libguile/_scm.h" +#include "libguile/strings.h" -#include "options.h" +#include "libguile/options.h" /* {Run-time options} @@ -233,7 +233,7 @@ void scm_init_options () { protected_objects = scm_permanent_object (scm_cons (SCM_UNDEFINED, SCM_EOL)); -#include "options.x" +#include "libguile/options.x" } /* diff --git a/libguile/pairs.c b/libguile/pairs.c index 1a090b075..d646becfb 100644 --- a/libguile/pairs.c +++ b/libguile/pairs.c @@ -44,10 +44,10 @@ #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "validate.h" +#include "libguile/validate.h" @@ -164,7 +164,7 @@ void scm_init_pairs () { scm_init_iprocs (cxrs, scm_tc7_cxr); -#include "pairs.x" +#include "libguile/pairs.x" } diff --git a/libguile/ports.c b/libguile/ports.c index f93b35dff..7f609cc13 100644 --- a/libguile/ports.c +++ b/libguile/ports.c @@ -46,17 +46,17 @@ /* Headers. */ #include -#include "_scm.h" -#include "objects.h" -#include "smob.h" -#include "chars.h" +#include "libguile/_scm.h" +#include "libguile/objects.h" +#include "libguile/smob.h" +#include "libguile/chars.h" -#include "keywords.h" -#include "root.h" -#include "strings.h" +#include "libguile/keywords.h" +#include "libguile/root.h" +#include "libguile/strings.h" -#include "validate.h" -#include "ports.h" +#include "libguile/validate.h" +#include "libguile/ports.h" #ifdef HAVE_STRING_H #include @@ -1402,7 +1402,7 @@ scm_init_ports () scm_tc16_void_port = scm_make_port_type ("void", fill_input_void_port, write_void_port); -#include "ports.x" +#include "libguile/ports.x" } /* diff --git a/libguile/posix.c b/libguile/posix.c index f71605de0..94ece0227 100644 --- a/libguile/posix.c +++ b/libguile/posix.c @@ -45,15 +45,15 @@ #include -#include "_scm.h" -#include "fports.h" -#include "scmsigs.h" -#include "feature.h" -#include "strings.h" -#include "vectors.h" - -#include "validate.h" -#include "posix.h" +#include "libguile/_scm.h" +#include "libguile/fports.h" +#include "libguile/scmsigs.h" +#include "libguile/feature.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/posix.h" #ifdef HAVE_STRING_H @@ -1322,8 +1322,8 @@ scm_init_posix () scm_sysintern ("PIPE_BUF", scm_long2num (PIPE_BUF)); #endif -#include "cpp_sig_symbols.c" -#include "posix.x" +#include "libguile/cpp_sig_symbols.c" +#include "libguile/posix.x" } /* diff --git a/libguile/print.c b/libguile/print.c index 878da0a32..5222da027 100644 --- a/libguile/print.c +++ b/libguile/print.c @@ -45,26 +45,26 @@ #include -#include "_scm.h" -#include "chars.h" -#include "smob.h" -#include "eval.h" -#include "macros.h" -#include "procprop.h" -#include "read.h" -#include "weaks.h" -#include "unif.h" -#include "alist.h" -#include "struct.h" -#include "objects.h" -#include "ports.h" -#include "root.h" -#include "strings.h" -#include "strports.h" -#include "vectors.h" - -#include "validate.h" -#include "print.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/smob.h" +#include "libguile/eval.h" +#include "libguile/macros.h" +#include "libguile/procprop.h" +#include "libguile/read.h" +#include "libguile/weaks.h" +#include "libguile/unif.h" +#include "libguile/alist.h" +#include "libguile/struct.h" +#include "libguile/objects.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/strports.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/print.h" /* {Names of immediate symbols} @@ -1119,7 +1119,7 @@ scm_init_print () scm_set_smob_mark (scm_tc16_port_with_ps, scm_markcdr); scm_set_smob_print (scm_tc16_port_with_ps, print_port_with_ps); -#include "print.x" +#include "libguile/print.x" } /* diff --git a/libguile/procprop.c b/libguile/procprop.c index b4cafa65b..c71ef3826 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -45,18 +45,18 @@ #include -#include "_scm.h" - -#include "alist.h" -#include "eval.h" -#include "procs.h" -#include "gsubr.h" -#include "objects.h" -#include "root.h" -#include "vectors.h" - -#include "validate.h" -#include "procprop.h" +#include "libguile/_scm.h" + +#include "libguile/alist.h" +#include "libguile/eval.h" +#include "libguile/procs.h" +#include "libguile/gsubr.h" +#include "libguile/objects.h" +#include "libguile/root.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/procprop.h" SCM_GLOBAL_SYMBOL (scm_sym_system_procedure, "system-procedure"); @@ -239,7 +239,7 @@ SCM_DEFINE (scm_set_procedure_property_x, "set-procedure-property!", 3, 0, 0, void scm_init_procprop () { -#include "procprop.x" +#include "libguile/procprop.x" } diff --git a/libguile/procs.c b/libguile/procs.c index 4d2b0955a..781557f4b 100644 --- a/libguile/procs.c +++ b/libguile/procs.c @@ -45,14 +45,14 @@ #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "objects.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/objects.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "procs.h" +#include "libguile/validate.h" +#include "libguile/procs.h" @@ -392,7 +392,7 @@ scm_init_subr_table () void scm_init_procs () { -#include "procs.x" +#include "libguile/procs.x" } /* diff --git a/libguile/ramap.c b/libguile/ramap.c index 853af5be1..e80d11006 100644 --- a/libguile/ramap.c +++ b/libguile/ramap.c @@ -52,18 +52,18 @@ #include -#include "_scm.h" -#include "unif.h" -#include "smob.h" -#include "chars.h" -#include "eq.h" -#include "eval.h" -#include "feature.h" -#include "root.h" -#include "vectors.h" - -#include "validate.h" -#include "ramap.h" +#include "libguile/_scm.h" +#include "libguile/unif.h" +#include "libguile/smob.h" +#include "libguile/chars.h" +#include "libguile/eq.h" +#include "libguile/eval.h" +#include "libguile/feature.h" +#include "libguile/root.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/ramap.h" typedef struct @@ -2016,7 +2016,7 @@ scm_init_ramap () init_raprocs (ra_asubrs); scm_make_subr (s_array_equal_p, scm_tc7_rpsubr, scm_array_equal_p); scm_smobs[0x0ff & (scm_tc16_array >> 8)].equalp = scm_raequal; -#include "ramap.x" +#include "libguile/ramap.x" scm_add_feature (s_scm_array_for_each); } diff --git a/libguile/random.c b/libguile/random.c index 825452e99..d69b023cb 100644 --- a/libguile/random.c +++ b/libguile/random.c @@ -44,18 +44,18 @@ /* Author: Mikael Djurfeldt */ -#include "_scm.h" +#include "libguile/_scm.h" #include #include -#include "smob.h" -#include "numbers.h" -#include "feature.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/smob.h" +#include "libguile/numbers.h" +#include "libguile/feature.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "random.h" +#include "libguile/validate.h" +#include "libguile/random.h" /* @@ -585,7 +585,7 @@ scm_init_random () for (i = m >> 1; i < m; ++i) scm_masktab[i] = m - 1; -#include "random.x" +#include "libguile/random.x" /* Check that the assumptions about bits per bignum digit are correct. */ #if SIZEOF_INT == 4 diff --git a/libguile/read.c b/libguile/read.c index 15924b44f..3ab736af2 100644 --- a/libguile/read.c +++ b/libguile/read.c @@ -45,22 +45,22 @@ #include -#include "_scm.h" -#include "chars.h" -#include "eval.h" -#include "unif.h" -#include "keywords.h" -#include "alist.h" -#include "srcprop.h" -#include "hashtab.h" -#include "hash.h" -#include "ports.h" -#include "root.h" -#include "strings.h" -#include "vectors.h" - -#include "validate.h" -#include "read.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/eval.h" +#include "libguile/unif.h" +#include "libguile/keywords.h" +#include "libguile/alist.h" +#include "libguile/srcprop.h" +#include "libguile/hashtab.h" +#include "libguile/hash.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/read.h" @@ -785,7 +785,7 @@ scm_init_read () SCM_CDRLOC (scm_sysintern ("read-hash-procedures", SCM_EOL)); scm_init_opts (scm_read_options, scm_read_opts, SCM_N_READ_OPTIONS); -#include "read.x" +#include "libguile/read.x" } /* diff --git a/libguile/regex-posix.c b/libguile/regex-posix.c index 2a1678be4..9e4ce3ae8 100644 --- a/libguile/regex-posix.c +++ b/libguile/regex-posix.c @@ -56,7 +56,7 @@ #include #include -#include "_scm.h" +#include "libguile/_scm.h" /* Supposedly, this file is never compiled unless we know we have POSIX regular expressions. But we still put this in an #ifdef so @@ -76,16 +76,16 @@ #endif #endif -#include "smob.h" -#include "symbols.h" -#include "vectors.h" -#include "strports.h" -#include "ports.h" -#include "feature.h" -#include "strings.h" +#include "libguile/smob.h" +#include "libguile/symbols.h" +#include "libguile/vectors.h" +#include "libguile/strports.h" +#include "libguile/ports.h" +#include "libguile/feature.h" +#include "libguile/strings.h" -#include "validate.h" -#include "regex-posix.h" +#include "libguile/validate.h" +#include "libguile/regex-posix.h" /* This is defined by some regex libraries and omitted by others. */ #ifndef REG_BASIC @@ -292,7 +292,7 @@ scm_init_regex_posix () scm_sysintern ("regexp/notbol", scm_long2num (REG_NOTBOL)); scm_sysintern ("regexp/noteol", scm_long2num (REG_NOTEOL)); -#include "regex-posix.x" +#include "libguile/regex-posix.x" scm_add_feature ("regex"); } diff --git a/libguile/root.c b/libguile/root.c index 9330b24b0..bc62c0013 100644 --- a/libguile/root.c +++ b/libguile/root.c @@ -45,17 +45,17 @@ #include -#include "_scm.h" -#include "stackchk.h" -#include "dynwind.h" -#include "eval.h" -#include "smob.h" -#include "pairs.h" -#include "throw.h" -#include "fluids.h" -#include "ports.h" - -#include "root.h" +#include "libguile/_scm.h" +#include "libguile/stackchk.h" +#include "libguile/dynwind.h" +#include "libguile/eval.h" +#include "libguile/smob.h" +#include "libguile/pairs.h" +#include "libguile/throw.h" +#include "libguile/fluids.h" +#include "libguile/ports.h" + +#include "libguile/root.h" /* Define this if you want to try out the stack allocation of cwdr's @@ -444,7 +444,7 @@ scm_init_root () scm_tc16_root = scm_make_smob_type_mfpe ("root", sizeof (struct scm_root_state), mark_root, NULL, print_root, NULL); -#include "root.x" +#include "libguile/root.x" } /* diff --git a/libguile/scmsigs.c b/libguile/scmsigs.c index 29ab50235..ebe6f6263 100644 --- a/libguile/scmsigs.c +++ b/libguile/scmsigs.c @@ -46,14 +46,14 @@ #include #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "async.h" -#include "eval.h" -#include "vectors.h" +#include "libguile/async.h" +#include "libguile/eval.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "scmsigs.h" +#include "libguile/validate.h" +#include "libguile/scmsigs.h" #ifdef HAVE_UNISTD_H #include @@ -522,7 +522,7 @@ scm_init_scmsigs () scm_sysintern ("SA_RESTART", scm_long2num (SA_RESTART)); #endif -#include "scmsigs.x" +#include "libguile/scmsigs.x" } diff --git a/libguile/script.c b/libguile/script.c index dce16c740..29b6c18e0 100644 --- a/libguile/script.c +++ b/libguile/script.c @@ -46,12 +46,12 @@ #include #include -#include "_scm.h" -#include "gh.h" -#include "load.h" -#include "version.h" +#include "libguile/_scm.h" +#include "libguile/gh.h" +#include "libguile/load.h" +#include "libguile/version.h" -#include "script.h" +#include "libguile/script.h" #ifdef HAVE_STRING_H #include @@ -651,7 +651,7 @@ scm_shell (int argc, char **argv) void scm_init_script () { -#include "script.x" +#include "libguile/script.x" } /* diff --git a/libguile/simpos.c b/libguile/simpos.c index 841108ff3..89428d197 100644 --- a/libguile/simpos.c +++ b/libguile/simpos.c @@ -45,13 +45,13 @@ #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "scmsigs.h" -#include "strings.h" +#include "libguile/scmsigs.h" +#include "libguile/strings.h" -#include "validate.h" -#include "simpos.h" +#include "libguile/validate.h" +#include "libguile/simpos.h" #ifdef HAVE_STRING_H #include @@ -135,7 +135,7 @@ SCM_DEFINE (scm_primitive_exit, "primitive-exit", 0, 1, 0, void scm_init_simpos () { -#include "simpos.x" +#include "libguile/simpos.x" } diff --git a/libguile/smob.c b/libguile/smob.c index 6e5cab1e9..2f65e8eb8 100644 --- a/libguile/smob.c +++ b/libguile/smob.c @@ -45,16 +45,16 @@ #include -#include "_scm.h" +#include "libguile/_scm.h" -#include "objects.h" -#include "ports.h" +#include "libguile/objects.h" +#include "libguile/ports.h" #ifdef HAVE_MALLOC_H #include #endif -#include "smob.h" +#include "libguile/smob.h" diff --git a/libguile/socket.c b/libguile/socket.c index 4e5cc3820..c50daa831 100644 --- a/libguile/socket.c +++ b/libguile/socket.c @@ -46,15 +46,15 @@ #include -#include "_scm.h" -#include "unif.h" -#include "feature.h" -#include "fports.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/unif.h" +#include "libguile/feature.h" +#include "libguile/fports.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "socket.h" +#include "libguile/validate.h" +#include "libguile/socket.h" #ifdef HAVE_STRING_H #include @@ -976,7 +976,7 @@ scm_init_socket () scm_add_feature ("socket"); scm_init_addr_buffer (); -#include "socket.x" +#include "libguile/socket.x" } diff --git a/libguile/sort.c b/libguile/sort.c index 7fba0df4c..d4b543ec9 100644 --- a/libguile/sort.c +++ b/libguile/sort.c @@ -59,7 +59,7 @@ */ /* We need this to get the definitions for HAVE_ALLOCA_H, etc. */ -#include "scmconfig.h" +#include "libguile/scmconfig.h" /* AIX requires this to be the first thing in the file. The #pragma directive is indented so pre-ANSI compilers will ignore it, rather @@ -78,17 +78,17 @@ char *alloca (); # endif #endif -#include "_scm.h" +#include "libguile/_scm.h" -#include "eval.h" -#include "unif.h" -#include "ramap.h" -#include "alist.h" -#include "feature.h" -#include "vectors.h" +#include "libguile/eval.h" +#include "libguile/unif.h" +#include "libguile/ramap.h" +#include "libguile/alist.h" +#include "libguile/feature.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "sort.h" +#include "libguile/validate.h" +#include "libguile/sort.h" /* The routine quicksort was extracted from the GNU C Library qsort.c written by Douglas C. Schmidt (schmidt@ics.uci.edu) @@ -949,7 +949,7 @@ SCM_DEFINE (scm_sort_list, "sort-list", 2, 0, 0, void scm_init_sort () { -#include "sort.x" +#include "libguile/sort.x" scm_add_feature ("sort"); } diff --git a/libguile/srcprop.c b/libguile/srcprop.c index 6dce8a90f..54afae7a7 100644 --- a/libguile/srcprop.c +++ b/libguile/srcprop.c @@ -48,18 +48,18 @@ #include -#include "_scm.h" -#include "smob.h" -#include "alist.h" -#include "debug.h" -#include "hashtab.h" -#include "hash.h" -#include "ports.h" -#include "root.h" -#include "weaks.h" +#include "libguile/_scm.h" +#include "libguile/smob.h" +#include "libguile/alist.h" +#include "libguile/debug.h" +#include "libguile/hashtab.h" +#include "libguile/hash.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/weaks.h" -#include "validate.h" -#include "srcprop.h" +#include "libguile/validate.h" +#include "libguile/srcprop.h" /* {Source Properties} * @@ -335,7 +335,7 @@ scm_init_srcprop () scm_sym_breakpoint = SCM_CAR (scm_sysintern ("breakpoint", SCM_UNDEFINED)); scm_sysintern ("source-whash", scm_source_whash); -#include "srcprop.x" +#include "libguile/srcprop.x" } void diff --git a/libguile/stackchk.c b/libguile/stackchk.c index 3f3633beb..86bd1d399 100644 --- a/libguile/stackchk.c +++ b/libguile/stackchk.c @@ -45,11 +45,11 @@ #include -#include "_scm.h" -#include "ports.h" -#include "root.h" +#include "libguile/_scm.h" +#include "libguile/ports.h" +#include "libguile/root.h" -#include "stackchk.h" +#include "libguile/stackchk.h" /* {Stack Checking} @@ -104,7 +104,7 @@ scm_stack_report () void scm_init_stackchk () { -#include "stackchk.x" +#include "libguile/stackchk.x" } /* diff --git a/libguile/stacks.c b/libguile/stacks.c index 85c13a624..961153423 100644 --- a/libguile/stacks.c +++ b/libguile/stacks.c @@ -49,19 +49,19 @@ #include -#include "_scm.h" -#include "eval.h" -#include "debug.h" -#include "continuations.h" -#include "struct.h" -#include "macros.h" -#include "procprop.h" -#include "modules.h" -#include "root.h" -#include "strings.h" - -#include "validate.h" -#include "stacks.h" +#include "libguile/_scm.h" +#include "libguile/eval.h" +#include "libguile/debug.h" +#include "libguile/continuations.h" +#include "libguile/struct.h" +#include "libguile/macros.h" +#include "libguile/procprop.h" +#include "libguile/modules.h" +#include "libguile/root.h" +#include "libguile/strings.h" + +#include "libguile/validate.h" +#include "libguile/stacks.h" /* {Frames and stacks} @@ -753,7 +753,7 @@ scm_init_stacks () SCM_EOL))); scm_set_struct_vtable_name_x (scm_stack_type, SCM_CAR (scm_intern0 ("stack"))); -#include "stacks.x" +#include "libguile/stacks.x" } /* diff --git a/libguile/stime.c b/libguile/stime.c index c408dd4d3..5f57b40cc 100644 --- a/libguile/stime.c +++ b/libguile/stime.c @@ -45,13 +45,13 @@ #include -#include "_scm.h" -#include "feature.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/feature.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "stime.h" +#include "libguile/validate.h" +#include "libguile/stime.h" #ifdef HAVE_UNISTD_H #include @@ -651,7 +651,7 @@ scm_init_stime() if (!scm_my_base) scm_my_base = mytime(); scm_add_feature ("current-time"); -#include "stime.x" +#include "libguile/stime.x" } diff --git a/libguile/strings.c b/libguile/strings.c index c9c7af4dc..733667d19 100644 --- a/libguile/strings.c +++ b/libguile/strings.c @@ -45,11 +45,11 @@ #include -#include "_scm.h" -#include "chars.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" -#include "strings.h" -#include "validate.h" +#include "libguile/strings.h" +#include "libguile/validate.h" /* {Strings} @@ -378,7 +378,7 @@ SCM_DEFINE (scm_make_shared_substring, "make-shared-substring", 1, 2, 0, void scm_init_strings () { -#include "strings.x" +#include "libguile/strings.x" } diff --git a/libguile/strop.c b/libguile/strop.c index 630ecbbca..15d0b4ed9 100644 --- a/libguile/strop.c +++ b/libguile/strop.c @@ -24,13 +24,13 @@ Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA #include -#include "_scm.h" -#include "chars.h" -#include "strings.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/strings.h" -#include "validate.h" -#include "strop.h" -#include "read.h" /*For SCM_CASE_INSENSITIVE_P*/ +#include "libguile/validate.h" +#include "libguile/strop.h" +#include "libguile/read.h" /*For SCM_CASE_INSENSITIVE_P*/ #ifdef HAVE_STRING_H #include @@ -492,7 +492,7 @@ SCM_DEFINE (scm_string_ci_to_symbol, "string-ci->symbol", 1, 0, 0, void scm_init_strop () { -#include "strop.x" +#include "libguile/strop.x" } /* diff --git a/libguile/strorder.c b/libguile/strorder.c index edaff6dc2..402732fe5 100644 --- a/libguile/strorder.c +++ b/libguile/strorder.c @@ -44,11 +44,11 @@ #include -#include "_scm.h" -#include "chars.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" -#include "validate.h" -#include "strorder.h" +#include "libguile/validate.h" +#include "libguile/strorder.h" SCM_DEFINE1 (scm_string_equal_p, "string=?", scm_tc7_rpsubr, @@ -233,7 +233,7 @@ SCM_DEFINE1 (scm_string_ci_geq_p, "string-ci>=?", scm_tc7_rpsubr, void scm_init_strorder () { -#include "strorder.x" +#include "libguile/strorder.x" } diff --git a/libguile/strports.c b/libguile/strports.c index 03ee0e73f..33ed1b4ee 100644 --- a/libguile/strports.c +++ b/libguile/strports.c @@ -44,22 +44,22 @@ -#include "_scm.h" +#include "libguile/_scm.h" #include #ifdef HAVE_UNISTD_H #include #endif -#include "unif.h" -#include "eval.h" -#include "ports.h" -#include "read.h" -#include "root.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/unif.h" +#include "libguile/eval.h" +#include "libguile/ports.h" +#include "libguile/read.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "strports.h" +#include "libguile/strports.h" #ifdef HAVE_STRING_H #include @@ -424,7 +424,7 @@ scm_make_stptob () void scm_init_strports () { -#include "strports.x" +#include "libguile/strports.x" } diff --git a/libguile/struct.c b/libguile/struct.c index b8ac3c85c..67440808a 100644 --- a/libguile/struct.c +++ b/libguile/struct.c @@ -45,17 +45,17 @@ #include -#include "_scm.h" -#include "chars.h" -#include "eval.h" -#include "alist.h" -#include "weaks.h" -#include "hashtab.h" -#include "ports.h" -#include "strings.h" - -#include "validate.h" -#include "struct.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/eval.h" +#include "libguile/alist.h" +#include "libguile/weaks.h" +#include "libguile/hashtab.h" +#include "libguile/ports.h" +#include "libguile/strings.h" + +#include "libguile/validate.h" +#include "libguile/struct.h" #ifdef HAVE_STRING_H #include @@ -764,7 +764,7 @@ scm_init_struct () scm_sysintern ("vtable-index-vtable", SCM_MAKINUM (scm_vtable_index_vtable)); scm_sysintern ("vtable-index-printer", SCM_MAKINUM (scm_vtable_index_printer)); scm_sysintern ("vtable-offset-user", SCM_MAKINUM (scm_vtable_offset_user)); -#include "struct.x" +#include "libguile/struct.x" } /* diff --git a/libguile/symbols.c b/libguile/symbols.c index e02a8f567..300ea6157 100644 --- a/libguile/symbols.c +++ b/libguile/symbols.c @@ -45,18 +45,18 @@ #include -#include "_scm.h" -#include "chars.h" -#include "eval.h" -#include "variable.h" -#include "alist.h" -#include "root.h" -#include "strings.h" -#include "vectors.h" -#include "weaks.h" - -#include "validate.h" -#include "symbols.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/eval.h" +#include "libguile/variable.h" +#include "libguile/alist.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" +#include "libguile/weaks.h" + +#include "libguile/validate.h" +#include "libguile/symbols.h" #ifdef HAVE_STRING_H #include @@ -883,7 +883,7 @@ scm_init_symbols () { gensym_counter = 0; gensym_prefix = scm_permanent_object (scm_makfrom0str ("%%gensym")); -#include "symbols.x" +#include "libguile/symbols.x" } /* diff --git a/libguile/tag.c b/libguile/tag.c index d6044c71d..9bff613c1 100644 --- a/libguile/tag.c +++ b/libguile/tag.c @@ -44,11 +44,11 @@ #include -#include "_scm.h" -#include "chars.h" -#include "struct.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/struct.h" -#include "tag.h" +#include "libguile/tag.h" SCM_CONST_LONG (scm_utag_immediate_integer, "utag_immediate_integer", 0); @@ -215,7 +215,7 @@ SCM_DEFINE (scm_tag, "tag", 1, 0, 0, void scm_init_tag () { -#include "tag.x" +#include "libguile/tag.x" } diff --git a/libguile/threads.c b/libguile/threads.c index 2ee9dc1ef..697df005e 100644 --- a/libguile/threads.c +++ b/libguile/threads.c @@ -64,11 +64,11 @@ */ #include -#include "_scm.h" -#include "dynwind.h" -#include "smob.h" +#include "libguile/_scm.h" +#include "libguile/dynwind.h" +#include "libguile/smob.h" -#include "threads.h" +#include "libguile/threads.h" @@ -139,7 +139,7 @@ SCM_REGISTER_PROC(s_signal_condition_variable, "signal-condition-variable", 1, 0 #endif #ifdef USE_COOP_THREADS -#include "coop-threads.c" +#include "libguile/coop-threads.c" #endif @@ -151,7 +151,7 @@ scm_init_threads (SCM_STACKITEM *i) scm_tc16_mutex = scm_make_smob_type ("mutex", sizeof (coop_m)); scm_tc16_condvar = scm_make_smob_type ("condition-variable", sizeof (coop_c)); -#include "threads.x" +#include "libguile/threads.x" /* Initialize implementation specific details of the threads support */ scm_threads_init (i); } diff --git a/libguile/throw.c b/libguile/throw.c index 3c209fa7a..80ee191a1 100644 --- a/libguile/throw.c +++ b/libguile/throw.c @@ -45,24 +45,24 @@ #include -#include "_scm.h" -#include "smob.h" -#include "alist.h" -#include "eval.h" -#include "eq.h" -#include "dynwind.h" -#include "backtrace.h" +#include "libguile/_scm.h" +#include "libguile/smob.h" +#include "libguile/alist.h" +#include "libguile/eval.h" +#include "libguile/eq.h" +#include "libguile/dynwind.h" +#include "libguile/backtrace.h" #ifdef DEBUG_EXTENSIONS -#include "debug.h" +#include "libguile/debug.h" #endif -#include "continuations.h" -#include "stackchk.h" -#include "stacks.h" -#include "fluids.h" -#include "ports.h" +#include "libguile/continuations.h" +#include "libguile/stackchk.h" +#include "libguile/stacks.h" +#include "libguile/fluids.h" +#include "libguile/ports.h" -#include "validate.h" -#include "throw.h" +#include "libguile/validate.h" +#include "libguile/throw.h" /* the jump buffer data structure */ @@ -732,7 +732,7 @@ scm_init_throw () NULL, print_lazy_catch, NULL); -#include "throw.x" +#include "libguile/throw.x" } /* diff --git a/libguile/unif.c b/libguile/unif.c index 343c25a17..46c62b833 100644 --- a/libguile/unif.c +++ b/libguile/unif.c @@ -52,20 +52,20 @@ #include -#include "_scm.h" -#include "chars.h" -#include "eval.h" -#include "fports.h" -#include "smob.h" -#include "strop.h" -#include "feature.h" -#include "root.h" -#include "strings.h" -#include "vectors.h" - -#include "validate.h" -#include "unif.h" -#include "ramap.h" +#include "libguile/_scm.h" +#include "libguile/chars.h" +#include "libguile/eval.h" +#include "libguile/fports.h" +#include "libguile/smob.h" +#include "libguile/strop.h" +#include "libguile/feature.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" + +#include "libguile/validate.h" +#include "libguile/unif.h" +#include "libguile/ramap.h" #ifdef HAVE_UNISTD_H #include @@ -2563,7 +2563,7 @@ scm_init_unif () scm_raprin1, scm_array_equal_p); scm_add_feature ("array"); -#include "unif.x" +#include "libguile/unif.x" } /* diff --git a/libguile/variable.c b/libguile/variable.c index f96415fd3..137a7aa01 100644 --- a/libguile/variable.c +++ b/libguile/variable.c @@ -45,14 +45,14 @@ #include -#include "_scm.h" -#include "eq.h" -#include "ports.h" -#include "root.h" -#include "smob.h" - -#include "validate.h" -#include "variable.h" +#include "libguile/_scm.h" +#include "libguile/eq.h" +#include "libguile/ports.h" +#include "libguile/root.h" +#include "libguile/smob.h" + +#include "libguile/validate.h" +#include "libguile/variable.h" static int @@ -235,7 +235,7 @@ scm_init_variable () scm_tc16_variable = scm_make_smob_type_mfpe ("variable", 0, scm_markvar, NULL, prin_var, var_equal); anonymous_variable_sym = SCM_CAR (scm_sysintern ("anonymous-variable", SCM_UNDEFINED)); -#include "variable.x" +#include "libguile/variable.x" } diff --git a/libguile/vectors.c b/libguile/vectors.c index eedba1c4d..2d045b332 100644 --- a/libguile/vectors.c +++ b/libguile/vectors.c @@ -45,14 +45,14 @@ #include -#include "_scm.h" -#include "eq.h" -#include "root.h" -#include "strings.h" - -#include "validate.h" -#include "vectors.h" -#include "unif.h" +#include "libguile/_scm.h" +#include "libguile/eq.h" +#include "libguile/root.h" +#include "libguile/strings.h" + +#include "libguile/validate.h" +#include "libguile/vectors.h" +#include "libguile/unif.h" /* @@ -381,7 +381,7 @@ SCM_DEFINE (scm_vector_move_right_x, "vector-move-right!", 5, 0, 0, void scm_init_vectors () { -#include "vectors.x" +#include "libguile/vectors.x" /* scm_make_subr (s_resizuve, scm_tc7_subr_2, scm_vector_set_length_x); */ } diff --git a/libguile/version.c b/libguile/version.c index 605c2d9a7..48c0ad8ca 100644 --- a/libguile/version.c +++ b/libguile/version.c @@ -44,11 +44,11 @@ -#include "_scm.h" -#include "strings.h" -#include "versiondat.h" +#include "libguile/_scm.h" +#include "libguile/strings.h" +#include "libguile/versiondat.h" -#include "version.h" +#include "libguile/version.h" /* Return a Scheme string containing Guile's major version number. */ @@ -100,7 +100,7 @@ SCM_DEFINE (scm_version, "version", 0, 0, 0, void scm_init_version () { -#include "version.x" +#include "libguile/version.x" } /* diff --git a/libguile/vports.c b/libguile/vports.c index 4490d8fd5..b9d1884b7 100644 --- a/libguile/vports.c +++ b/libguile/vports.c @@ -45,16 +45,16 @@ #include -#include "_scm.h" -#include "eval.h" -#include "chars.h" -#include "fports.h" -#include "root.h" -#include "strings.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/eval.h" +#include "libguile/chars.h" +#include "libguile/fports.h" +#include "libguile/root.h" +#include "libguile/strings.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "vports.h" +#include "libguile/validate.h" +#include "libguile/vports.h" #ifdef HAVE_STRING_H #include @@ -211,7 +211,7 @@ scm_make_sfptob () void scm_init_vports () { -#include "vports.x" +#include "libguile/vports.x" } /* diff --git a/libguile/weaks.c b/libguile/weaks.c index 839cce654..cbd5d14f5 100644 --- a/libguile/weaks.c +++ b/libguile/weaks.c @@ -44,11 +44,11 @@ #include -#include "_scm.h" -#include "vectors.h" +#include "libguile/_scm.h" +#include "libguile/vectors.h" -#include "validate.h" -#include "weaks.h" +#include "libguile/validate.h" +#include "libguile/weaks.h" @@ -213,7 +213,7 @@ SCM_DEFINE (scm_doubly_weak_hash_table_p, "doubly-weak-hash-table?", 1, 0, 0, void scm_init_weaks () { -#include "weaks.x" +#include "libguile/weaks.x" } diff --git a/qt/ChangeLog b/qt/ChangeLog index b59821829..404ef81db 100644 --- a/qt/ChangeLog +++ b/qt/ChangeLog @@ -1,3 +1,13 @@ +2000-04-21 Mikael Djurfeldt + + * *.*: Change includes so that they always use the "prefixes" + libguile/, qt/, guile-readline/, or libltdl/. + + * Makefile.am (DEFS): Added. automake adds -I options to DEFS, + and we don't want that. + (INCLUDES): Removed all -I options except for the root source + directory and the root build directory. + 1999-10-05 Jim Blandy * Makefile.in, md/Makefile.in, time/Makefile.in: Deleted from CVS diff --git a/qt/Makefile.am b/qt/Makefile.am index e5eb9d6ff..482c3be11 100644 --- a/qt/Makefile.am +++ b/qt/Makefile.am @@ -27,6 +27,10 @@ SUBDIRS = md time lib_LTLIBRARIES = @QTHREAD_LTLIBS@ EXTRA_LTLIBRARIES = libqthreads.la +## Prevent automake from adding extra -I options +DEFS = @DEFS@ +INCLUDES = -I.. -I$(srcdir)/.. + libqthreads_la_SOURCES = qt.c copyright.h libqthreads_la_LIBADD = qtmds.lo qtmdc.lo libqthreads_la_DEPENDENCIES = qtmds.lo qtmdc.lo diff --git a/qt/qt.c b/qt/qt.c index 1e406d24c..d3e50bc17 100644 --- a/qt/qt.c +++ b/qt/qt.c @@ -1,5 +1,5 @@ -#include "copyright.h" -#include "qt.h" +#include "qt/copyright.h" +#include "qt/qt.h" #ifdef QT_VARGS_DEFAULT -- 2.20.1