From cd4f61de2f3eb734db2ae80c7456266221dd3ef5 Mon Sep 17 00:00:00 2001 From: Jim Blandy Date: Wed, 4 Sep 1996 06:21:08 +0000 Subject: [PATCH] Don't install the unwashed masses of Guile header files in the main #include path; put most of them in a subdirectory called 'libguile'. This avoids naming conflicts between Guile header files and system header files (of which there were a few). * Makefile.in (pkgincludedir): Deleted. (innerincludedir): New variable; this and $(includedir) are enough. (INCLUDE_CFLAGS): Search for headers in "-I$(srcdir)/..". (installed_h_files): Divide this up. Now this variable lists those header files which should go into $(includedir) (i.e. appear directly in the #include path), and ... (inner_h_files): ... this new variable says which files appear in a subdirectory, and are referred to as . (h_files): List them both. (install): Create innerincludedir, not pkgincludedir. Put the installed_h_files and inner_h_files in their proper places. (uninstall): Corresponding changes. * alist.h, append.h, arbiters.h, async.h, boolean.h, chars.h, continuations.h, debug.h, dynwind.h, error.h, eval.h, fdsocket.h, feature.h, fports.h, gc.h, genio.h, gsubr.h, hash.h, init.h, ioext.h, kw.h, libguile.h, list.h, markers.h, marksweep.h, mbstrings.h, numbers.h, options.h, pairs.h, ports.h, posix.h, print.h, procprop.h, procs.h, ramap.h, read.h, root.h, sequences.h, smob.h, socket.h, srcprop.h, stackchk.h, stime.h, strings.h, strop.h, strorder.h, strports.h, struct.h, symbols.h, tag.h, throw.h, unif.h, variable.h, vectors.h, version.h, vports.h, weaks.h: Find __scm.h in its new location. * __scm.h: Find scmconfig.h and tags.h in their new locations (they're both "inner" files). --- libguile/__scm.h | 4 +- libguile/alist.h | 2 +- libguile/append.h | 2 +- libguile/arbiters.h | 2 +- libguile/async.h | 2 +- libguile/boolean.h | 2 +- libguile/chars.h | 2 +- libguile/continuations.h | 2 +- libguile/debug.h | 2 +- libguile/dynwind.h | 2 +- libguile/error.h | 2 +- libguile/eval.h | 2 +- libguile/feature.h | 2 +- libguile/filesys.h | 2 +- libguile/fports.h | 2 +- libguile/gc.h | 2 +- libguile/genio.h | 2 +- libguile/gsubr.h | 2 +- libguile/hash.h | 2 +- libguile/init.h | 2 +- libguile/ioext.h | 2 +- libguile/kw.h | 2 +- libguile/libguile.h | 139 +++++++++++++++++++-------------------- libguile/list.h | 2 +- libguile/markers.h | 2 +- libguile/mbstrings.h | 2 +- libguile/numbers.h | 2 +- libguile/objprop.h | 2 +- libguile/options.h | 2 +- libguile/pairs.h | 2 +- libguile/ports.h | 2 +- libguile/posix.h | 2 +- libguile/print.h | 2 +- libguile/procprop.h | 2 +- libguile/procs.h | 2 +- libguile/ramap.h | 2 +- libguile/read.h | 2 +- libguile/root.h | 2 +- libguile/sequences.h | 2 +- libguile/smob.h | 2 +- libguile/socket.h | 2 +- libguile/srcprop.h | 2 +- libguile/stackchk.h | 2 +- libguile/stime.h | 2 +- libguile/strings.h | 2 +- libguile/strop.h | 2 +- libguile/strorder.h | 2 +- libguile/strports.h | 2 +- libguile/struct.h | 2 +- libguile/symbols.h | 2 +- libguile/tag.h | 2 +- libguile/throw.h | 2 +- libguile/unif.h | 2 +- libguile/variable.h | 2 +- libguile/vectors.h | 2 +- libguile/version.h | 2 +- libguile/vports.h | 2 +- libguile/weaks.h | 2 +- 58 files changed, 127 insertions(+), 128 deletions(-) diff --git a/libguile/__scm.h b/libguile/__scm.h index e33049eab..346b99728 100644 --- a/libguile/__scm.h +++ b/libguile/__scm.h @@ -119,7 +119,7 @@ typedef unsigned long ulong_long; /* What did the configure script discover about the outside world? */ -#include +#include /* Write prototype declarations like this: @@ -166,7 +166,7 @@ typedef unsigned long ulong_long; #endif /* def HAVE_LIMITS_H */ -#include "tags.h" +#include #ifdef vms diff --git a/libguile/alist.h b/libguile/alist.h index f0f90a4df..de162a517 100644 --- a/libguile/alist.h +++ b/libguile/alist.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/append.h b/libguile/append.h index 33197f976..1817e8e9c 100644 --- a/libguile/append.h +++ b/libguile/append.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/arbiters.h b/libguile/arbiters.h index 2a88a6ebc..22453570e 100644 --- a/libguile/arbiters.h +++ b/libguile/arbiters.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #ifdef __STDC__ diff --git a/libguile/async.h b/libguile/async.h index 2e99025ac..c3f560f99 100644 --- a/libguile/async.h +++ b/libguile/async.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/boolean.h b/libguile/boolean.h index 8c9b6a7e7..96a44bb66 100644 --- a/libguile/boolean.h +++ b/libguile/boolean.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include diff --git a/libguile/chars.h b/libguile/chars.h index 83afcfa7e..87e8ff652 100644 --- a/libguile/chars.h +++ b/libguile/chars.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include /* Immediate Characters diff --git a/libguile/continuations.h b/libguile/continuations.h index 176d423fc..39b231466 100644 --- a/libguile/continuations.h +++ b/libguile/continuations.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include diff --git a/libguile/debug.h b/libguile/debug.h index 3cfee5894..a26e82105 100644 --- a/libguile/debug.h +++ b/libguile/debug.h @@ -48,7 +48,7 @@ #include "options.h" -#include "__scm.h" +#include diff --git a/libguile/dynwind.h b/libguile/dynwind.h index 42f1515d2..c870e736f 100644 --- a/libguile/dynwind.h +++ b/libguile/dynwind.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include #ifdef __STDC__ diff --git a/libguile/error.h b/libguile/error.h index c635c5d13..9f311ea7d 100644 --- a/libguile/error.h +++ b/libguile/error.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include #include "pairs.h" diff --git a/libguile/eval.h b/libguile/eval.h index dedb7c5de..0f6815740 100644 --- a/libguile/eval.h +++ b/libguile/eval.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/feature.h b/libguile/feature.h index c1f7b1cb8..d57b18af2 100644 --- a/libguile/feature.h +++ b/libguile/feature.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/filesys.h b/libguile/filesys.h index 9949d383b..ca339359a 100644 --- a/libguile/filesys.h +++ b/libguile/filesys.h @@ -45,7 +45,7 @@ #include -#include "_scm.h" +#include diff --git a/libguile/fports.h b/libguile/fports.h index a0ca6fe3b..9a3c3a791 100644 --- a/libguile/fports.h +++ b/libguile/fports.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/gc.h b/libguile/gc.h index 56d2178b7..b3bf18fc3 100644 --- a/libguile/gc.h +++ b/libguile/gc.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #define SCM_FREEP(x) (SCM_CAR(x)==scm_tc_free_cell) diff --git a/libguile/genio.h b/libguile/genio.h index 30275211b..ee5f106ad 100644 --- a/libguile/genio.h +++ b/libguile/genio.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #include "ports.h" diff --git a/libguile/gsubr.h b/libguile/gsubr.h index 4aed7ef0a..005429970 100644 --- a/libguile/gsubr.h +++ b/libguile/gsubr.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #ifdef __STDC__ diff --git a/libguile/hash.h b/libguile/hash.h index 8c53d3696..be7007d96 100644 --- a/libguile/hash.h +++ b/libguile/hash.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #ifdef __STDC__ diff --git a/libguile/init.h b/libguile/init.h index 4917167dc..7e2dc900f 100644 --- a/libguile/init.h +++ b/libguile/init.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/ioext.h b/libguile/ioext.h index b7a30e2c0..09cfd11e0 100644 --- a/libguile/ioext.h +++ b/libguile/ioext.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/kw.h b/libguile/kw.h index c84899cff..d762fec86 100644 --- a/libguile/kw.h +++ b/libguile/kw.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/libguile.h b/libguile/libguile.h index a36fd7a42..9bb1f7baa 100644 --- a/libguile/libguile.h +++ b/libguile/libguile.h @@ -45,7 +45,7 @@ -#include "__scm.h" +#include #ifdef STDC_HEADERS # include @@ -61,80 +61,79 @@ # endif /* def _SIZE_T */ #endif /* def STDC_HEADERS */ -#include "smob.h" +#include -#include "alist.h" -#include "append.h" -#include "arbiters.h" -#include "async.h" -#include "boolean.h" -#include "chars.h" -#include "continuations.h" +#include +#include +#include +#include +#include +#include +#include #ifdef DEBUG_EXTENSIONS -#include "debug.h" +#include #endif -#include "dynwind.h" -#include "eq.h" -#include "error.h" -#include "eval.h" -#include "extchrs.h" -#include "fdsocket.h" -#include "feature.h" -#include "files.h" -#include "filesys.h" -#include "fports.h" -#include "gc.h" -#include "genio.h" -#include "gsubr.h" -#include "hash.h" -#include "hashtab.h" -#include "init.h" -#include "ioext.h" -#include "kw.h" -#include "libguile.h" -#include "list.h" -#include "load.h" -#include "mallocs.h" -#include "markers.h" -#include "marksweep.h" -#include "mbstrings.h" -#include "numbers.h" -#include "objprop.h" -#include "options.h" -#include "pairs.h" -#include "params.h" -#include "ports.h" -#include "posix.h" -#include "print.h" -#include "procprop.h" -#include "procs.h" -#include "ramap.h" -#include "read.h" -#include "root.h" -#include "scmsigs.h" -#include "sequences.h" -#include "simpos.h" -#include "socket.h" -#include "srcprop.h" -#include "stackchk.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 "tags.h" -#include "throw.h" -#include "unif.h" -#include "variable.h" -#include "vectors.h" -#include "version.h" -#include "vports.h" -#include "weaks.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/libguile/list.h b/libguile/list.h index ab0555540..adb77d30b 100644 --- a/libguile/list.h +++ b/libguile/list.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/markers.h b/libguile/markers.h index 0debbc4ac..70c926a18 100644 --- a/libguile/markers.h +++ b/libguile/markers.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/mbstrings.h b/libguile/mbstrings.h index e1d3ef0cb..88ad618f6 100644 --- a/libguile/mbstrings.h +++ b/libguile/mbstrings.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #include "symbols.h" diff --git a/libguile/numbers.h b/libguile/numbers.h index abd1e7a24..4f58b282b 100644 --- a/libguile/numbers.h +++ b/libguile/numbers.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/objprop.h b/libguile/objprop.h index af3771c22..86837edd4 100644 --- a/libguile/objprop.h +++ b/libguile/objprop.h @@ -45,7 +45,7 @@ #include -#include "_scm.h" +#include diff --git a/libguile/options.h b/libguile/options.h index 6b15d3088..b781385ae 100644 --- a/libguile/options.h +++ b/libguile/options.h @@ -47,7 +47,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/pairs.h b/libguile/pairs.h index b27e9c908..7d8004152 100644 --- a/libguile/pairs.h +++ b/libguile/pairs.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/ports.h b/libguile/ports.h index fac20af77..ff434dab3 100644 --- a/libguile/ports.h +++ b/libguile/ports.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #include "smob.h" diff --git a/libguile/posix.h b/libguile/posix.h index 2bef059c8..de4bfc806 100644 --- a/libguile/posix.h +++ b/libguile/posix.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/print.h b/libguile/print.h index 5660fc18b..c57888535 100644 --- a/libguile/print.h +++ b/libguile/print.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include extern scm_option scm_print_opts[]; diff --git a/libguile/procprop.h b/libguile/procprop.h index ee6f37cb3..e87258225 100644 --- a/libguile/procprop.h +++ b/libguile/procprop.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/procs.h b/libguile/procs.h index 332e06c1f..3b0a8e374 100644 --- a/libguile/procs.h +++ b/libguile/procs.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/ramap.h b/libguile/ramap.h index cb0ccd450..b6f3f79f7 100644 --- a/libguile/ramap.h +++ b/libguile/ramap.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #ifdef __STDC__ diff --git a/libguile/read.h b/libguile/read.h index 326108e92..dce210c7c 100644 --- a/libguile/read.h +++ b/libguile/read.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/root.h b/libguile/root.h index 3240d5907..4fab5f7e5 100644 --- a/libguile/root.h +++ b/libguile/root.h @@ -47,7 +47,7 @@ -#include "__scm.h" +#include diff --git a/libguile/sequences.h b/libguile/sequences.h index a508daa9b..1d75237b2 100644 --- a/libguile/sequences.h +++ b/libguile/sequences.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include diff --git a/libguile/smob.h b/libguile/smob.h index a35cefc27..08ce77279 100644 --- a/libguile/smob.h +++ b/libguile/smob.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include #include "params.h" diff --git a/libguile/socket.h b/libguile/socket.h index 28413a228..8656b2a2f 100644 --- a/libguile/socket.h +++ b/libguile/socket.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/srcprop.h b/libguile/srcprop.h index d9658d8b7..201c660f4 100644 --- a/libguile/srcprop.h +++ b/libguile/srcprop.h @@ -47,7 +47,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/stackchk.h b/libguile/stackchk.h index 29eb7e520..00f5ddf4e 100644 --- a/libguile/stackchk.h +++ b/libguile/stackchk.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include diff --git a/libguile/stime.h b/libguile/stime.h index c492d40fe..142cfe2d9 100644 --- a/libguile/stime.h +++ b/libguile/stime.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #ifdef __STDC__ diff --git a/libguile/strings.h b/libguile/strings.h index 852945752..7b72593a7 100644 --- a/libguile/strings.h +++ b/libguile/strings.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include #ifdef HAVE_STRING_H #include diff --git a/libguile/strop.h b/libguile/strop.h index d2b9a9c00..da0b9c58e 100644 --- a/libguile/strop.h +++ b/libguile/strop.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/strorder.h b/libguile/strorder.h index ebc4a8de8..137c1981d 100644 --- a/libguile/strorder.h +++ b/libguile/strorder.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/strports.h b/libguile/strports.h index 2eb01961e..a3635bb8d 100644 --- a/libguile/strports.h +++ b/libguile/strports.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include extern scm_ptobfuns scm_stptob; diff --git a/libguile/struct.h b/libguile/struct.h index b444e282b..8bb59b3aa 100644 --- a/libguile/struct.h +++ b/libguile/struct.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/symbols.h b/libguile/symbols.h index b1486ce7a..d9e8474e5 100644 --- a/libguile/symbols.h +++ b/libguile/symbols.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include extern int scm_symhash_dim; diff --git a/libguile/tag.h b/libguile/tag.h index a7d1ab761..ebd6d9ab4 100644 --- a/libguile/tag.h +++ b/libguile/tag.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/throw.h b/libguile/throw.h index f6aca5b24..45d947547 100644 --- a/libguile/throw.h +++ b/libguile/throw.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/unif.h b/libguile/unif.h index 077621c6f..3dbf200aa 100644 --- a/libguile/unif.h +++ b/libguile/unif.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include typedef struct scm_array diff --git a/libguile/variable.h b/libguile/variable.h index b9d84fd8c..8e8f3546d 100644 --- a/libguile/variable.h +++ b/libguile/variable.h @@ -43,7 +43,7 @@ * If you do not wish that, delete this exception notice. */ -#include "__scm.h" +#include diff --git a/libguile/vectors.h b/libguile/vectors.h index 3cf5c6478..92d14d873 100644 --- a/libguile/vectors.h +++ b/libguile/vectors.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/version.h b/libguile/version.h index d38d4f113..918816dcb 100644 --- a/libguile/version.h +++ b/libguile/version.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include diff --git a/libguile/vports.h b/libguile/vports.h index 17a50fa57..36cd3f1cf 100644 --- a/libguile/vports.h +++ b/libguile/vports.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include extern scm_ptobfuns scm_sfptob; diff --git a/libguile/weaks.h b/libguile/weaks.h index 426673211..a31166ec4 100644 --- a/libguile/weaks.h +++ b/libguile/weaks.h @@ -44,7 +44,7 @@ */ -#include "__scm.h" +#include -- 2.20.1