guile/guile-core/ice-9 syncase.scm Makefile.am ...

[Marius Vollmer]

CVSROOT:        /cvs
Module name:    guile
Branch:         branch_release-1-6
Changes by:     Marius Vollmer <address@hidden> 01/07/23 15:13:30

Modified files:
        guile-core/ice-9: syncase.scm Makefile.am 
Added files:
        guile-core/ice-9: compile-psyntax.scm 

Log message:
        * Makefile.am (psyntax.pp): Enable rule for psyntax.pp only in
        maintainer mode.  Use compile-psyntax.scm for actual compilation.
        Make sure the uninstalled guile is used.
        (EXTRA_DIST): Distribute compile-psyntax.scm
        * compile-psyntax.scm: New file.
        * syncase.scm (psyncomp): Removed, it is now in
        compile-psyntax.scm.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/ice-9/compile-psyntax.scm?cvsroot=OldCVS&only_with_tag=branch_release-1-6&rev=1.1.2.1
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/ice-9/syncase.scm.diff?cvsroot=OldCVS&only_with_tag=branch_release-1-6&tr1=1.18&tr2=1.18.2.1&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/ice-9/Makefile.am.diff?cvsroot=OldCVS&only_with_tag=branch_release-1-6&tr1=1.46&tr2=1.46.2.1&r1=text&r2=text

Patches:
Index: guile/guile-core/ice-9/Makefile.am
diff -u guile/guile-core/ice-9/Makefile.am:1.46 
guile/guile-core/ice-9/Makefile.am:1.47
--- guile/guile-core/ice-9/Makefile.am:1.46     Fri Jun 29 23:39:17 2001
+++ guile/guile-core/ice-9/Makefile.am  Mon Jul 23 15:09:42 2001
@@ -43,7 +43,10 @@
            $(subpkgdatadir)/'and-let*.scm'
 
 ## test.scm is not currently installed.
-EXTRA_DIST = $(ice9_sources) test.scm and-let-star-compat.scm
+EXTRA_DIST = $(ice9_sources) test.scm and-let-star-compat.scm \
+             compile-psyntax.scm
 
+if MAINTAINER_MODE
 psyntax.pp: psyntax.ss
-       cd $(srcdir) && guile -c '(load-from-path "ice-9/syncase") 
(define-module (ice-9 syncase)) (psyncomp)'
+       GUILE_LOAD_PATH=$(srcdir)/..:.. ../libguile/guile -s 
compile-psyntax.scm $(srcdir)/psyntax.ss $(srcdir)/psyntax.pp
+endif
Index: guile/guile-core/ice-9/syncase.scm
diff -u guile/guile-core/ice-9/syncase.scm:1.18 
guile/guile-core/ice-9/syncase.scm:1.19
--- guile/guile-core/ice-9/syncase.scm:1.18     Sun Jun  3 16:29:45 2001
+++ guile/guile-core/ice-9/syncase.scm  Mon Jul 23 15:09:42 2001
@@ -139,22 +139,6 @@
 
 (define generated-symbols (make-weak-key-hash-table 1019))
 
-;;; Utilities
-
-(define (psyncomp)
-  (system "mv -f psyntax.pp psyntax.pp~")
-  (let ((in (open-input-file "psyntax.ss"))
-       (out (open-output-file "psyntax.pp")))
-    (let loop ((x (read in)))
-      (if (eof-object? x)
-         (begin
-           (close-port out)
-           (close-port in))
-         (begin
-           (write (sc-expand3 x 'c '(compile load eval)) out)
-           (newline out)
-           (loop (read in)))))))
-
 ;;; Load the preprocessed code
 
 (let ((old-debug #f)