* cpp_err_symbols.in: Renamed from cpp_err_symbols, to avoid

make's implicit cpp_err_symbols: cpp_err_symbols.c rule.
* cpp_sig_symbols.in: Renamed from cpp_sig_symbols.
* Makefile.am (check_errnos, check_signals, cpp_sig_symbols.c,
cpp_err_symbols.c): Corresponding changes.
* Makefile.in: Regenerated.

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index c1aa109..8368131 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -49,8 +49,8 @@ bin_SCRIPTS = guile-snarf
 
 EXTRA_DIST = gscm.c gscm.h ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \
 dynl-vms.c DYNAMIC-LINKING PLUGIN/REQ PLUGIN/guile.config \
-PLUGIN/guile.libs.in cpp_signal.c cpp_errno.c cpp_err_symbols \
-cpp_sig_symbols cpp_cnvt.awk
+PLUGIN/guile.libs.in cpp_signal.c cpp_errno.c cpp_err_symbols.in \
+cpp_sig_symbols.in cpp_cnvt.awk
 
 ## FIXME: shouldn't directly generate file; instead generate temp file
 ## and "mv".  Consider using timestamp file as well, to avoid
@@ -68,37 +68,39 @@ SUFFIXES = .x
 ## Add -MG to make the .x magic work with auto-dep code.
 MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
 
-cpp_err_symbols.c: cpp_err_symbols
-       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols > \
+cpp_err_symbols.c: cpp_err_symbols.in
+       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols.in > \
                cpp_err_symbols.c
 
-cpp_sig_symbols.c: cpp_sig_symbols
-       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_sig_symbols > \
+cpp_sig_symbols.c: cpp_sig_symbols.in
+       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_sig_symbols.in > \
                cpp_sig_symbols.c
 
-## Create a new version of the cpp_sig_symbols file, including all SIGXXX
+## Create a new version of the cpp_sig_symbols.in file, including all SIGXXX
 ## macros defined on this platform.
 check_signals:
        gcc -undef -dM -E $(srcdir)/cpp_signal.c | egrep ' SIG[A-Z]+' \
          | cut -f2 -d' ' | sort > cpp_sig_symbols_here
-       diff -u $(srcdir)/cpp_sig_symbols cpp_sig_symbols_here | egrep '^\+S' \
+       diff -u $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_here \
+          | egrep '^\+S' \
          | cut -c2- > cpp_sig_symbols_diff
        if test -s cpp_sig_symbols_diff ; then \
-         cat $(srcdir)/cpp_sig_symbols cpp_sig_symbols_diff \
+         cat $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_diff \
            | sort > cpp_sig_symbols_new ;\
          echo "cpp_sig_symbols_new has the following additions:" ;\
          cat cpp_sig_symbols_diff ;\
        else echo "No new symbols found."; \
        fi
 
-## Likewise for cpp_err_symbols.
+## Likewise for cpp_err_symbols.in.
 check_errnos:
        gcc -undef -dM -E $(srcdir)/cpp_errno.c | egrep ' E.+' \
          | cut -f2 -d' ' | sort > cpp_err_symbols_here
-       diff -u $(srcdir)/cpp_err_symbols cpp_err_symbols_here | egrep '^\+E' \
+       diff -u $(srcdir)/cpp_err_symbols.in cpp_err_symbols_here \
+          | egrep '^\+E' \
          | cut -c2- > cpp_err_symbols_diff
        if test -s cpp_err_symbols_diff ; then \
-         cat $(srcdir)/cpp_err_symbols cpp_err_symbols_diff \
+         cat $(srcdir)/cpp_err_symbols.in cpp_err_symbols_diff \
            | sort > cpp_err_symbols_new ;\
          echo "cpp_err_symbols_new has the following additions:" ;\
          cat cpp_err_symbols_diff ;\

diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 6b9f17d..ced0ec7 100644 (file)
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -95,8 +95,8 @@ bin_SCRIPTS = guile-snarf
 
 EXTRA_DIST = gscm.c gscm.h ChangeLog-scm dynl-dl.c dynl-dld.c dynl-shl.c \
 dynl-vms.c DYNAMIC-LINKING PLUGIN/REQ PLUGIN/guile.config \
-PLUGIN/guile.libs.in cpp_signal.c cpp_errno.c cpp_err_symbols \
-cpp_sig_symbols cpp_cnvt.awk
+PLUGIN/guile.libs.in cpp_signal.c cpp_errno.c cpp_err_symbols.in \
+cpp_sig_symbols.in cpp_cnvt.awk
 
 SUFFIXES = .x
 
@@ -495,21 +495,22 @@ libpath.h: Makefile
 .c.x:
        ./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 
-cpp_err_symbols.c: cpp_err_symbols
-       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols > \
+cpp_err_symbols.c: cpp_err_symbols.in
+       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_err_symbols.in > \
                cpp_err_symbols.c
 
-cpp_sig_symbols.c: cpp_sig_symbols
-       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_sig_symbols > \
+cpp_sig_symbols.c: cpp_sig_symbols.in
+       $(AWK) -f $(srcdir)/cpp_cnvt.awk < $(srcdir)/cpp_sig_symbols.in > \
                cpp_sig_symbols.c
 
 check_signals:
        gcc -undef -dM -E $(srcdir)/cpp_signal.c | egrep ' SIG[A-Z]+' \
          | cut -f2 -d' ' | sort > cpp_sig_symbols_here
-       diff -u $(srcdir)/cpp_sig_symbols cpp_sig_symbols_here | egrep '^\+S' \
+       diff -u $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_here \
+          | egrep '^\+S' \
          | cut -c2- > cpp_sig_symbols_diff
        if test -s cpp_sig_symbols_diff ; then \
-         cat $(srcdir)/cpp_sig_symbols cpp_sig_symbols_diff \
+         cat $(srcdir)/cpp_sig_symbols.in cpp_sig_symbols_diff \
            | sort > cpp_sig_symbols_new ;\
          echo "cpp_sig_symbols_new has the following additions:" ;\
          cat cpp_sig_symbols_diff ;\
@@ -519,10 +520,11 @@ check_signals:
 check_errnos:
        gcc -undef -dM -E $(srcdir)/cpp_errno.c | egrep ' E.+' \
          | cut -f2 -d' ' | sort > cpp_err_symbols_here
-       diff -u $(srcdir)/cpp_err_symbols cpp_err_symbols_here | egrep '^\+E' \
+       diff -u $(srcdir)/cpp_err_symbols.in cpp_err_symbols_here \
+          | egrep '^\+E' \
          | cut -c2- > cpp_err_symbols_diff
        if test -s cpp_err_symbols_diff ; then \
-         cat $(srcdir)/cpp_err_symbols cpp_err_symbols_diff \
+         cat $(srcdir)/cpp_err_symbols.in cpp_err_symbols_diff \
            | sort > cpp_err_symbols_new ;\
          echo "cpp_err_symbols_new has the following additions:" ;\
          cat cpp_err_symbols_diff ;\

diff --git a/libguile/cpp_err_symbols.in b/libguile/cpp_err_symbols.in
new file mode 100644 (file)
index 0000000..67b897c
--- /dev/null
+++ b/libguile/cpp_err_symbols.in
@@ -0,0 +1,122 @@
+E2BIG
+EACCES
+EADDRINUSE
+EADDRNOTAVAIL
+EADV
+EAFNOSUPPORT
+EAGAIN
+EALREADY
+EBADE
+EBADF
+EBADFD
+EBADMSG
+EBADR
+EBADRQC
+EBADSLT
+EBFONT
+EBUSY
+ECHILD
+ECHRNG
+ECOMM
+ECONNABORTED
+ECONNREFUSED
+ECONNRESET
+EDEADLK
+EDEADLOCK
+EDESTADDRREQ
+EDOM
+EDOTDOT
+EDQUOT
+EEXIST
+EFAULT
+EFBIG
+EHOSTDOWN
+EHOSTUNREACH
+EIDRM
+EILSEQ
+EINPROGRESS
+EINTR
+EINVAL
+EIO
+EISCONN
+EISDIR
+EISNAM
+EL2HLT
+EL2NSYNC
+EL3HLT
+EL3RST
+ELIBACC
+ELIBBAD
+ELIBEXEC
+ELIBMAX
+ELIBSCN
+ELNRNG
+ELOOP
+EMFILE
+EMLINK
+EMSGSIZE
+EMULTIHOP
+ENAMETOOLONG
+ENAVAIL
+ENETDOWN
+ENETRESET
+ENETUNREACH
+ENFILE
+ENOANO
+ENOBUFS
+ENOCSI
+ENODATA
+ENODEV
+ENOENT
+ENOEXEC
+ENOLCK
+ENOLINK
+ENOMEM
+ENOMSG
+ENONET
+ENOPKG
+ENOPROTOOPT
+ENOSPC
+ENOSR
+ENOSTR
+ENOSYS
+ENOTBLK
+ENOTCONN
+ENOTDIR
+ENOTEMPTY
+ENOTNAM
+ENOTSOCK
+ENOTTY
+ENOTUNIQ
+ENXIO
+EOPNOTSUPP
+EOVERFLOW
+EPERM
+EPFNOSUPPORT
+EPIPE
+EPROTO
+EPROTONOSUPPORT
+EPROTOTYPE
+ERANGE
+EREMCHG
+EREMOTE
+EREMOTEIO
+ERESTART
+EROFS
+ESHUTDOWN
+ESOCKTNOSUPPORT
+ESPIPE
+ESRCH
+ESRMNT
+ESTALE
+ESTRPIPE
+ETIME
+ETIMEDOUT
+ETOOMANYREFS
+ETXTBSY
+EUCLEAN
+EUNATCH
+EUSERS
+EWOULDBLOCK
+EXDEV
+EXFULL

diff --git a/libguile/cpp_sig_symbols.in b/libguile/cpp_sig_symbols.in
new file mode 100644 (file)
index 0000000..a533ea1
--- /dev/null
+++ b/libguile/cpp_sig_symbols.in
@@ -0,0 +1,34 @@
+SIGABRT
+SIGALRM
+SIGBUS
+SIGCHLD
+SIGCLD
+SIGCONT
+SIGFPE
+SIGHUP
+SIGILL
+SIGINT
+SIGIO
+SIGIOT
+SIGKILL
+SIGPIPE
+SIGPOLL
+SIGPROF
+SIGPWR
+SIGQUIT
+SIGSEGV
+SIGSTKFLT
+SIGSTOP
+SIGTERM
+SIGTRAP
+SIGTSTP
+SIGTTIN
+SIGTTOU
+SIGUNUSED
+SIGURG
+SIGUSR1
+SIGUSR2
+SIGVTALRM
+SIGWINCH
+SIGXCPU
+SIGXFSZ