1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-15 16:20:17 +02:00

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 <libguile/mumble.h>.
(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).
This commit is contained in:
Jim Blandy 1996-09-04 06:21:08 +00:00
parent 60704a735b
commit cd4f61de2f
58 changed files with 127 additions and 128 deletions

View file

@ -119,7 +119,7 @@ typedef unsigned long ulong_long;
/* What did the configure script discover about the outside world? */ /* What did the configure script discover about the outside world? */
#include <scmconfig.h> #include <libguile/scmconfig.h>
/* Write prototype declarations like this: /* Write prototype declarations like this:
@ -166,7 +166,7 @@ typedef unsigned long ulong_long;
#endif /* def HAVE_LIMITS_H */ #endif /* def HAVE_LIMITS_H */
#include "tags.h" #include <libguile/tags.h>
#ifdef vms #ifdef vms

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef __STDC__ #ifdef __STDC__

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
/* Immediate Characters /* Immediate Characters

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -48,7 +48,7 @@
#include "options.h" #include "options.h"
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef __STDC__ #ifdef __STDC__

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#include "pairs.h" #include "pairs.h"

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -45,7 +45,7 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#define SCM_FREEP(x) (SCM_CAR(x)==scm_tc_free_cell) #define SCM_FREEP(x) (SCM_CAR(x)==scm_tc_free_cell)

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#include "ports.h" #include "ports.h"

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef __STDC__ #ifdef __STDC__

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef __STDC__ #ifdef __STDC__

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -45,7 +45,7 @@
#include "__scm.h" #include <libguile/__scm.h>
#ifdef STDC_HEADERS #ifdef STDC_HEADERS
# include <stdlib.h> # include <stdlib.h>
@ -61,80 +61,79 @@
# endif /* def _SIZE_T */ # endif /* def _SIZE_T */
#endif /* def STDC_HEADERS */ #endif /* def STDC_HEADERS */
#include "smob.h" #include <libguile/smob.h>
#include "alist.h" #include <libguile/alist.h>
#include "append.h" #include <libguile/append.h>
#include "arbiters.h" #include <libguile/arbiters.h>
#include "async.h" #include <libguile/async.h>
#include "boolean.h" #include <libguile/boolean.h>
#include "chars.h" #include <libguile/chars.h>
#include "continuations.h" #include <libguile/continuations.h>
#ifdef DEBUG_EXTENSIONS #ifdef DEBUG_EXTENSIONS
#include "debug.h" #include <libguile/debug.h>
#endif #endif
#include "dynwind.h" #include <libguile/dynwind.h>
#include "eq.h" #include <libguile/eq.h>
#include "error.h" #include <libguile/error.h>
#include "eval.h" #include <libguile/eval.h>
#include "extchrs.h" #include <libguile/extchrs.h>
#include "fdsocket.h" #include <libguile/fdsocket.h>
#include "feature.h" #include <libguile/feature.h>
#include "files.h" #include <libguile/files.h>
#include "filesys.h" #include <libguile/filesys.h>
#include "fports.h" #include <libguile/fports.h>
#include "gc.h" #include <libguile/gc.h>
#include "genio.h" #include <libguile/genio.h>
#include "gsubr.h" #include <libguile/gsubr.h>
#include "hash.h" #include <libguile/hash.h>
#include "hashtab.h" #include <libguile/hashtab.h>
#include "init.h" #include <libguile/init.h>
#include "ioext.h" #include <libguile/ioext.h>
#include "kw.h" #include <libguile/kw.h>
#include "libguile.h" #include <libguile/list.h>
#include "list.h" #include <libguile/load.h>
#include "load.h" #include <libguile/mallocs.h>
#include "mallocs.h" #include <libguile/markers.h>
#include "markers.h" #include <libguile/marksweep.h>
#include "marksweep.h" #include <libguile/mbstrings.h>
#include "mbstrings.h" #include <libguile/numbers.h>
#include "numbers.h" #include <libguile/objprop.h>
#include "objprop.h" #include <libguile/options.h>
#include "options.h" #include <libguile/pairs.h>
#include "pairs.h" #include <libguile/params.h>
#include "params.h" #include <libguile/ports.h>
#include "ports.h" #include <libguile/posix.h>
#include "posix.h" #include <libguile/print.h>
#include "print.h" #include <libguile/procprop.h>
#include "procprop.h" #include <libguile/procs.h>
#include "procs.h" #include <libguile/ramap.h>
#include "ramap.h" #include <libguile/read.h>
#include "read.h" #include <libguile/root.h>
#include "root.h" #include <libguile/scmsigs.h>
#include "scmsigs.h" #include <libguile/sequences.h>
#include "sequences.h" #include <libguile/simpos.h>
#include "simpos.h" #include <libguile/socket.h>
#include "socket.h" #include <libguile/srcprop.h>
#include "srcprop.h" #include <libguile/stackchk.h>
#include "stackchk.h" #include <libguile/stime.h>
#include "stime.h" #include <libguile/strings.h>
#include "strings.h" #include <libguile/strop.h>
#include "strop.h" #include <libguile/strorder.h>
#include "strorder.h" #include <libguile/strports.h>
#include "strports.h" #include <libguile/struct.h>
#include "struct.h" #include <libguile/symbols.h>
#include "symbols.h" #include <libguile/tag.h>
#include "tag.h" #include <libguile/tags.h>
#include "tags.h" #include <libguile/throw.h>
#include "throw.h" #include <libguile/unif.h>
#include "unif.h" #include <libguile/variable.h>
#include "variable.h" #include <libguile/vectors.h>
#include "vectors.h" #include <libguile/version.h>
#include "version.h" #include <libguile/vports.h>
#include "vports.h" #include <libguile/weaks.h>
#include "weaks.h"

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#include "symbols.h" #include "symbols.h"

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -45,7 +45,7 @@
#include <stdio.h> #include <stdio.h>
#include "_scm.h" #include <libguile/__scm.h>

View file

@ -47,7 +47,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#include "smob.h" #include "smob.h"

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
extern scm_option scm_print_opts[]; extern scm_option scm_print_opts[];

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef __STDC__ #ifdef __STDC__

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -47,7 +47,7 @@
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#include "params.h" #include "params.h"

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -47,7 +47,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef __STDC__ #ifdef __STDC__

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
#ifdef HAVE_STRING_H #ifdef HAVE_STRING_H
#include <string.h> #include <string.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
extern scm_ptobfuns scm_stptob; extern scm_ptobfuns scm_stptob;

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
extern int scm_symhash_dim; extern int scm_symhash_dim;

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
typedef struct scm_array typedef struct scm_array

View file

@ -43,7 +43,7 @@
* If you do not wish that, delete this exception notice. * If you do not wish that, delete this exception notice.
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>
extern scm_ptobfuns scm_sfptob; extern scm_ptobfuns scm_sfptob;

View file

@ -44,7 +44,7 @@
*/ */
#include "__scm.h" #include <libguile/__scm.h>