cl-fringe.lisp: Fix the `cl-launch' machinery.

[fringe] / Makefile

diff --git a/Makefile b/Makefile
index 1335df6..226c975 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -109,21 +109,21 @@ icon-fringe: icon-fringe.icn
 
 CLEANFILES             += *.core *.fasl
 
+SBCL_BUILD              = ./sbcl-build
+
 .SUFFIXES: .lisp .fasl
 .lisp.fasl:
-       $(call v_echo,CL)sbcl --noinform --eval \
-               '(quit :unix-status (if (compile-file "$<" :verbose nil :print nil) 0 1))'
+       $(call v_echo,CL)$(SBCL_BUILD) build $<
 
 LANGS                  += cl
 SOURCES                        += cl-fringe.lisp
 cl-fringe: cl-fringe.fasl
-       $(call v_echo,CP)cp $< $@.new && chmod +x $@.new && mv $@.new $@
-##     $(call v_echo,CL)cl-launch -o $@ -f `pwd`/$^ +I -r launch -d $@.core
+       $(call v_echo,CLLD)$(SBCL_BUILD) link $@ $^
 
 ###--------------------------------------------------------------------------
 ### F#.
 
-FSC                     = fsc
+FSC                     = fsharpc
 FSCFLAGS                =
 CLEANFILES             += *.exe
 .SUFFIXES: .fs .exe
@@ -138,7 +138,7 @@ f\#-fringe: f\#-fringe.exe
 ### Scheme.
 
 SCMC                    = csc
-SCMFLAGS                = -c -O2 
+SCMFLAGS                = -c -O2
 .SUFFIXES: .scm
 .scm.o:; $(call v_echo,SCMC)$(SCMC) $(SCMFLAGS) -o $@ $<
 
@@ -150,17 +150,11 @@ scheme-fringe: scheme-fringe.o
 ###--------------------------------------------------------------------------
 ### Go.
 
-GOOBJ                   = 8
-GOC                     = $(GOOBJ)g
-GOLINK                  = $(GOOBJ)l
-CLEANFILES             += *.$(GOOBJ)
-.SUFFIXES: .$(GOOBJ) .go
-.go.$(GOOBJ):; $(call v_echo,GOC)$(GOC) $(GOFLAGS) $<
-
+GOBUILD                         = go build
 LANGS                  += go
 SOURCES                        += go-fringe.go
-go-fringe: go-fringe.$(GOOBJ)
-       $(call v_echo,GOLD)$(GOLINK) -o $@ $^
+go-fringe: go-fringe.go
+       $(call v_echo,GO)$(GOBUILD) -o $@ $^
 
 ###--------------------------------------------------------------------------
 ### Smalltalk.