~ chicken-core (chicken-5) 1e5bb5e58ae5a07abd6a64ae9299d8fa0fc70516

commit 1e5bb5e58ae5a07abd6a64ae9299d8fa0fc70516
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Tue Jan 19 17:03:51 2010 +0100
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Tue Jan 19 17:03:51 2010 +0100

    -W is only effective on windows

diff --git a/Makefile.cross-linux-mingw b/Makefile.cross-linux-mingw
index 8bcaacb5..8cac78fd 100644
--- a/Makefile.cross-linux-mingw
+++ b/Makefile.cross-linux-mingw
@@ -87,16 +87,16 @@ include $(SRCDIR)/defaults.make
 # main target
 
 ifndef BUILD_SETUP_TOOLS
-TARGETS = libchicken$(A) libuchicken$(A) chicken$(EXE) csi$(EXE) \
-	chicken-profile$(EXE) csc$(EXE) libchicken$(SO) \
+TARGETS = libchicken$(A) libuchicken$(A) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) \
+	$(CHICKEN_PROFILE_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) libchicken$(SO) \
 	libuchicken$(SO) \
-	libchickengui$(SO) chicken-bug$(EXE)
+	libchickengui$(SO) $(CHICKEN_BUG_PROGRAM)$(EXE)
 else
-TARGETS = libchicken$(A) libuchicken$(A) chicken$(EXE) csi$(EXE) \
-	chicken-profile$(EXE) csc$(EXE) libchicken$(SO) \
-	libuchicken$(SO) chicken-install$(EXE) chicken-uninstall$(EXE) \
-	chicken-status$(EXE) \
-	libchickengui$(SO) chicken-bug$(EXE)
+TARGETS = libchicken$(A) libuchicken$(A) $(CHICKEN_PROGRAM)$(EXE) $(CSI_PROGRAM)$(EXE) \
+	$(CHICKEN_PROFILE_PROGRAM)$(EXE) $(CSC_PROGRAM)$(EXE) libchicken$(SO) \
+	libuchicken$(SO) $(CHICKEN_INSTALL_PROGRAM)$(EXE) $(CHICKEN_UNINSTALL_PROGRAM)$(EXE) \
+	$(CHICKEN_STATUS_PROGRAM)$(EXE) \
+	libchickengui$(SO) $(CHICKEN_BUG_PROGRAM)$(EXE)
 endif
 
 chicken-config.h: chicken-defaults.h
diff --git a/csc.scm b/csc.scm
index 2fea215a..49430d7d 100644
--- a/csc.scm
+++ b/csc.scm
@@ -523,10 +523,10 @@ EOF
 
   (let loop ([args args])
     (cond [(null? args)
-           ;Builtin search directory options do not override explict options
+	   ;; Builtin search directory options do not override explict options
            (set! compile-options (append compile-options builtin-compile-options))
            (set! link-options (append link-options builtin-link-options))
-           ;
+	   ;;
 	   (when inquiry-only
 	     (when show-cflags (print* (compiler-options) #\space))
 	     (when show-ldflags (print* (linker-options) #\space))
@@ -639,6 +639,7 @@ EOF
 		(t-options "-static-extension" (car rest))
 		(set! rest (cdr rest)) ]
 	       [(-windows |-W|)
+		(when (or msvc mingw)
 		(set! gui #t)
 		(cond
                  (mingw
@@ -649,7 +650,7 @@ EOF
                  (msvc
                   (set! link-options
                     (cons* "kernel32.lib" "user32.lib" "gdi32.lib" link-options))
-		  (set! compile-options (cons "-DC_WINDOWS_GUI" compile-options)))) ]
+		  (set! compile-options (cons "-DC_WINDOWS_GUI" compile-options)))) ) ]
 	       [(-framework)
 		(check s rest)
 		(when osx 
diff --git a/setup-api.scm b/setup-api.scm
index bd863f8f..2788b12e 100644
--- a/setup-api.scm
+++ b/setup-api.scm
@@ -496,7 +496,7 @@
 	 (fname (make-pathname #f sname "scm"))
 	 (iname (make-pathname #f sname "import.scm")))
     (compile -s -O2 -d1 ,fname -j ,name)
-    (when static 
+    (when static
       (compile -c -O2 -d1 ,fname -j ,name -unit ,name))
     (compile -s -O2 -d0 ,iname)
     (install-extension